Merge pull request #509 from Ninohana/main

移动代码到更合理的位置
Zzaphkiel · Nov 1, 2024 · c9fed2a · c9fed2a
2 parents 77ee73f + 29b5883
commit c9fed2a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/app/lol/connector.py b/app/lol/connector.py
@@ -3,6 +3,7 @@
 import json
 import os
 import re
+import subprocess
 import threading
 import time
 from asyncio import CancelledError
@@ -988,7 +989,10 @@ async def spectateDirectly(self, summonerName):
                   f" {credentials['gameId']}"
                   f" {self.server}")
 
-        return params
+        pwd = os.getcwd()
+        os.chdir(f"{cfg.get(cfg.lolFolder)[0]}/../Game")
+        subprocess.Popen(['League of Legends.exe', f'{params}'])
+        os.chdir(pwd)
 
     async def dodge(self):
         data = {

diff --git a/app/view/auxiliary_interface.py b/app/view/auxiliary_interface.py
@@ -1,6 +1,5 @@
 import os
 import stat
-import subprocess
 import threading
 
 from PyQt5.QtCore import Qt, pyqtSignal, QEvent, QSize
@@ -898,11 +897,7 @@ def info(type, title, content):
             if self.spectateTypeComboBox.currentData() == 'LCU':
                 await connector.spectate(text)
             else:
-                res = await connector.spectateDirectly(text)
-                pwd = os.getcwd()
-                os.chdir(f"{cfg.get(cfg.lolFolder)[0]}/../Game")
-                subprocess.Popen(['League of Legends.exe', f'{res}'])
-                os.chdir(pwd)
+                await connector.spectateDirectly(text)
 
         except SummonerNotFound:
             info('error', self.tr("Summoner not found"),