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 update gitignore.
This commit is contained in:
Prinz23 2023-03-14 10:45:38 +00:00 committed by JackDandy
parent 41a72bdb4d
commit 49f6c99e0a
5 changed files with 36 additions and 21 deletions

35
.gitignore vendored
View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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)