bugfix: Alignments remove version check for video file extension update

- Typofixes
deepfakes · Apr 21, 2024 · 0f94779 · 0f94779
1 parent be42b04
commit 0f94779
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 6 deletions.
diff --git a/.install/linux/faceswap_setup_x64.sh b/.install/linux/faceswap_setup_x64.sh
@@ -266,7 +266,7 @@ conda_opts () {
     echo ""
     info "Faceswap will be installed inside a Conda Environment. If an environment already\
     exists with the name specified then it will be deleted."
-    ask "Please specify a name for the Faceswap Conda Environmnet" "ENV_NAME"
+    ask "Please specify a name for the Faceswap Conda Environment" "ENV_NAME"
 }
 
 faceswap_opts () {

diff --git a/.install/macos/faceswap_setup_macos.sh b/.install/macos/faceswap_setup_macos.sh
@@ -298,7 +298,7 @@ conda_opts () {
     echo ""
     info "Faceswap will be installed inside a Conda Environment. If an environment already\
     exists with the name specified then it will be deleted."
-    ask "Please specify a name for the Faceswap Conda Environmnet" "ENV_NAME"
+    ask "Please specify a name for the Faceswap Conda Environment" "ENV_NAME"
 }
 
 faceswap_opts () {

diff --git a/lib/align/updater.py b/lib/align/updater.py
@@ -111,9 +111,8 @@ def test(self) -> bool:
         bool
             ``True`` if the key extensions need updating otherwise ``False``
         """
-        if self._alignments.version > 2.4:
-            return False
-
+        # Note: Don't check on alignments file version. It's possible that the file gets updated to
+        # a newer version before this check is run
         if self._extension.lower() not in VIDEO_EXTENSIONS:
             return False
 

diff --git a/lib/gui/control_helper.py b/lib/gui/control_helper.py
@@ -1061,7 +1061,7 @@ def _get_multi_help_items(helptext):
         if any(line.startswith(" - ") for line in all_help):
             intro = all_help[0]
         retval = (intro,
-                  {re.sub(r"[^A-Za-z0-9\-\_]+", "",
+                  {re.sub(r"[^\w\-\_]+", "",
                           line.split()[1].lower()): " ".join(line.replace("_", " ").split()[1:])
                    for line in all_help if line.startswith(" - ")})
         logger.debug("help items: %s", retval)