Update pyinstaller and language library

Author: cdgriffith

.github/workflows/build.yaml

@@ -40,11 +40,6 @@ jobs:
           pip install .
           pip install .[develop]
 
-      - name: Grab iso-639 lists
-        run: |
-          cp $(python -c "import iso639; print(iso639.mapping.TABLE_PATH)") iso-639-3.tab
-          cp $(python -c "import iso639; print(iso639.mapping.MAPPING_PATH)") iso-639-3.json
-
       - name: Build single executable
         run: pyinstaller FastFlix_Nix_OneFile.spec
 

FastFlix_Nix_OneFile.spec

@@ -28,7 +28,7 @@ all_imports.append("iso639")
 
 a = Analysis(['fastflix/__main__.py'],
              binaries=[],
-             datas=[('iso-639-3.tab', 'iso639'), ('iso-639-3.json', 'iso639'), ('CHANGES', 'fastflix/.'), ('docs/build-licenses.txt', 'docs')] + all_fastflix_files,
+             datas=[('CHANGES', 'fastflix/.'), ('docs/build-licenses.txt', 'docs')] + all_fastflix_files,
              hiddenimports=all_imports,
              hookspath=[],
              runtime_hooks=[],

FastFlix_Windows_Installer.spec

@@ -26,7 +26,7 @@ all_imports.append("iso639")
 
 a = Analysis(['fastflix\\__main__.py'],
              binaries=[],
-             datas=[('iso-639-3.tab', 'iso639'), ('iso-639-3.json', 'iso639'), ('CHANGES', 'fastflix\\.'), ('docs\\build-licenses.txt', 'docs')] + all_fastflix_files,
+             datas=[('CHANGES', 'fastflix\\.'), ('docs\\build-licenses.txt', 'docs')] + all_fastflix_files,
              hiddenimports=all_imports,
              hookspath=[],
              runtime_hooks=[],

FastFlix_Windows_OneFile.spec

@@ -33,7 +33,7 @@ with open(portable_file, "w") as portable:
 
 a = Analysis(['fastflix\\__main__.py'],
              binaries=[],
-             datas=[('iso-639-3.tab', 'iso639'), ('iso-639-3.json', 'iso639'), ('CHANGES', 'fastflix\\.'), ('docs\\build-licenses.txt', 'docs')] + all_fastflix_files,
+             datas=[('CHANGES', 'fastflix\\.'), ('docs\\build-licenses.txt', 'docs')] + all_fastflix_files,
              hiddenimports=all_imports,
              hookspath=[],
              runtime_hooks=[],

fastflix/widgets/panels/audio_panel.py

@@ -4,7 +4,7 @@
 import logging
 
 from box import Box
-from iso639 import Lang
+from iso639 import Lang, iter_langs
 from iso639.exceptions import InvalidLanguageValue
 from PySide6 import QtCore, QtGui, QtWidgets
 
@@ -20,7 +20,7 @@
 from fastflix.widgets.windows.audio_conversion import AudioConversion
 from fastflix.widgets.windows.disposition import Disposition
 
-language_list = sorted((k for k, v in Lang._data["name"].items() if v["pt2B"] and v["pt1"]), key=lambda x: x.lower())
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
 logger = logging.getLogger("fastflix")
 
 disposition_options = [

fastflix/widgets/panels/subtitle_panel.py

@@ -3,7 +3,7 @@
 from typing import Union
 
 from box import Box
-from iso639 import Lang
+from iso639 import Lang, iter_langs
 from iso639.exceptions import InvalidLanguageValue
 from PySide6 import QtCore, QtGui, QtWidgets
 
@@ -41,7 +41,7 @@
     "xsub": "text",
 }
 
-language_list = sorted((k for k, v in Lang._data["name"].items() if v["pt2B"] and v["pt1"]), key=lambda x: x.lower())
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
 
 # TODO give warning about exact time needed for text based subtitles
 

fastflix/widgets/settings.py

@@ -4,7 +4,7 @@
 import shutil
 from pathlib import Path
 
-from iso639 import Lang
+from iso639 import Lang, iter_langs
 from iso639.exceptions import InvalidLanguageValue
 from PySide6 import QtCore, QtGui, QtWidgets
 
@@ -14,7 +14,7 @@
 from fastflix.shared import error_message, link
 
 logger = logging.getLogger("fastflix")
-language_list = sorted((k for k, v in Lang._data["name"].items() if v["pt2B"] and v["pt1"]), key=lambda x: x.lower())
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
 
 known_language_list = [
     "English",

fastflix/widgets/windows/profile_window.py

@@ -3,7 +3,7 @@
 import logging
 
 from box import Box
-from iso639 import Lang
+from iso639 import Lang, iter_langs
 from PySide6 import QtCore, QtGui, QtWidgets
 
 from fastflix.exceptions import FastFlixError
@@ -16,7 +16,7 @@
 from fastflix.shared import error_message
 from fastflix.encoders.common.audio import channel_list
 
-language_list = sorted((k for k, v in Lang._data["name"].items() if v["pt2B"] and v["pt1"]), key=lambda x: x.lower())
+language_list = [v.name for v in iter_langs() if v.pt2b and v.pt1]
 
 logger = logging.getLogger("fastflix")
 

pyproject.toml

@@ -28,7 +28,7 @@ dependencies = [
     "chardet>=5.1.0,<5.2.0",
     "colorama>=0.4,<1.0",
     "coloredlogs>=15.0,<16.0",
-    "iso639-lang==0.0.9",
+    "iso639-lang>=2.6.0,<3.0",
     "mistune>=2.0,<3.0",
     "packaging>=23.2",
     "pathvalidate>=2.4,<3.0",
@@ -47,7 +47,7 @@ dependencies = [
 develop = [
     "wheel>=0.38.4",
     "typing_extensions>=4.4",
-    "pyinstaller==6.9.0",
+    "pyinstaller==6.13.0",
     "pytest>=7.3",
     "types-requests>=2.28",
     "types-setuptools>=65.7",