Fixed Windows-based bugs

cabernetwork · Apr 24, 2023 · 7d22f74 · 7d22f74
1 parent c16ddd6
commit 7d22f74
Show file tree

Hide file tree

Showing 6 changed files with 36 additions and 12 deletions.
diff --git a/build/WINDOWS/TvhLib.nsh b/build/WINDOWS/TvhLib.nsh
@@ -188,8 +188,6 @@ Function AddFiles
     File /r /x __pycache__ /x development "${SOURCEPATH}\lib\*.*"
     SetOutPath "$INSTDIR\plugins"
     File /r /x __pycache__ "${SOURCEPATH}\plugins\*.*"
-    SetOutPath "$INSTDIR\plugins_ext"
-    File /r /x __pycache__ /x provider* "${SOURCEPATH}\plugins_ext\*.*"
 
     SetOutPath "$INSTDIR\build\WINDOWS"
     File "${SOURCEPATH}\build\WINDOWS\UpdateConfig.pyw"

diff --git a/build/WINDOWS/buildwin.nsi b/build/WINDOWS/buildwin.nsi
@@ -6,7 +6,7 @@
 !define PRODUCT_NAME "cabernet"
 !define PRODUCT_VERSION ${VERSION}
 !define PRODUCT_PUBLISHER "rocky4546"
-!define PRODUCT_WEB_SITE "http://www.mycompany.com"
+!define PRODUCT_WEB_SITE "https://github.com/cabernetwork/cabernet"
 !define PRODUCT_DIR_REGKEY "Software\Microsoft\Windows\CurrentVersion\App Paths\tvh_main.py"
 !define PRODUCT_UNINST_KEY "Software\Microsoft\Windows\CurrentVersion\Uninstall\${PRODUCT_NAME}"
 !define PRODUCT_UNINST_ROOT_KEY "HKLM"
@@ -224,9 +224,16 @@ FunctionEnd
 
 
 Function un.onInit
+    Var /GLOBAL remove_all
     !insertmacro MULTIUSER_UNINIT
-    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name) and all of its components?" IDYES +2
+    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Are you sure you want to completely remove $(^Name)?" IDYES +2
     Abort
+    MessageBox MB_ICONQUESTION|MB_YESNO|MB_DEFBUTTON2 "Do you want to remove all data and plugins?" IDYES true2
+    StrCpy $remove_all "0"
+    Goto end2
+    true2:
+    StrCpy $remove_all "1"
+    end2:
 FunctionEnd
 
 
@@ -242,17 +249,35 @@ Section Uninstall
         Call un.installService
     ${EndIf}
 
-    #Delete "$INSTDIR\${PRODUCT_NAME}.url"
-    #Delete "$INSTDIR\uninst.exe"
-    RMDIR /r "$INSTDIR\*.*"
+    ${If} $remove_all == "1"
+        RMDIR /r "$INSTDIR\*.*"
+    ${Else}
+        #Delete Cabernet folders
+        RMDIR /r "$INSTDIR\build"
+        RMDIR /r "$INSTDIR\lib"
+        RMDIR /r "$INSTDIR\plugins"
+
+        #Delete Cabernet files
+        Delete "$INSTDIR\CHANGE*.*"
+        Delete "$INSTDIR\Dock*"
+        Delete "$INSTDIR\LIC*"
+        Delete "$INSTDIR\READ*.*"
+        Delete "$INSTDIR\req*.*"
+        Delete "$INSTDIR\tvh*.*"
+        Delete "$INSTDIR\uninst.exe"
+        Delete "$INSTDIR\${PRODUCT_NAME}.url"
+    ${EndIf}
 
     Delete "$SMPROGRAMS\$ICONS_GROUP\Uninstall.lnk"
     Delete "$SMPROGRAMS\$ICONS_GROUP\Website.lnk"
     Delete "$DESKTOP\cabernet.lnk"
     Delete "$SMPROGRAMS\$ICONS_GROUP\cabernet.lnk"
 
     RMDir "$SMPROGRAMS\$ICONS_GROUP"
-    RMDir "$INSTDIR"
+
+    ${If} $remove_all == "1"
+        RMDir "$INSTDIR"
+    ${EndIf}
 
     DeleteRegKey ${PRODUCT_UNINST_ROOT_KEY} "${PRODUCT_UNINST_KEY}"
     DeleteRegKey HKLM "${PRODUCT_DIR_REGKEY}"

diff --git a/lib/common/utils.py b/lib/common/utils.py
@@ -37,7 +37,7 @@
 
 import lib.common.exceptions as exceptions
 
-VERSION = '0.9.12.14'
+VERSION = '0.9.12.15'
 CABERNET_URL = 'https://github.com/cabernetwork/cabernet'
 CABERNET_ID = 'cabernet'
 CABERNET_REPO = 'manifest.json'

diff --git a/lib/config/user_config.py b/lib/config/user_config.py
@@ -54,7 +54,6 @@ def config_json(_webserver):
 
 
 class TVHUserConfig:
-    config_handler = configparser.ConfigParser(interpolation=None)
 
     def __init__(self, _script_dir=None, _opersystem=None, _args=None, _config=None):
         self.logger = None
@@ -63,6 +62,7 @@ def __init__(self, _script_dir=None, _opersystem=None, _args=None, _config=None)
         self.script_dir = str(_script_dir)
         self.defn_json = config_defn.load_default_config_defns()
         self.data = self.defn_json.get_default_config()
+        self.config_handler = configparser.ConfigParser(interpolation=None)
 
         if _script_dir is not None:
             config_file = TVHUserConfig.get_config_path(_script_dir, _args)

diff --git a/lib/db/datamgmt/data_mgmt_html.py b/lib/db/datamgmt/data_mgmt_html.py
@@ -474,7 +474,8 @@ def select_del_instance(self):
         for ns, inst_list in name_inst_dict.items():
             for inst in inst_list:
                 section = utils.instance_config_section(ns, inst)
-                if self.config.get(section) and self.config[section]['enabled']:
+                if self.config.get(section) \
+                        and self.config[section].get('enabled'):
                     name_inst.append(''.join([
                         ns, ':', inst]))
         db_channels = DBChannels(self.config)

diff --git a/lib/db/db.py b/lib/db/db.py
@@ -308,7 +308,7 @@ def export_sql(self, backup_folder):
                 shutil.make_archive(backup_filelink, 'zip', db_linkfilepath)
 
             backup_file = pathlib.Path(backup_folder, self.db_name + BACKUP_EXT)
-            with open(backup_file, 'w') as export_f:
+            with open(backup_file, 'w', encoding='utf-8') as export_f:
                 for line in DB.conn[self.db_name][threading.get_ident()].iterdump():
                     export_f.write('%s\n' % line)
         except PermissionError as e: