moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2024-12-13 11:32:20 -05:00
Code Issues Releases Wiki Activity

Merge pull request #724 from echel0n/dev

Browse Source 
Dev
This commit is contained in:
echel0n 2014-08-17 00:18:43 -07:00
commit 1b1c4f6035
4 changed files with 14 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sickbeard/__init__.py
View File

@ -444,7 +444,7 @@ __INITIALIZED__ = False
def initialize(consoleLogging=True): def initialize(consoleLogging=True):
with INIT_LOCK: with INIT_LOCK:
global BRANCH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \ global BRANCH, CUR_COMMIT_HASH, ACTUAL_LOG_DIR, LOG_DIR, WEB_PORT, WEB_LOG, ENCRYPTION_VERSION, WEB_ROOT, WEB_USERNAME, WEB_PASSWORD, WEB_HOST, WEB_IPV6, USE_API, API_KEY, ENABLE_HTTPS, HTTPS_CERT, HTTPS_KEY, \
HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \ HANDLE_REVERSE_PROXY, USE_NZBS, USE_TORRENTS, NZB_METHOD, NZB_DIR, DOWNLOAD_PROPERS, CHECK_PROPERS_INTERVAL, ALLOW_HIGH_PRIORITY, TORRENT_METHOD, \
SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \ SAB_USERNAME, SAB_PASSWORD, SAB_APIKEY, SAB_CATEGORY, SAB_HOST, \
NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \ NZBGET_USERNAME, NZBGET_PASSWORD, NZBGET_CATEGORY, NZBGET_PRIORITY, NZBGET_HOST, NZBGET_USE_HTTPS, backlogSearchScheduler, \
@ -514,6 +514,9 @@ def initialize(consoleLogging=True):
# branch # branch
BRANCH = check_setting_str(CFG, 'General', 'branch', '') BRANCH = check_setting_str(CFG, 'General', 'branch', '')
# current commit hash
CUR_COMMIT_HASH = check_setting_str(CFG, 'General', 'cur_commit_hash', '')
ACTUAL_CACHE_DIR = check_setting_str(CFG, 'General', 'cache_dir', 'cache') ACTUAL_CACHE_DIR = check_setting_str(CFG, 'General', 'cache_dir', 'cache')
# fix bad configs due to buggy code # fix bad configs due to buggy code
if ACTUAL_CACHE_DIR == 'None': if ACTUAL_CACHE_DIR == 'None':
@ -1306,6 +1309,7 @@ def save_config():
# For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config() # For passwords you must include the word `password` in the item_name and add `helpers.encrypt(ITEM_NAME, ENCRYPTION_VERSION)` in save_config()
new_config['General'] = {} new_config['General'] = {}
new_config['General']['branch'] = BRANCH new_config['General']['branch'] = BRANCH
new_config['General']['cur_commit_hash'] = CUR_COMMIT_HASH
new_config['General']['config_version'] = CONFIG_VERSION new_config['General']['config_version'] = CONFIG_VERSION
new_config['General']['encryption_version'] = int(ENCRYPTION_VERSION) new_config['General']['encryption_version'] = int(ENCRYPTION_VERSION)
new_config['General']['log_dir'] = ACTUAL_LOG_DIR if ACTUAL_LOG_DIR else 'Logs' new_config['General']['log_dir'] = ACTUAL_LOG_DIR if ACTUAL_LOG_DIR else 'Logs'

6
sickbeard/name_parser/parser.py
View File

@ -266,14 +266,14 @@ class NameParser(object):
t = sickbeard.indexerApi(bestResult.show.indexer).indexer(**lINDEXER_API_PARMS) t = sickbeard.indexerApi(bestResult.show.indexer).indexer(**lINDEXER_API_PARMS)
if bestResult.is_air_by_date: if bestResult.is_air_by_date:
epObj = t[bestResult.show.indexerid].airedOn(parse_result.air_date)[0] epObj = t[bestResult.show.indexerid].airedOn(bestResult.air_date)[0]
else: else:
epObj = t[bestResult.show.indexerid].airedOn(parse_result.sports_air_date)[0] epObj = t[bestResult.show.indexerid].airedOn(bestResult.sports_air_date)[0]
season_number = int(epObj["seasonnumber"]) season_number = int(epObj["seasonnumber"])
episode_numbers = [int(epObj["episodenumber"])] episode_numbers = [int(epObj["episodenumber"])]
except sickbeard.indexer_episodenotfound: except sickbeard.indexer_episodenotfound:
logger.log(u"Unable to find episode with date " + str(parse_result.air_date) + " for show " + bestResult.show.name + ", skipping", logger.WARNING) logger.log(u"Unable to find episode with date " + str(bestResult.air_date) + " for show " + bestResult.show.name + ", skipping", logger.WARNING)
episode_numbers = [] episode_numbers = []
except sickbeard.indexer_error, e: except sickbeard.indexer_error, e:
logger.log(u"Unable to contact " + sickbeard.indexerApi(bestResult.show.indexer).name + ": " + ex(e), logger.WARNING) logger.log(u"Unable to contact " + sickbeard.indexerApi(bestResult.show.indexer).name + ": " + ex(e), logger.WARNING)

4
sickbeard/providers/bitsoup.py
View File

@ -197,8 +197,8 @@ class BitSoupProvider(generic.TorrentProvider):
try: try:
title = link.getText() title = link.getText()
id = int(id) id = int(id)
seeders = int(cells[9].getText()) seeders = int(cells[10].getText())
leechers = int(cells[10].getText()) leechers = int(cells[11].getText())
except (AttributeError, TypeError): except (AttributeError, TypeError):
continue continue

15
sickbeard/versionChecker.py
View File

@ -566,17 +566,9 @@ class SourceUpdateManager(UpdateManager):
if sickbeard.BRANCH == '': if sickbeard.BRANCH == '':
self.branch = self._find_installed_branch() self.branch = self._find_installed_branch()
self._cur_commit_hash = None self._cur_commit_hash = sickbeard.CUR_COMMIT_HASH
self._newest_commit_hash = None self._newest_commit_hash = None
self._num_commits_behind = 0 self._num_commits_behind = 0
def _find_installed_version(self):
installed_path = os.path.dirname(os.path.normpath(os.path.abspath(__file__)))
self._cur_commit_hash = self.hash_dir(installed_path)
if not self._cur_commit_hash:
self._cur_commit_hash = None
sickbeard.CUR_COMMIT_HASH = str(self._cur_commit_hash)
def _find_installed_branch(self): def _find_installed_branch(self):
if sickbeard.BRANCH == "": if sickbeard.BRANCH == "":
@ -590,8 +582,6 @@ class SourceUpdateManager(UpdateManager):
logger.log(u"Branch checkout: " + self._find_installed_branch() + "->" + self.branch, logger.DEBUG) logger.log(u"Branch checkout: " + self._find_installed_branch() + "->" + self.branch, logger.DEBUG)
return True return True
self._find_installed_version()
try: try:
self._check_github_for_update() self._check_github_for_update()
except Exception, e: except Exception, e:
@ -746,6 +736,9 @@ class SourceUpdateManager(UpdateManager):
if os.path.isfile(new_path): if os.path.isfile(new_path):
os.remove(new_path) os.remove(new_path)
os.renames(old_path, new_path) os.renames(old_path, new_path)
sickbeard.CUR_COMMIT_HASH = self._newest_commit_hash
except Exception, e: except Exception, e:
logger.log(u"Error while trying to update: " + ex(e), logger.ERROR) logger.log(u"Error while trying to update: " + ex(e), logger.ERROR)
logger.log(u"Traceback: " + traceback.format_exc(), logger.DEBUG) logger.log(u"Traceback: " + traceback.format_exc(), logger.DEBUG)