fix: 修复Linux webkit环境下错误使用localstorage使得无法添加作业 和 崩溃窗口弹出后整个app冻结的bug

Author: chenjintang-shrimp

.github/workflows/build.yml

@@ -151,6 +151,7 @@ jobs:
             echo "Cannot detect executable in ${PKG}/opt/${APP_NAME}" >&2
             exit 1
           fi
+          chmod +x "${PKG}/opt/${APP_NAME}/${BIN_NAME}"
 
           cat > "${PKG}/usr/bin/${APP_NAME}" <<LAUNCHEOF
           #!/bin/bash

__pycache__/build.cpython-313.pyc

@@ -396,15 +396,47 @@
 
         let activeTab = 'mainset';
         const contentFrame = document.getElementById('contentFrame');
+        const fallbackStorage = Object.create(null);
         const contentBody = document.getElementById('contentBody');
         const searchInput = document.getElementById('settingsSearch');
         const searchHint = document.getElementById('searchHint');
         const sidebarToggleBtn = document.getElementById('sidebarToggleBtn');
 
+        function storageGet(key) {
+            try {
+                if (typeof localStorage !== 'undefined' && localStorage !== null) {
+                    return localStorage.getItem(key);
+                }
+            } catch (e) {
+                console.warn('localStorage.getItem 不可用，使用内存存储:', e);
+            }
+            return Object.prototype.hasOwnProperty.call(fallbackStorage, key) ? fallbackStorage[key] : null;
+        }
+
+        function storageSet(key, value) {
+            const normalizedValue = String(value);
+            try {
+                if (typeof localStorage !== 'undefined' && localStorage !== null) {
+                    localStorage.setItem(key, normalizedValue);
+                    return;
+                }
+            } catch (e) {
+                console.warn('localStorage.setItem 不可用，使用内存存储:', e);
+            }
+            fallbackStorage[key] = normalizedValue;
+        }
+
         function markLoading(loading) {
             contentBody.classList.toggle('loading', loading);
         }
 
+        function bindFrameLoad(frame) {
+            frame.addEventListener('load', () => {
+                markLoading(false);
+                applySearchToFrame(searchInput.value.trim());
+            });
+        }
+
         function switchTab(tabName) {
             const tab = TABS[tabName] ? tabName : 'mainset';
             activeTab = tab;
@@ -414,7 +446,7 @@
             });
 
             document.getElementById('pageTitle').textContent = TABS[tab].title;
-            localStorage.setItem(TAB_STORAGE_KEY, tab);
+            storageSet(TAB_STORAGE_KEY, tab);
             window.location.hash = tab;
 
             if (!contentFrame.src.includes(TABS[tab].src)) {
@@ -463,7 +495,7 @@
         function setSidebarCollapsed(collapsed) {
             document.body.classList.toggle('sidebar-collapsed', collapsed);
             sidebarToggleBtn.title = collapsed ? '展开导航栏' : '收缩导航栏';
-            localStorage.setItem(SIDEBAR_COLLAPSED_KEY, collapsed ? '1' : '0');
+            storageSet(SIDEBAR_COLLAPSED_KEY, collapsed ? '1' : '0');
         }
 
         function toggleSidebar() {
@@ -472,21 +504,18 @@
         }
 
         function initSidebarState() {
-            const collapsed = localStorage.getItem(SIDEBAR_COLLAPSED_KEY) === '1';
+            const collapsed = storageGet(SIDEBAR_COLLAPSED_KEY) === '1';
             setSidebarCollapsed(collapsed);
         }
 
         function initTab() {
             const hashTab = (window.location.hash || '').replace('#', '').trim();
-            const storedTab = localStorage.getItem(TAB_STORAGE_KEY);
+            const storedTab = storageGet(TAB_STORAGE_KEY);
             const initialTab = TABS[hashTab] ? hashTab : (TABS[storedTab] ? storedTab : 'mainset');
             switchTab(initialTab);
         }
 
-        contentFrame.addEventListener('load', () => {
-            markLoading(false);
-            applySearchToFrame(searchInput.value.trim());
-        });
+        bindFrameLoad(contentFrame);
 
         searchInput.addEventListener('input', handleSearchInput);
         sidebarToggleBtn.addEventListener('click', toggleSidebar);

__pycache__/main.cpython-313.pyc

@@ -832,6 +832,31 @@ <h1 id="timeDisplay">Wow 伙伴！</h1>
         }
 
         // 作业数据管理
+        const fallbackStorage = Object.create(null);
+        function storageGet(key) {
+            try {
+                if (typeof localStorage !== 'undefined' && localStorage !== null) {
+                    return localStorage.getItem(key);
+                }
+            } catch (e) {
+                console.warn('localStorage.getItem 不可用，使用内存存储:', e);
+            }
+            return Object.prototype.hasOwnProperty.call(fallbackStorage, key) ? fallbackStorage[key] : null;
+        }
+
+        function storageSet(key, value) {
+            const normalizedValue = String(value);
+            try {
+                if (typeof localStorage !== 'undefined' && localStorage !== null) {
+                    localStorage.setItem(key, normalizedValue);
+                    return;
+                }
+            } catch (e) {
+                console.warn('localStorage.setItem 不可用，使用内存存储:', e);
+            }
+            fallbackStorage[key] = normalizedValue;
+        }
+
         // 作业数据缓存
         let homeworkCache = null;
 
@@ -843,15 +868,15 @@ <h1 id="timeDisplay">Wow 伙伴！</h1>
                     if (result.success) {
                         homeworkCache = result.data || [];
                         // 同步到 localStorage
-                        localStorage.setItem('homeworkList', JSON.stringify(homeworkCache));
+                        storageSet('homeworkList', JSON.stringify(homeworkCache));
                         return homeworkCache;
                     }
                 }
             } catch (error) {
                 console.error('从服务器加载作业失败:', error);
             }
             // 如果服务器加载失败，从 localStorage 加载
-            const data = localStorage.getItem('homeworkList');
+            const data = storageGet('homeworkList');
             homeworkCache = data ? JSON.parse(data) : [];
             return homeworkCache;
         }
@@ -862,7 +887,7 @@ <h1 id="timeDisplay">Wow 伙伴！</h1>
                 return homeworkCache;
             }
             // 否则从 localStorage 加载
-            const data = localStorage.getItem('homeworkList');
+            const data = storageGet('homeworkList');
             return data ? JSON.parse(data) : [];
         }
 
@@ -889,14 +914,14 @@ <h1 id="timeDisplay">Wow 伙伴！</h1>
                 list.push(homework);
             }
 
-            localStorage.setItem('homeworkList', JSON.stringify(list));
+            storageSet('homeworkList', JSON.stringify(list));
             homeworkCache = list;
         }
 
         function deleteHomework(id) {
             const list = getHomeworkList();
             const newList = list.filter(h => h.id !== id);
-            localStorage.setItem('homeworkList', JSON.stringify(newList));
+            storageSet('homeworkList', JSON.stringify(newList));
             homeworkCache = newList;
             syncHomeworkDataToServer();
             renderHomeworkCards();

__pycache__/main.cpython-38.pyc

@@ -60,6 +60,16 @@
 }
 
 
+def is_wsl_environment():
+    """检测是否运行在 WSL 环境"""
+    release = platform.release().lower()
+    return (
+        'WSL_DISTRO_NAME' in os.environ
+        or 'microsoft' in release
+        or 'wsl' in release
+    )
+
+
 def get_data_dir():
     return os.path.join(os.path.dirname(os.path.abspath(__file__)), 'data')
 
@@ -1521,6 +1531,15 @@ def saveHomeworkToAutoSave(self, homework_list):
             except Exception as e:
                 log(f"读取启动设置失败: {str(e)}", "error")
 
+            # WSLg 下通常没有可用托盘，禁用托盘相关逻辑以避免初始化异常导致崩溃窗口
+            tray_enabled = True
+            if system == 'Linux' and is_wsl_environment():
+                tray_enabled = False
+                log("检测到 WSL 环境：禁用系统托盘", "warning")
+                if start_minimized:
+                    log("WSL 环境下托盘不可用：忽略启动最小化设置", "warning")
+                    start_minimized = False
+
             # 根据屏幕大小自适应主窗口尺寸，避免高缩放下超出可视区域被系统强制铺满
             base_width, base_height = 2296, 1136
             screen_width, screen_height = get_screen_size()
@@ -1556,15 +1575,22 @@ def saveHomeworkToAutoSave(self, homework_list):
                 main_window.hide()
 
             # 在主线程设置托盘图标（必须在start之前）
-            setup_tray_icon(main_window)
+            if tray_enabled:
+                try:
+                    setup_tray_icon(main_window)
+                except Exception as e:
+                    tray_icon = None
+                    log(f"系统托盘初始化失败，继续无托盘运行: {str(e)}", "warning")
 
             # 注册拖拽区域
             def on_loaded():
                 log("注册拖拽区域", "info")
                 # 仅允许在html标签内拖拽
                 main_window.evaluate_js("""
                     document.querySelector('html').addEventListener('mousedown', function(e) {
-                        window.dragStart();
+                        if (typeof window.dragStart === 'function') {
+                            window.dragStart();
+                        }
                     });
                 """)