trying fix img.show()

Hobr · Jun 25, 2024 · 1c242fb · 1c242fb
1 parent c47a4d7
commit 1c242fb
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 7 deletions.
diff --git a/util/Data/__init__.py b/util/Data/__init__.py
@@ -13,7 +13,7 @@
 from Crypto.Util.Padding import pad, unpad
 from inquirer.themes import GreenPassion
 from loguru import logger
-from qrcode import QRCode  # type: ignore
+import qrcode
 
 
 class CustomThemes(GreenPassion):
@@ -43,18 +43,16 @@ def JsonpToDict(self, data: str) -> dict:
         return json.loads(json_str)
 
     @logger.catch
-    def QRGenerate(self, url: str, img_path: str) -> None:
+    def QRGenerate(self, url: str) -> None:
         """
         生成二维码
 
         url: 链接
         img_path: 保存路径
         """
-        qr = QRCode()
+        qr = qrcode.QRCode()
         qr.add_data(url)
-
         img = qr.make_image()
-        img.save(img_path)
 
         try:
             parent_pid = psutil.Process(os.getpid()).ppid()
@@ -68,7 +66,7 @@ def QRGenerate(self, url: str, img_path: str) -> None:
         if os.name == "nt":
             if parent_name == "powershell.exe" or "WT_SESSION" in os.environ:
                 qr.print_ascii(invert=True)
-            elif parent_name == "cmd.exe" or len(argv) == 1 and not argv[0].endswith(".py"):
+            elif parent_name == "cmd.exe" or argv[0].endswith(".exe"):
                 img.show()
             else:
                 qr.print_ascii(invert=True)

diff --git a/util/Login/__init__.py b/util/Login/__init__.py
@@ -67,7 +67,7 @@ def QRCode(self) -> dict:
 
         if resp["code"] == 0:
             url = resp["data"]["url"]
-            self.data.QRGenerate(url, "qr.jpg")
+            self.data.QRGenerate(url)
 
             t = 0
             while True: