More fixes from switching to zip files: make the language and style menus work properly.

Author: NSoiffer

addon/globalPlugins/MathCAT/MathCATPreferences.py

@@ -283,6 +283,10 @@ def GetLanguages(self):
                 path_to_language_folder = os.path.join(UserInterface.path_to_languages_folder(), language)
                 # only add this language if there is a xxx_Rules.yaml file
                 files = glob.glob(os.path.join(path_to_language_folder, "*_Rules.yaml"))
+                if len(files) == 0:
+                    # look in the .zip file for the style files -- it might not have been unzipped
+                    zip_file = ZipFile(f"{path_to_language_folder}\\{language}.zip", "r")
+                    files = [name for name in zip_file.namelist() if name.endswith('_Rules.yaml')]
                 if files:
                     # add to the listbox the text for this language together with the code
                     if languages_dict.get(language, "missing") != "missing":
@@ -330,6 +334,7 @@ def GetSpeechStyles(self, this_SpeechStyle: str):
             this_language_code = getCurrentLanguage().lower().replace("_", "-")
             # FIX: when dialog is aware of regional dialects, remove this next line that removes the dialect part
             this_language_code = this_language_code.split("-")[0]  # grab the first part
+            log.info(f"Language==Auto, voice is '{this_language_code}'")
 
         this_language_path = (
             os.path.expanduser("~")
@@ -338,14 +343,17 @@ def GetSpeechStyles(self, this_SpeechStyle: str):
         )
         this_path = this_language_path + "\\*_Rules.yaml"
         # populate the m_choiceSpeechStyle choices
-        all_style_files = glob.glob(this_path)  # works for unzipped dirs
+        # start with listing unzipped dirs
+        all_style_files = [os.path.basename(name) for name in glob.glob(this_path)]
+        log.info(f'\nGetSpeechStyles: lang={this_language_code}, non-zipped sytle files found: {all_style_files}')
         if len(all_style_files) == 0:
             # look in the .zip file for the style files
             zip_file = ZipFile(f"{this_language_path}\\{this_language_code}.zip", "r")
-            all_style_files = [name for name in zip_file.namelist() if name.endswith('.jpg')]
-        for f in glob.glob(this_path):
-            fname = os.path.basename(f)
-            self.m_choiceSpeechStyle.Append((fname[: fname.find("_Rules.yaml")]))
+            all_style_files = [name for name in zip_file.namelist() if name.endswith('_Rules.yaml')]
+            log.info(f'...: non-zipped style files found: {all_style_files}')
+        for name in all_style_files:
+            log.info(f'...in loop, appending name="{name[: name.find("_Rules.yaml")]}"')
+            self.m_choiceSpeechStyle.Append((name[: name.find("_Rules.yaml")]))
         try:
             # set the SpeechStyle to the same as previous
             self.m_choiceSpeechStyle.SetStringSelection(this_SpeechStyle)