diff --git a/data/interfaces/default/history.html b/data/interfaces/default/history.html index 4a4531b7..0b7cd6ee 100644 --- a/data/interfaces/default/history.html +++ b/data/interfaces/default/history.html @@ -10,9 +10,10 @@ Clear All History Clear Processed Clear Unprocessed + Clear Frozen Clear Snatched - + <%def name="body()"> @@ -39,9 +40,11 @@ grade = 'C' elif item['Status'] == 'Unprocessed': grade = 'X' + elif item['Status'] == 'Frozen': + grade = 'X' else: grade = 'U' - + fileid = 'unknown' if item['URL'].find('nzb') != -1: fileid = 'nzb' diff --git a/headphones/postprocessor.py b/headphones/postprocessor.py index 6fa4fd1d..3627438c 100755 --- a/headphones/postprocessor.py +++ b/headphones/postprocessor.py @@ -99,6 +99,11 @@ def verify(albumid, albumpath, Kind=None, forced=False): "but database is frozen. Will skip postprocessing for " \ "album with rgid: %s", release_dict['artist_name'], release_dict['artist_id'], albumid) + + myDB.action('UPDATE snatched SET status = "Frozen" WHERE status NOT LIKE "Seed%" and AlbumID=?', [albumid]) + frozen = re.search(r' \(Frozen\)(?:\[\d+\])?', albumpath) + if not frozen: + renameUnprocessedFolder(albumpath, tag="Frozen") return logger.info(u"Now adding/updating artist: " + release_dict['artist_name']) @@ -274,8 +279,6 @@ def verify(albumid, albumpath, Kind=None, forced=False): processed = re.search(r' \(Unprocessed\)(?:\[\d+\])?', albumpath) if not processed: renameUnprocessedFolder(albumpath, tag="Unprocessed") - else: - logger.info(u"Already marked as unprocessed: " + albumpath.decode(headphones.SYS_ENCODING, 'replace')) def doPostProcessing(albumid, albumpath, release, tracks, downloaded_track_list, Kind=None):