Commit 078bbb9f authored by echel0n's avatar echel0n

Merge branch 'release-v9.4.159'

parents 9c4df906 7b9f412c
......@@ -34,6 +34,7 @@ autoProcessTV.cfg
/tests/providers/
/tests/show name/
/tests/show name final/
/tests/sr_update_*/
# Compiled Source #
######################
......
......@@ -20,17 +20,14 @@
# along with SiCKRAGE. If not, see <http://www.gnu.org/licenses/>.
# ##############################################################################
import os
import pathlib
if __name__ == '__main__':
# removes stale .pyc files
for root, dirs, files in os.walk(os.path.dirname(__file__)):
pyc_files = list(filter(lambda filename: filename.endswith(".pyc"), files))
py_files = set(filter(lambda filename: filename.endswith(".py"), files))
excess_pyc_files = list(filter(lambda pyc_filename: pyc_filename[:-1] not in py_files, pyc_files))
for excess_pyc_file in excess_pyc_files:
full_path = os.path.join(root, excess_pyc_file)
os.remove(full_path)
# remove pyc and pyo files
[p.unlink() for p in pathlib.Path('.').rglob('*.py[co]')]
# remove __pycache__ folder
[p.rmdir() for p in pathlib.Path('.').rglob('__pycache__')]
from sickrage import main
......
# Changelog
- * 763629b05 - 2019-07-31: Refactored cleanup of pyc, pyo, and __pycache__ files and folders.
- * b4f32269e - 2019-07-31: Updated gitignore file
- * e210a8fb3 - 2019-07-31: Refactored post-processing to properly handle specials. Fixed issues with post-processing when version is none type.
- * 67acc5d9f - 2019-07-31: Refactored download link for source installs to accommodate develop releases.
- * 89e49316f - 2019-07-31: Fixed issues with saving metadata provider settings.
- * cec8a876a - 2019-07-31: Pre-Release v9.4.159.dev1
- * 5db54c4bd - 2019-07-31: Release v9.4.158
- * 67b328efe - 2019-07-31: Refactored requirements.txt to replace package hachoir3 with hachoir, hachoir3 was removed from PyPi.
- * a7367cfd6 - 2019-07-30: Refactored SiCKRAGE API web session requests to retry 3 times with 1s pause between retries.
- * c8b25004d - 2019-07-30: Added passing of database session for scene number function calls in display show web handler.
......
......@@ -2367,7 +2367,7 @@ class Config(object):
bool) else getattr(providerObj, x))
for x in provider_keys if hasattr(providerObj, x)]) for providerID, providerObj in
sickrage.app.search_providers.all().items()}),
'MetadataProviders': {metadataProviderID: metadataProviderObj.get_config() for
'MetadataProviders': {metadataProviderID: metadataProviderObj.config for
metadataProviderID, metadataProviderObj in sickrage.app.metadata_providers.items()}
})
......
......@@ -701,7 +701,7 @@ class PostProcessor(object):
show_id = cur_show_id
if cur_season:
if cur_season is not None:
season = cur_season
if len(cur_episodes):
......@@ -717,7 +717,7 @@ class PostProcessor(object):
if cur_release_group is not None:
release_group = cur_release_group
if all([show_id, season, len(episodes) > 0, quality, version]):
if all([show_id, season is not None, len(episodes) > 0, quality]):
break
return show_id, season, episodes, quality, version, release_group
......@@ -929,8 +929,8 @@ class PostProcessor(object):
if not show_object:
self._log("This show isn't in your list, you need to add it to SiCKRAGE before post-processing an episode")
raise EpisodePostProcessingFailedException()
elif not len(episodes):
self._log("Not enough information to determine what episode this is. Quitting post-processing")
elif not all([season is not None, len(episodes)]):
self._log("Not enough information to determine what season/episode this is. Quitting post-processing")
return False
# retrieve/create the corresponding TVEpisode objects
......
......@@ -618,7 +618,7 @@ class SourceUpdateManager(UpdateManager):
Downloads the latest source tarball from server and installs it over the existing version.
"""
tar_download_url = 'https://git.sickrage.ca/SiCKRAGE/sickrage/repository/archive.tar.gz?ref=master'
tar_download_url = 'https://git.sickrage.ca/SiCKRAGE/sickrage/repository/archive.tar.gz?ref={}'.format(('master', 'develop')['dev' in self.version])
try:
if not self.install_requirements(self.current_branch):
......
......@@ -1560,7 +1560,7 @@
</div>
</div>
<input type="hidden" name="${cur_id}_data" id="${cur_id}_data"
value="${cur_generator.get_config()}"/>
value="${cur_generator.config}"/>
% endfor
</div>
</div>
......
......@@ -87,21 +87,6 @@ class GenericMetadata(object):
self.season_all_poster = season_all_poster
self.season_all_banner = season_all_banner
def get_config(self):
config_list = [self.show_metadata,
self.episode_metadata,
self.fanart,
self.poster,
self.banner,
self.episode_thumbnails,
self.season_posters,
self.season_banners,
self.season_all_poster,
self.season_all_banner,
self.enabled]
return '|'.join([str(int(x)) for x in config_list])
@property
def id(self):
return str(re.sub(r"[^\w\d_]", "_", str(re.sub(r"[+]", "plus", self.name))).lower())
......@@ -117,7 +102,7 @@ class GenericMetadata(object):
value = '0|0|0|0|0|0|0|0|0|0|0'
self.show_metadata, self.episode_metadata, self.fanart, self.poster, self.banner, self.episode_thumbnails, self.season_posters, \
self.season_banners, self.season_all_poster, self.season_all_banner, self.enabled = tuple(map(bool, value.split('|')))
self.season_banners, self.season_all_poster, self.season_all_banner, self.enabled = tuple(map(bool, map(int, value.split('|'))))
@staticmethod
def _check_exists(location):
......
9.4.158
\ No newline at end of file
9.4.159
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment