diff --git a/douyin-login-launcher/browser_open.py b/douyin-login-launcher/browser_open.py index 25e8314..54b30a5 100644 --- a/douyin-login-launcher/browser_open.py +++ b/douyin-login-launcher/browser_open.py @@ -139,9 +139,17 @@ def open_logged_in_browser( log(f"页面加载提示：{e}（可在浏览器里手动刷新）") log("浏览器已打开，登录态已注入。关闭浏览器窗口即可结束。") + # 保活等待必须用 Playwright 的 wait_for_timeout（内部持续处理浏览器事件）， + # 不能用 time.sleep：sleep 会卡住 Playwright 客户端线程，导致页面里 + # 新开的标签页（如抖音「视频管理」）永远停在 about:blank 无法加载。 try: while browser.is_connected() and context.pages: - time.sleep(1) + pg = context.pages[0] + try: + pg.wait_for_timeout(1000) + except Exception: + # 该页面刚被用户关闭等瞬态情况，稍候重查 + time.sleep(0.2) except Exception: pass try: diff --git a/douyin-login-launcher/build/desktop/Analysis-00.toc b/douyin-login-launcher/build/desktop/Analysis-00.toc index 8eb1948..0be6e42 100644 --- a/douyin-login-launcher/build/desktop/Analysis-00.toc +++ b/douyin-login-launcher/build/desktop/Analysis-00.toc @@ -1,5 +1,5 @@ -(['D:\\file\\kefu\\douyin-login-launcher\\desktop_app.py'], - ['D:\\file\\kefu\\douyin-login-launcher'], +(['D:\\file\\douyin\\douyin-login-launcher\\desktop_app.py'], + ['D:\\file\\douyin\\douyin-login-launcher'], ['playwright', 'playwright.__main__', 'playwright._impl', @@ -2485,7 +2485,7 @@ 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\_pyinstaller_hooks_contrib\\rthooks\\pyi_rth_cryptography_openssl.py', 'PYSOURCE'), ('desktop_app', - 'D:\\file\\kefu\\douyin-login-launcher\\desktop_app.py', + 'D:\\file\\douyin\\douyin-login-launcher\\desktop_app.py', 'PYSOURCE')], [('pkg_resources', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\pkg_resources\\__init__.py', @@ -2559,9 +2559,6 @@ ('gettext', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\gettext.py', 'PYMODULE'), - ('urllib', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\__init__.py', - 'PYMODULE'), ('email.charset', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\email\\charset.py', 'PYMODULE'), @@ -3130,30 +3127,6 @@ ('xml.sax.saxutils', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\xml\\sax\\saxutils.py', 'PYMODULE'), - ('urllib.request', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\request.py', - 'PYMODULE'), - ('getpass', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\getpass.py', - 'PYMODULE'), - ('nturl2path', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\nturl2path.py', - 'PYMODULE'), - ('ftplib', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\ftplib.py', - 'PYMODULE'), - ('netrc', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\netrc.py', - 'PYMODULE'), - ('http.cookiejar', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\http\\cookiejar.py', - 'PYMODULE'), - ('urllib.response', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\response.py', - 'PYMODULE'), - ('urllib.error', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\error.py', - 'PYMODULE'), ('xml.sax', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\xml\\sax\\__init__.py', 'PYMODULE'), @@ -3346,6 +3319,9 @@ ('setuptools._distutils.command.register', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools\\_distutils\\command\\register.py', 'PYMODULE'), + ('getpass', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\getpass.py', + 'PYMODULE'), ('setuptools._distutils.command.py37compat', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools\\_distutils\\command\\py37compat.py', 'PYMODULE'), @@ -4969,31 +4945,47 @@ ('playwright', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\playwright\\__init__.py', 'PYMODULE'), + ('stringprep', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\stringprep.py', + 'PYMODULE'), ('tracemalloc', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\tracemalloc.py', 'PYMODULE'), ('_py_abc', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\_py_abc.py', 'PYMODULE'), - ('stringprep', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\stringprep.py', + ('urllib.request', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\request.py', 'PYMODULE'), - ('json', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\__init__.py', + ('nturl2path', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\nturl2path.py', 'PYMODULE'), - ('json.encoder', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\encoder.py', + ('ftplib', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\ftplib.py', 'PYMODULE'), - ('json.decoder', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\decoder.py', + ('netrc', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\netrc.py', 'PYMODULE'), - ('json.scanner', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\scanner.py', + ('http.cookiejar', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\http\\cookiejar.py', + 'PYMODULE'), + ('urllib.response', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\response.py', + 'PYMODULE'), + ('urllib.error', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\error.py', + 'PYMODULE'), + ('urllib', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\__init__.py', + 'PYMODULE'), + ('version', + 'D:\\file\\douyin\\douyin-login-launcher\\version.py', + 'PYMODULE'), + ('updater', + 'D:\\file\\douyin\\douyin-login-launcher\\updater.py', 'PYMODULE'), - ('version', 'D:\\file\\kefu\\douyin-login-launcher\\version.py', 'PYMODULE'), - ('updater', 'D:\\file\\kefu\\douyin-login-launcher\\updater.py', 'PYMODULE'), ('browser_open', - 'D:\\file\\kefu\\douyin-login-launcher\\browser_open.py', + 'D:\\file\\douyin\\douyin-login-launcher\\browser_open.py', 'PYMODULE'), ('webview', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\webview\\__init__.py', @@ -5175,6 +5167,18 @@ ('subprocess', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\subprocess.py', 'PYMODULE'), + ('json', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\__init__.py', + 'PYMODULE'), + ('json.encoder', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\encoder.py', + 'PYMODULE'), + ('json.decoder', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\decoder.py', + 'PYMODULE'), + ('json.scanner', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\json\\scanner.py', + 'PYMODULE'), ('ctypes', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\ctypes\\__init__.py', 'PYMODULE'), @@ -7270,15 +7274,6 @@ ('webview\\window.py', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\webview\\window.py', 'DATA'), - ('cryptography-48.0.0.dist-info\\WHEEL', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\WHEEL', - 'DATA'), - ('cryptography-48.0.0.dist-info\\METADATA', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\METADATA', - 'DATA'), - ('cryptography-48.0.0.dist-info\\INSTALLER', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\INSTALLER', - 'DATA'), ('cryptography-48.0.0.dist-info\\sboms\\cryptography-rust.cyclonedx.json', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\sboms\\cryptography-rust.cyclonedx.json', 'DATA'), @@ -7288,17 +7283,44 @@ ('cryptography-48.0.0.dist-info\\RECORD', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\RECORD', 'DATA'), - ('cryptography-48.0.0.dist-info\\licenses\\LICENSE.APACHE', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\licenses\\LICENSE.APACHE', + ('cryptography-48.0.0.dist-info\\METADATA', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\METADATA', + 'DATA'), + ('cryptography-48.0.0.dist-info\\INSTALLER', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\INSTALLER', 'DATA'), ('cryptography-48.0.0.dist-info\\licenses\\LICENSE', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\licenses\\LICENSE', 'DATA'), + ('cryptography-48.0.0.dist-info\\WHEEL', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\WHEEL', + 'DATA'), ('cryptography-48.0.0.dist-info\\licenses\\LICENSE.BSD', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\licenses\\LICENSE.BSD', 'DATA'), - ('attrs-26.1.0.dist-info\\METADATA', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\METADATA', + ('cryptography-48.0.0.dist-info\\licenses\\LICENSE.APACHE', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\cryptography-48.0.0.dist-info\\licenses\\LICENSE.APACHE', + 'DATA'), + ('wheel-0.45.1.dist-info\\WHEEL', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\WHEEL', + 'DATA'), + ('attrs-26.1.0.dist-info\\INSTALLER', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\INSTALLER', + 'DATA'), + ('wheel-0.45.1.dist-info\\RECORD', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\RECORD', + 'DATA'), + ('setuptools-65.5.0.dist-info\\WHEEL', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL', + 'DATA'), + ('wheel-0.45.1.dist-info\\LICENSE.txt', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\LICENSE.txt', + 'DATA'), + ('setuptools-65.5.0.dist-info\\INSTALLER', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\INSTALLER', + 'DATA'), + ('setuptools-65.5.0.dist-info\\RECORD', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD', 'DATA'), ('wheel-0.45.1.dist-info\\REQUESTED', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\REQUESTED', @@ -7309,129 +7331,48 @@ ('setuptools-65.5.0.dist-info\\LICENSE', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\LICENSE', 'DATA'), - ('wheel-0.45.1.dist-info\\entry_points.txt', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\entry_points.txt', - 'DATA'), - ('wheel-0.45.1.dist-info\\RECORD', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\RECORD', - 'DATA'), - ('attrs-26.1.0.dist-info\\INSTALLER', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\INSTALLER', - 'DATA'), - ('wheel-0.45.1.dist-info\\LICENSE.txt', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\LICENSE.txt', - 'DATA'), - ('attrs-26.1.0.dist-info\\RECORD', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\RECORD', - 'DATA'), - ('setuptools-65.5.0.dist-info\\INSTALLER', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\INSTALLER', - 'DATA'), - ('setuptools-65.5.0.dist-info\\WHEEL', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\WHEEL', - 'DATA'), ('wheel-0.45.1.dist-info\\METADATA', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\METADATA', 'DATA'), - ('wheel-0.45.1.dist-info\\INSTALLER', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\INSTALLER', - 'DATA'), - ('setuptools-65.5.0.dist-info\\METADATA', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA', - 'DATA'), - ('wheel-0.45.1.dist-info\\WHEEL', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\WHEEL', - 'DATA'), ('setuptools-65.5.0.dist-info\\entry_points.txt', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\entry_points.txt', 'DATA'), - ('setuptools-65.5.0.dist-info\\RECORD', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\RECORD', - 'DATA'), ('setuptools-65.5.0.dist-info\\top_level.txt', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\top_level.txt', 'DATA'), + ('wheel-0.45.1.dist-info\\entry_points.txt', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\entry_points.txt', + 'DATA'), ('attrs-26.1.0.dist-info\\licenses\\LICENSE', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\licenses\\LICENSE', 'DATA'), + ('attrs-26.1.0.dist-info\\RECORD', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\RECORD', + 'DATA'), + ('setuptools-65.5.0.dist-info\\METADATA', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\setuptools-65.5.0.dist-info\\METADATA', + 'DATA'), + ('wheel-0.45.1.dist-info\\INSTALLER', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\wheel-0.45.1.dist-info\\INSTALLER', + 'DATA'), + ('attrs-26.1.0.dist-info\\METADATA', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\METADATA', + 'DATA'), ('attrs-26.1.0.dist-info\\WHEEL', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\WHEEL', 'DATA'), ('base_library.zip', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\base_library.zip', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\base_library.zip', 'DATA')], - [('_weakrefset', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\_weakrefset.py', + [('functools', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\functools.py', 'PYMODULE'), - ('copyreg', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\copyreg.py', - 'PYMODULE'), - ('posixpath', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\posixpath.py', - 'PYMODULE'), - ('stat', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\stat.py', - 'PYMODULE'), - ('warnings', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\warnings.py', - 'PYMODULE'), - ('traceback', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\traceback.py', - 'PYMODULE'), - ('reprlib', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\reprlib.py', - 'PYMODULE'), - ('re._parser', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_parser.py', - 'PYMODULE'), - ('re._constants', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_constants.py', - 'PYMODULE'), - ('re._compiler', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_compiler.py', - 'PYMODULE'), - ('re._casefix', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_casefix.py', - 'PYMODULE'), - ('re', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\__init__.py', - 'PYMODULE'), - ('ntpath', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\ntpath.py', - 'PYMODULE'), - ('enum', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\enum.py', - 'PYMODULE'), - ('abc', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\abc.py', - 'PYMODULE'), - ('_collections_abc', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\_collections_abc.py', - 'PYMODULE'), - ('keyword', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\keyword.py', - 'PYMODULE'), - ('sre_constants', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\sre_constants.py', - 'PYMODULE'), - ('heapq', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\heapq.py', - 'PYMODULE'), - ('sre_compile', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\sre_compile.py', - 'PYMODULE'), - ('sre_parse', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\sre_parse.py', + ('locale', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\locale.py', 'PYMODULE'), ('genericpath', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\genericpath.py', 'PYMODULE'), - ('collections.abc', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\collections\\abc.py', - 'PYMODULE'), - ('collections', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\collections\\__init__.py', - 'PYMODULE'), ('encodings.zlib_codec', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\encodings\\zlib_codec.py', 'PYMODULE'), @@ -7798,30 +7739,93 @@ ('encodings', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\encodings\\__init__.py', 'PYMODULE'), - ('locale', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\locale.py', + ('sre_parse', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\sre_parse.py', 'PYMODULE'), - ('types', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\types.py', + ('warnings', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\warnings.py', 'PYMODULE'), - ('linecache', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\linecache.py', + ('re._parser', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_parser.py', 'PYMODULE'), - ('io', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\io.py', + ('re._constants', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_constants.py', 'PYMODULE'), - ('weakref', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\weakref.py', + ('re._compiler', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_compiler.py', 'PYMODULE'), - ('functools', - 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\functools.py', + ('re._casefix', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\_casefix.py', + 'PYMODULE'), + ('re', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\re\\__init__.py', 'PYMODULE'), ('operator', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\operator.py', 'PYMODULE'), + ('stat', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\stat.py', + 'PYMODULE'), + ('posixpath', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\posixpath.py', + 'PYMODULE'), + ('enum', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\enum.py', + 'PYMODULE'), + ('reprlib', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\reprlib.py', + 'PYMODULE'), + ('heapq', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\heapq.py', + 'PYMODULE'), + ('abc', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\abc.py', + 'PYMODULE'), + ('sre_constants', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\sre_constants.py', + 'PYMODULE'), + ('copyreg', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\copyreg.py', + 'PYMODULE'), + ('_weakrefset', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\_weakrefset.py', + 'PYMODULE'), + ('types', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\types.py', + 'PYMODULE'), + ('sre_compile', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\sre_compile.py', + 'PYMODULE'), + ('_collections_abc', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\_collections_abc.py', + 'PYMODULE'), + ('ntpath', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\ntpath.py', + 'PYMODULE'), ('codecs', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\codecs.py', 'PYMODULE'), + ('linecache', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\linecache.py', + 'PYMODULE'), + ('weakref', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\weakref.py', + 'PYMODULE'), + ('traceback', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\traceback.py', + 'PYMODULE'), + ('io', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\io.py', + 'PYMODULE'), + ('keyword', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\keyword.py', + 'PYMODULE'), + ('collections.abc', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\collections\\abc.py', + 'PYMODULE'), + ('collections', + 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\collections\\__init__.py', + 'PYMODULE'), ('os', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\os.py', 'PYMODULE')]) diff --git a/douyin-login-launcher/build/desktop/COLLECT-00.toc b/douyin-login-launcher/build/desktop/COLLECT-00.toc index d248903..4d9d9fa 100644 --- a/douyin-login-launcher/build/desktop/COLLECT-00.toc +++ b/douyin-login-launcher/build/desktop/COLLECT-00.toc @@ -1,5 +1,5 @@ ([('DouyinDesktop.exe', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.exe', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.exe', 'EXECUTABLE'), ('Pythonwin\\mfc140u.dll', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\Pythonwin\\mfc140u.dll', @@ -71,7 +71,7 @@ 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\attrs-26.1.0.dist-info\\licenses\\LICENSE', 'DATA'), ('base_library.zip', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\base_library.zip', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\base_library.zip', 'DATA'), ('bcrypt\\_bcrypt.pyd', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\bcrypt\\_bcrypt.pyd', diff --git a/douyin-login-launcher/build/desktop/DouyinDesktop.exe b/douyin-login-launcher/build/desktop/DouyinDesktop.exe index 2bfeffa..027eeae 100644 Binary files a/douyin-login-launcher/build/desktop/DouyinDesktop.exe and b/douyin-login-launcher/build/desktop/DouyinDesktop.exe differ diff --git a/douyin-login-launcher/build/desktop/DouyinDesktop.pkg b/douyin-login-launcher/build/desktop/DouyinDesktop.pkg index 31c606f..7160462 100644 Binary files a/douyin-login-launcher/build/desktop/DouyinDesktop.pkg and b/douyin-login-launcher/build/desktop/DouyinDesktop.pkg differ diff --git a/douyin-login-launcher/build/desktop/EXE-00.toc b/douyin-login-launcher/build/desktop/EXE-00.toc index 30e574d..ba92486 100644 --- a/douyin-login-launcher/build/desktop/EXE-00.toc +++ b/douyin-login-launcher/build/desktop/EXE-00.toc @@ -1,8 +1,8 @@ -('D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.exe', +('D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.exe', False, False, True, - ['D:\\file\\kefu\\douyin-login-launcher\\app.ico'], + ['D:\\file\\douyin\\douyin-login-launcher\\app.ico'], None, False, False, @@ -29,25 +29,25 @@ None, None, None, - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.pkg', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.pkg', [('pyi-contents-directory _internal', '', 'OPTION'), ('PYZ-00.pyz', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\PYZ-00.pyz', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\PYZ-00.pyz', 'PYZ'), ('struct', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\struct.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\struct.pyc', 'PYMODULE'), ('pyimod01_archive', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod01_archive.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod01_archive.pyc', 'PYMODULE'), ('pyimod02_importers', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod02_importers.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod02_importers.pyc', 'PYMODULE'), ('pyimod03_ctypes', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod03_ctypes.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod03_ctypes.pyc', 'PYMODULE'), ('pyimod04_pywin32', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod04_pywin32.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod04_pywin32.pyc', 'PYMODULE'), ('pyiboot01_bootstrap', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py', @@ -77,12 +77,12 @@ 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\_pyinstaller_hooks_contrib\\rthooks\\pyi_rth_cryptography_openssl.py', 'PYSOURCE'), ('desktop_app', - 'D:\\file\\kefu\\douyin-login-launcher\\desktop_app.py', + 'D:\\file\\douyin\\douyin-login-launcher\\desktop_app.py', 'PYSOURCE')], [], False, False, - 1782438587, + 1784257587, [('runw.exe', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\PyInstaller\\bootloader\\Windows-64bit-intel\\runw.exe', 'EXECUTABLE')], diff --git a/douyin-login-launcher/build/desktop/PKG-00.toc b/douyin-login-launcher/build/desktop/PKG-00.toc index e18d9bc..8d344a2 100644 --- a/douyin-login-launcher/build/desktop/PKG-00.toc +++ b/douyin-login-launcher/build/desktop/PKG-00.toc @@ -1,4 +1,4 @@ -('D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.pkg', +('D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\DouyinDesktop.pkg', {'BINARY': True, 'DATA': True, 'EXECUTABLE': True, @@ -10,22 +10,22 @@ 'SYMLINK': False}, [('pyi-contents-directory _internal', '', 'OPTION'), ('PYZ-00.pyz', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\PYZ-00.pyz', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\PYZ-00.pyz', 'PYZ'), ('struct', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\struct.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\struct.pyc', 'PYMODULE'), ('pyimod01_archive', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod01_archive.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod01_archive.pyc', 'PYMODULE'), ('pyimod02_importers', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod02_importers.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod02_importers.pyc', 'PYMODULE'), ('pyimod03_ctypes', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod03_ctypes.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod03_ctypes.pyc', 'PYMODULE'), ('pyimod04_pywin32', - 'D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod04_pywin32.pyc', + 'D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\localpycs\\pyimod04_pywin32.pyc', 'PYMODULE'), ('pyiboot01_bootstrap', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\PyInstaller\\loader\\pyiboot01_bootstrap.py', @@ -55,7 +55,7 @@ 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\_pyinstaller_hooks_contrib\\rthooks\\pyi_rth_cryptography_openssl.py', 'PYSOURCE'), ('desktop_app', - 'D:\\file\\kefu\\douyin-login-launcher\\desktop_app.py', + 'D:\\file\\douyin\\douyin-login-launcher\\desktop_app.py', 'PYSOURCE')], 'python311.dll', True, diff --git a/douyin-login-launcher/build/desktop/PYZ-00.pyz b/douyin-login-launcher/build/desktop/PYZ-00.pyz index 3118208..edde3f0 100644 Binary files a/douyin-login-launcher/build/desktop/PYZ-00.pyz and b/douyin-login-launcher/build/desktop/PYZ-00.pyz differ diff --git a/douyin-login-launcher/build/desktop/PYZ-00.toc b/douyin-login-launcher/build/desktop/PYZ-00.toc index ccc13b1..c45d736 100644 --- a/douyin-login-launcher/build/desktop/PYZ-00.toc +++ b/douyin-login-launcher/build/desktop/PYZ-00.toc @@ -1,4 +1,4 @@ -('D:\\file\\kefu\\douyin-login-launcher\\build\\desktop\\PYZ-00.pyz', +('D:\\file\\douyin\\douyin-login-launcher\\build\\desktop\\PYZ-00.pyz', [('PyInstaller', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\PyInstaller\\__init__.py', 'PYMODULE'), @@ -294,7 +294,7 @@ 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\site-packages\\bottle.py', 'PYMODULE'), ('browser_open', - 'D:\\file\\kefu\\douyin-login-launcher\\browser_open.py', + 'D:\\file\\douyin\\douyin-login-launcher\\browser_open.py', 'PYMODULE'), ('bz2', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\bz2.py', @@ -2346,7 +2346,9 @@ ('unittest.util', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\unittest\\util.py', 'PYMODULE'), - ('updater', 'D:\\file\\kefu\\douyin-login-launcher\\updater.py', 'PYMODULE'), + ('updater', + 'D:\\file\\douyin\\douyin-login-launcher\\updater.py', + 'PYMODULE'), ('urllib', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\urllib\\__init__.py', 'PYMODULE'), @@ -2365,7 +2367,9 @@ ('uuid', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\uuid.py', 'PYMODULE'), - ('version', 'D:\\file\\kefu\\douyin-login-launcher\\version.py', 'PYMODULE'), + ('version', + 'D:\\file\\douyin\\douyin-login-launcher\\version.py', + 'PYMODULE'), ('webbrowser', 'C:\\Users\\pc\\AppData\\Local\\Programs\\Python\\Python311\\Lib\\webbrowser.py', 'PYMODULE'), diff --git a/douyin-login-launcher/build/desktop/base_library.zip b/douyin-login-launcher/build/desktop/base_library.zip index 355a58f..0d8fdd9 100644 Binary files a/douyin-login-launcher/build/desktop/base_library.zip and b/douyin-login-launcher/build/desktop/base_library.zip differ diff --git a/douyin-login-launcher/build/desktop/warn-desktop.txt b/douyin-login-launcher/build/desktop/warn-desktop.txt index 65abb42..dcabd74 100644 --- a/douyin-login-launcher/build/desktop/warn-desktop.txt +++ b/douyin-login-launcher/build/desktop/warn-desktop.txt @@ -15,11 +15,8 @@ IMPORTANT: Do NOT post this list to the issue-tracker. Use it as a basis for tracking down the missing module yourself. Thanks! missing module named pyimod02_importers - imported by C:\Users\pc\AppData\Local\Programs\Python\Python311\Lib\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgutil.py (delayed), C:\Users\pc\AppData\Local\Programs\Python\Python311\Lib\site-packages\PyInstaller\hooks\rthooks\pyi_rth_pkgres.py (delayed) -missing module named 'org.python' - imported by copy (optional), xml.sax (delayed, conditional) -missing module named org - imported by pickle (optional) -missing module named urllib.unquote - imported by urllib (conditional), bottle (conditional) -missing module named urllib.quote - imported by urllib (conditional), bottle (conditional) -missing module named urllib.urlencode - imported by urllib (conditional), bottle (conditional) +missing module named org - imported by copy (optional) +missing module named 'org.python' - imported by pickle (optional), xml.sax (delayed, conditional) missing module named pwd - imported by posixpath (delayed, conditional, optional), shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), subprocess (delayed, conditional, optional), http.server (delayed, optional), webbrowser (delayed), distutils.util (delayed, conditional, optional), distutils.archive_util (optional), netrc (delayed, conditional), getpass (delayed), setuptools._distutils.archive_util (optional), setuptools._distutils.util (delayed, conditional, optional) missing module named grp - imported by shutil (delayed, optional), tarfile (optional), pathlib (delayed, optional), subprocess (delayed, conditional, optional), distutils.archive_util (optional), setuptools._distutils.archive_util (optional) missing module named posix - imported by os (conditional, optional), posixpath (optional), shutil (conditional), importlib._bootstrap_external (conditional) @@ -42,7 +39,6 @@ missing module named _winreg - imported by platform (delayed, optional), pkg_res missing module named pkg_resources.extern.packaging - imported by pkg_resources.extern (top-level), pkg_resources (top-level) missing module named pkg_resources.extern.appdirs - imported by pkg_resources.extern (top-level), pkg_resources (top-level) missing module named 'pkg_resources.extern.jaraco' - imported by pkg_resources (top-level), pkg_resources._vendor.jaraco.text (top-level) -missing module named _scproxy - imported by urllib.request (conditional) missing module named 'java.lang' - imported by platform (delayed, optional), xml.sax._exceptions (conditional) missing module named vms_lib - imported by platform (delayed, optional) missing module named java - imported by platform (delayed) @@ -104,6 +100,9 @@ missing module named ConfigParser - imported by bottle (conditional) missing module named StringIO - imported by bottle (conditional) missing module named cPickle - imported by bottle (conditional) missing module named Cookie - imported by bottle (conditional) +missing module named urllib.unquote - imported by urllib (conditional), bottle (conditional) +missing module named urllib.quote - imported by urllib (conditional), bottle (conditional) +missing module named urllib.urlencode - imported by urllib (conditional), bottle (conditional) missing module named urlparse - imported by bottle (conditional) missing module named thread - imported by bottle (conditional), cffi.lock (conditional, optional), cffi.cparser (conditional, optional), sortedcontainers.sortedlist (conditional, optional) missing module named httplib - imported by bottle (conditional) @@ -173,4 +172,5 @@ missing module named collections.Set - imported by collections (optional), sorte missing module named collections.MutableSequence - imported by collections (optional), sortedcontainers.sortedlist (optional) missing module named _typeshed - imported by trio._file_io (conditional), trio._path (conditional) missing module named OpenSSL - imported by trio._dtls (delayed, conditional) +missing module named _scproxy - imported by urllib.request (conditional) missing module named fcntl - imported by subprocess (optional) diff --git a/douyin-login-launcher/build/desktop/xref-desktop.html b/douyin-login-launcher/build/desktop/xref-desktop.html index c8f81bb..0cec438 100644 --- a/douyin-login-launcher/build/desktop/xref-desktop.html +++ b/douyin-login-launcher/build/desktop/xref-desktop.html @@ -15,7 +15,7 @@
- desktop_app.py + desktop_app.py Script
imports: __future__ @@ -262,10 +262,14 @@ imports: • stat • subprocess • threading + • time • traceback • types • updater + • urllib + • urllib.error • urllib.parse + • urllib.request • version • warnings • weakref @@ -683,7 +687,7 @@ imported by: 'org.python' MissingModule
imported by: - copy + pickle • xml.sax
@@ -4941,7 +4945,7 @@ imported by:
- browser_open + browser_open SourceModule
imports: __future__ @@ -6783,8 +6787,8 @@ imported by: copy SourceModule
imports: - 'org.python' - • copyreg + copyreg + • org • types • weakref @@ -16230,7 +16234,7 @@ imported by: org MissingModule
imported by: - pickle + copy
@@ -17235,14 +17239,14 @@ imported by: pickle SourceModule
imports: - _compat_pickle + 'org.python' + • _compat_pickle • _pickle • codecs • copyreg • functools • io • itertools - • org • pprint • re • struct @@ -27029,6 +27033,7 @@ imported by: • browser_open • concurrent.futures._base • datetime + • desktop_app.py • email._parseaddr • email.generator • email.utils @@ -30095,7 +30100,7 @@ imported by:
- updater + updater SourceModule
imports: __future__ @@ -30129,6 +30134,7 @@ imports:
imported by: bottle + • desktop_app.py • email._header_value_parser • playwright._impl._network • updater @@ -30153,7 +30159,8 @@ imports:
imported by: - urllib.request + desktop_app.py + • urllib.request
@@ -30263,6 +30270,7 @@ imports: imported by: PyInstaller.lib.modulegraph.modulegraph • clr_loader.util.coreclr_errors + • desktop_app.py • http.cookiejar • setuptools._distutils.command.register • setuptools._distutils.command.upload @@ -30385,7 +30393,7 @@ imported by:
- version + version SourceModule
imported by: desktop_app.py diff --git a/douyin-login-launcher/dist/DouyinDesktop/DouyinDesktop.exe b/douyin-login-launcher/dist/DouyinDesktop/DouyinDesktop.exe index 2bfeffa..027eeae 100644 Binary files a/douyin-login-launcher/dist/DouyinDesktop/DouyinDesktop.exe and b/douyin-login-launcher/dist/DouyinDesktop/DouyinDesktop.exe differ diff --git a/douyin-login-launcher/dist/DouyinDesktop/_internal/base_library.zip b/douyin-login-launcher/dist/DouyinDesktop/_internal/base_library.zip index 355a58f..0d8fdd9 100644 Binary files a/douyin-login-launcher/dist/DouyinDesktop/_internal/base_library.zip and b/douyin-login-launcher/dist/DouyinDesktop/_internal/base_library.zip differ diff --git a/douyin-login-launcher/installer/DouyinHostedDesktop-Setup.exe b/douyin-login-launcher/installer/DouyinHostedDesktop-Setup-1.1.0.exe similarity index 88% rename from douyin-login-launcher/installer/DouyinHostedDesktop-Setup.exe rename to douyin-login-launcher/installer/DouyinHostedDesktop-Setup-1.1.0.exe index 5dd2334..49d61b6 100644 Binary files a/douyin-login-launcher/installer/DouyinHostedDesktop-Setup.exe and b/douyin-login-launcher/installer/DouyinHostedDesktop-Setup-1.1.0.exe differ diff --git a/douyin-login-launcher/version.py b/douyin-login-launcher/version.py index 8077f67..5548c60 100644 --- a/douyin-login-launcher/version.py +++ b/douyin-login-launcher/version.py @@ -5,4 +5,4 @@ 2) 同步修改 installer.iss 顶部的 AppVersion； 3) 重新打包，把新的 installer 与 latest.json 上传到服务器 /desktop/ 目录。 """ -__version__ = "1.0.0" +__version__ = "1.1.0" diff --git a/douyin-login-launcher/打包成安装包.bat b/douyin-login-launcher/打包成安装包.bat index db31156..e663b03 100644 --- a/douyin-login-launcher/打包成安装包.bat +++ b/douyin-login-launcher/打包成安装包.bat @@ -19,18 +19,33 @@ echo [3/4] Building exe (windowed, no cmd window)... if errorlevel 1 ( echo [ERROR] PyInstaller build failed & pause & exit /b 1 ) echo [4/4] Building installer... -set "ISCC=%LOCALAPPDATA%\Programs\Inno Setup 6\ISCC.exe" -if not exist "%ISCC%" set "ISCC=C:\Program Files (x86)\Inno Setup 6\ISCC.exe" -if not exist "%ISCC%" set "ISCC=C:\Program Files\Inno Setup 6\ISCC.exe" +call :find_iscc +if not exist "%ISCC%" ( + echo [setup] Inno Setup not found; installing via winget... + winget install JRSoftware.InnoSetup --accept-source-agreements --accept-package-agreements --silent --disable-interactivity + call :find_iscc +) if exist "%ISCC%" ( "%ISCC%" installer.iss + if errorlevel 1 ( echo [ERROR] Installer build failed & pause & exit /b 1 ) echo. echo [OK] Installer: installer\DouyinHostedDesktop-Setup.exe ) else ( - echo [WARN] Inno Setup not found. - echo Install it: winget install JRSoftware.InnoSetup - echo Or just distribute the folder: dist\DouyinDesktop\ + echo [ERROR] Inno Setup still not found. Install manually: + echo winget install JRSoftware.InnoSetup + echo Or just distribute the folder: dist\DouyinDesktop\ + pause + exit /b 1 ) +goto :after_installer + +:find_iscc +set "ISCC=%LOCALAPPDATA%\Programs\Inno Setup 6\ISCC.exe" +if not exist "%ISCC%" set "ISCC=C:\Program Files (x86)\Inno Setup 6\ISCC.exe" +if not exist "%ISCC%" set "ISCC=C:\Program Files\Inno Setup 6\ISCC.exe" +exit /b 0 + +:after_installer echo. echo [OK] Portable app folder: dist\DouyinDesktop\ (run DouyinDesktop.exe) pause