diff --git a/.gitignore b/.gitignore index 107543d6..3181541d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,50 +1,51 @@ ###################### -# SB User Related # +# SG User Related # cache/* -cache.db* -config.ini* Logs/* -sickbeard.db* -failed.db* +restore/ autoProcessTV/autoProcessTV.cfg +config.ini* +cache.db* +failed.db* +sickbeard.db* server.crt server.key -restore/ ###################### -# SB Test Related # +# SG Test Related # tests/cache/* tests/Logs/* -tests/sickgear.* tests/*.db +tests/sickgear.* ###################### # Compiled source # *.py[co] +**/__pycache__/ ###################### # IDE specific # +/.idea/ *.bak -*.tmp -*.wpr +*.cproject *.project *.pydevproject -*.cproject +*.sw? +*.tmp *.tmproj *.tmproject -*.sw? +*.wpr Session.vim .ropeproject/* ###################### # OS generated files # +*.torrent +*~ +.directory +.DS_Store .Spotlight-V100 .Trashes -.DS_Store desktop.ini ehthumbs.db Thumbs.db -.directory -*~ -/.idea/ -*.torrent diff --git a/CHANGES.md b/CHANGES.md index bfc40ed5..10c13574 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,4 +1,13 @@ -### 3.27.12 (2023-03-08 23:30:00 UTC) +### 3.27.13 (2023-04-12 10:15:00 UTC) + +* Change fix show id log output +* Change handle exceptions thrown from pkg_resources parsing newly extended working set modules not even used by SG +* Fix parsing shows where multiple same names are in SG and show_obj is set for parser +* Change update fallback zoneinfo to 2023c +* Change allow Python 3.11.3, 3.10.11 + + +### 3.27.12 (2023-03-08 23:30:00 UTC) * Change meta providers to new TVInfoAPI get_show to make sure language is used diff --git a/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz b/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz index 8704c5ca..49cae214 100644 Binary files a/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz and b/lib/dateutil/zoneinfo/dateutil-zoneinfo.tar.gz differ diff --git a/sickgear/name_parser/parser.py b/sickgear/name_parser/parser.py index 676a878d..cd2d5eb6 100644 --- a/sickgear/name_parser/parser.py +++ b/sickgear/name_parser/parser.py @@ -60,7 +60,7 @@ class NameParser(object): naming_pattern=False, testing=False, indexer_lookup=True): self.file_name = file_name # type: bool - self.show_obj = show_obj # type: sickgear.tv.TVShow or None + self.show_obj = show_obj # type: Optional[sickgear.tv.TVShow] self.try_scene_exceptions = try_scene_exceptions # type: bool self.convert = convert # type: bool self.naming_pattern = naming_pattern # type: bool @@ -304,7 +304,9 @@ class NameParser(object): # confirm passed in show object tvid_prodid matches result show object tvid_prodid if show_obj and not self.testing: - if self.show_obj and show_obj.tvid_prodid != self.show_obj.tvid_prodid: + if self.show_obj and show_obj.tvid_prodid != self.show_obj.tvid_prodid \ + and helpers.full_sanitize_scene_name(show_obj.name) != \ + helpers.full_sanitize_scene_name(self.show_obj.name): show_obj = None elif not show_obj and self.show_obj: show_obj = self.show_obj diff --git a/sickgear/piper.py b/sickgear/piper.py index e904ce01..ac5f4c26 100644 --- a/sickgear/piper.py +++ b/sickgear/piper.py @@ -205,7 +205,10 @@ def _check_pip_env(pip_outdated=False, reset_fails=False): import pkg_resources six.moves.reload_module(pkg_resources) for cur_distinfo in pkg_resources.working_set: - environment[cur_distinfo.project_name] = cur_distinfo.parsed_version + try: + environment[cur_distinfo.project_name] = cur_distinfo.parsed_version + except (BaseException, Exception): + pass save_failed = False known_failed = load_ignorables(DATA_DIR)