From a56d39f6a24062b04de3431343accb085d227cc0 Mon Sep 17 00:00:00 2001
From: fangrong <darkbluesky@outlook.com>
Date: Wed, 11 Sep 2024 18:57:05 +0800
Subject: [PATCH] Move startfile import to WriteRestartCmd func, replace TMFH
 with NTM

---
 .idea/inspectionProfiles/Custom.xml | 10 +++++++++
 .idea/vcs.xml                       |  3 +++
 TWLMagician.py                      | 33 +++++++++++++++--------------
 3 files changed, 30 insertions(+), 16 deletions(-)

diff --git a/.idea/inspectionProfiles/Custom.xml b/.idea/inspectionProfiles/Custom.xml
index 19faca1..ebf07a3 100644
--- a/.idea/inspectionProfiles/Custom.xml
+++ b/.idea/inspectionProfiles/Custom.xml
@@ -7,6 +7,16 @@
       </Languages>
     </inspection_tool>
     <inspection_tool class="PyBroadExceptionInspection" enabled="false" level="WEAK WARNING" enabled_by_default="false" />
+    <inspection_tool class="PyPackageRequirementsInspection" enabled="true" level="WARNING" enabled_by_default="true">
+      <option name="ignoredPackages">
+        <value>
+          <list size="2">
+            <item index="0" class="java.lang.String" itemvalue="tkinter" />
+            <item index="1" class="java.lang.String" itemvalue="certifi" />
+          </list>
+        </value>
+      </option>
+    </inspection_tool>
     <inspection_tool class="PyPep8Inspection" enabled="true" level="WEAK WARNING" enabled_by_default="true">
       <option name="ignoredErrors">
         <list>
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
index 487f1d3..44002bf 100644
--- a/.idea/vcs.xml
+++ b/.idea/vcs.xml
@@ -3,5 +3,8 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="" vcs="Git" />
     <mapping directory="$PROJECT_DIR$/py_langs" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/rmdot_files" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/tk_tooltip" vcs="Git" />
+    <mapping directory="$PROJECT_DIR$/tkinter_tooltips" vcs="Git" />
   </component>
 </project>
\ No newline at end of file
diff --git a/TWLMagician.py b/TWLMagician.py
index 6a6a231..bb9e39f 100644
--- a/TWLMagician.py
+++ b/TWLMagician.py
@@ -2,7 +2,7 @@
 # coding=utf-8
 
 # TWLMagician
-# Version 1.2.6
+# Version 1.2.7
 # Author: R-YaTian
 # Original "HiyaCFW-Helper" Author: mondul <mondul@huyzona.com>
 
@@ -11,7 +11,7 @@
                      END)
 from tkinter.messagebox import askokcancel, showerror, showinfo, WARNING
 from tkinter.filedialog import askopenfilename, askdirectory
-from os import path, remove, chmod, listdir, environ, mkdir, startfile
+from os import path, remove, chmod, listdir, environ, mkdir
 from sys import exit, stdout
 from threading import Thread
 from queue import Queue, Empty
@@ -35,7 +35,7 @@
 ssl._create_default_https_context = ssl._create_unverified_context
 ntime_tmp = None
 downloadfile = False
-version_number = 126
+version_number = 127
 
 
 # Check Update
@@ -56,6 +56,7 @@ def get_version():
 
 
 def WriteRestartCmd():
+    from os import startfile
     fbat = open('upgrade.cmd', 'w')
     TempList = '@echo off\n'
     TempList += 'if not exist ' + 'OTA.exe' + ' exit\n'
@@ -355,13 +356,13 @@ def __init__(self, master=None):
 
         self.dkp2_chk.pack(padx=10, anchor=W)
 
-        self.tmfh = IntVar()
-        self.tmfh.set(0)
+        self.ntm = IntVar()
+        self.ntm.set(0)
 
-        self.tmfh_chk = Checkbutton(
-            self.checks_frame2, text=_('同时安装TMFH'), variable=self.tmfh)
+        self.ntm_chk = Checkbutton(
+            self.checks_frame2, text=_('同时安装NTM'), variable=self.ntm)
 
-        self.tmfh_chk.pack(padx=10, anchor=W)
+        self.ntm_chk.pack(padx=10, anchor=W)
 
         self.updatemenu = IntVar()
         self.updatemenu.set(0)
@@ -585,8 +586,8 @@ def change_mode2(self):
             self.updatehiya.set(0)
         if self.updatemenu.get() == 1:
             self.updatemenu.set(0)
-        if self.tmfh.get() == 1:
-            self.tmfh.set(0)
+        if self.ntm.get() == 1:
+            self.ntm.set(0)
         self.start_button.pack_forget()
         self.exit_button.pack_forget()
         if self.transfer_mode:
@@ -2273,7 +2274,7 @@ def get_common_data(self):
         self.folders.append('hiya')
         self.folders.append('title')
         self.folders.append('ticket')
-        self.folders.append('TMFH')
+        self.folders.append('NTM')
 
         try:
             if not path.isfile('Common.dat'):
@@ -2287,9 +2288,9 @@ def get_common_data(self):
 
             self.log.write(_('- 正在解压通用数据...'))
 
-            if self.tmfh.get() == 1:
+            if self.ntm.get() == 1:
                 self.proc = Popen([_7za, 'x', '-bso0', '-y', '-pR-YaTian',
-                                   'Common.dat', 'hiya', 'title', 'ticket', 'TMFH'])
+                                   'Common.dat', 'hiya', 'title', 'ticket', 'NTM'])
             else:
                 self.proc = Popen(
                     [_7za, 'x', '-bso0', '-y', '-pR-YaTian', 'Common.dat', 'hiya', 'title', 'ticket'])
@@ -2397,9 +2398,9 @@ def transfer_main(self):
         launcherdir = path.join(
             self.sd_path1, 'title', '00030017', launcher_id, 'content', launcher_name)
         copyfile(self.dest_region + '.app', launcherdir)
-        if self.tmfh.get() == 1:
-            self.log.write(_('正在安装TMFH...'))
-            copytree('TMFH/title', path.join(self.sd_path1, 'title'), dirs_exist_ok=True)
+        if self.ntm.get() == 1:
+            self.log.write(_('正在安装NTM...'))
+            copytree('NTM/title', path.join(self.sd_path1, 'title'), dirs_exist_ok=True)
         if self.updatemenu.get() == 1:
             if self.have_menu is True:
                 self.log.write(_('正在更新TWiLightMenu++...'))