monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2024-12-04 18:33:38 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix refresh handling of Skipped and Ignored items.

Browse source
This commit is contained in:
Prinz23 2016-01-28 19:35:09 +00:00 committed by JackDandy
parent 052a5a9021
commit cea9450c7f
3 changed files with 24 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -23,6 +23,7 @@
* Add singledispatch 3.4.0.3 * Add singledispatch 3.4.0.3
* Change refactor email notifier * Change refactor email notifier
* Change emails to Unicode aware * Change emails to Unicode aware
* Fix refresh handling of Skipped and Ignored items
### 0.11.4 (2016-01-31 11:30:00 UTC) ### 0.11.4 (2016-01-31 11:30:00 UTC)

2
sickbeard/show_queue.py
View file

@ -498,7 +498,7 @@ class QueueItemRefresh(ShowQueueItem):
def run(self): def run(self):
ShowQueueItem.run(self) ShowQueueItem.run(self)
logger.log(u'Performing refresh on ' + self.show.name) logger.log('Performing refresh on %s' % self.show.name)
self.show.refreshDir() self.show.refreshDir()
self.show.writeMetadata() self.show.writeMetadata()

35
sickbeard/tv.py
View file

@ -395,10 +395,10 @@ class TVShow(object):
def loadEpisodesFromDir(self): def loadEpisodesFromDir(self):
if not ek.ek(os.path.isdir, self._location): if not ek.ek(os.path.isdir, self._location):
logger.log(str(self.indexerid) + u": Show directory doesn't exist, not loading episodes from disk") logger.log('%s: Show directory doesn\'t exist, not loading episodes from disk' % self.indexerid)
return return
logger.log(str(self.indexerid) + u": Loading all episodes from the show directory " + self._location) logger.log('%s: Loading all episodes from the show directory %s' % (self.indexerid, self._location))
# get file list # get file list
mediaFiles = helpers.listMediaFiles(self._location) mediaFiles = helpers.listMediaFiles(self._location)
@ -409,14 +409,14 @@ class TVShow(object):
parse_result = None parse_result = None
curEpisode = None curEpisode = None
logger.log(str(self.indexerid) + u": Creating episode from " + mediaFile, logger.DEBUG) logger.log('%s: Creating episode from %s' % (self.indexerid, mediaFile), logger.DEBUG)
try: try:
curEpisode = self.makeEpFromFile(ek.ek(os.path.join, self._location, mediaFile)) curEpisode = self.makeEpFromFile(ek.ek(os.path.join, self._location, mediaFile))
except (exceptions.ShowNotFoundException, exceptions.EpisodeNotFoundException) as e: except (exceptions.ShowNotFoundException, exceptions.EpisodeNotFoundException) as e:
logger.log(u"Episode " + mediaFile + " returned an exception: " + ex(e), logger.ERROR) logger.log('Episode %s returned an exception: %s' % (mediaFile, ex(e)), logger.ERROR)
continue continue
except exceptions.EpisodeDeletedException: except exceptions.EpisodeDeletedException:
logger.log(u"The episode deleted itself when I tried making an object for it", logger.DEBUG) logger.log('The episode deleted itself when I tried making an object for it', logger.DEBUG)
if curEpisode is None: if curEpisode is None:
continue continue
@ -434,7 +434,7 @@ class TVShow(object):
if ep_file_name and parse_result and None is not parse_result.release_group: if ep_file_name and parse_result and None is not parse_result.release_group:
logger.log( logger.log(
u"Name " + ep_file_name + u" gave release group of " + parse_result.release_group + ", seems valid", 'Name %s gave release group of %s, seems valid' % (ep_file_name ,parse_result.release_group),
logger.DEBUG) logger.DEBUG)
curEpisode.release_name = ep_file_name curEpisode.release_name = ep_file_name
@ -444,7 +444,7 @@ class TVShow(object):
try: try:
curEpisode.refreshSubtitles() curEpisode.refreshSubtitles()
except: except:
logger.log(str(self.indexerid) + ": Could not refresh subtitles", logger.ERROR) logger.log('%s: Could not refresh subtitles' % self.indexerid, logger.ERROR)
logger.log(traceback.format_exc(), logger.DEBUG) logger.log(traceback.format_exc(), logger.DEBUG)
result = curEpisode.get_sql() result = curEpisode.get_sql()
@ -658,14 +658,20 @@ class TVShow(object):
else: else:
# if there is a new file associated with this ep then re-check the quality # if there is a new file associated with this ep then re-check the quality
if cur_ep.location and ek.ek(os.path.normpath, cur_ep.location) != ek.ek(os.path.normpath, file): status, quality = sickbeard.common.Quality.splitCompositeStatus(cur_ep.status)
logger.log(
u'The old episode had a different file associated with it, re-checking the quality based on the new filename ' + file, if IGNORED == status:
logger.DEBUG) continue
if (cur_ep.location and ek.ek(os.path.normpath, cur_ep.location) != ek.ek(os.path.normpath, file)) or \
(not cur_ep.location and file) or \
(SKIPPED == status):
logger.log(u'The old episode had a different file associated with it, re-checking the quality ' +
u'based on the new filename %s' % file, logger.DEBUG)
check_quality_again = True check_quality_again = True
with cur_ep.lock: with cur_ep.lock:
old_size = cur_ep.file_size old_size = cur_ep.file_size if cur_ep.location and status != SKIPPED else 0
cur_ep.location = file cur_ep.location = file
# if the sizes are the same then it's probably the same file # if the sizes are the same then it's probably the same file
if old_size and cur_ep.file_size == old_size: if old_size and cur_ep.file_size == old_size:
@ -1096,7 +1102,7 @@ class TVShow(object):
self.loadEpisodesFromDir() self.loadEpisodesFromDir()
# run through all locations from DB, check that they exist # run through all locations from DB, check that they exist
logger.log(str(self.indexerid) + u": Loading all episodes with a location from the database") logger.log('%s: Loading all episodes with a location from the database' % self.indexerid)
myDB = db.DBConnection() myDB = db.DBConnection()
sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE showid = ? AND location != ''", [self.indexerid]) sqlResults = myDB.select("SELECT * FROM tv_episodes WHERE showid = ? AND location != ''", [self.indexerid])
@ -1208,6 +1214,7 @@ class TVShow(object):
myDB = db.DBConnection() myDB = db.DBConnection()
myDB.upsert("tv_shows", newValueDict, controlValueDict) myDB.upsert("tv_shows", newValueDict, controlValueDict)
self.dirty = False
if sickbeard.USE_IMDB_INFO and len(self.imdb_info): if sickbeard.USE_IMDB_INFO and len(self.imdb_info):
controlValueDict = {'indexer_id': self.indexerid} controlValueDict = {'indexer_id': self.indexerid}
@ -1988,6 +1995,7 @@ class TVEpisode(object):
if rows: if rows:
epID = int(rows[0]['episode_id']) epID = int(rows[0]['episode_id'])
self.dirty = False
if epID: if epID:
# use a custom update method to get the data into the DB for existing records. # use a custom update method to get the data into the DB for existing records.
return [ return [
@ -2057,6 +2065,7 @@ class TVEpisode(object):
# use a custom update/insert method to get the data into the DB # use a custom update/insert method to get the data into the DB
myDB = db.DBConnection() myDB = db.DBConnection()
myDB.upsert("tv_episodes", newValueDict, controlValueDict) myDB.upsert("tv_episodes", newValueDict, controlValueDict)
self.dirty = False
def fullPath(self): def fullPath(self):
if self.location == None or self.location == "": if self.location == None or self.location == "":