Browse Source

Fix filter in history API endpoint.

tags/release_0.25.3^2
Prinz23 4 years ago
committed by JackDandy
parent
commit
ce544e1b80
  1. 7
      CHANGES.md
  2. 11
      sickbeard/webapi.py

7
CHANGES.md

@ -1,4 +1,9 @@
### 0.25.2 (2021-09-20 20:00:00 UTC) ### 0.25.3 (2021-09-21 22:00:00 UTC)
* Fix filter in history API endpoint
### 0.25.2 (2021-09-20 20:00:00 UTC)
* Fix history API endpoint for all snatch and download statuses (including archived, failed) * Fix history API endpoint for all snatch and download statuses (including archived, failed)

11
sickbeard/webapi.py

@ -46,8 +46,8 @@ from lib import subliminal
import sickbeard import sickbeard
from . import classes, db, helpers, history, image_cache, logger, network_timezones, processTV, search_queue, ui from . import classes, db, helpers, history, image_cache, logger, network_timezones, processTV, search_queue, ui
from .common import ARCHIVED, DOWNLOADED, IGNORED, SKIPPED, SNATCHED, SNATCHED_ANY, SNATCHED_BEST, SNATCHED_PROPER, \ from .common import ARCHIVED, DOWNLOADED, FAILED, IGNORED, SKIPPED, SNATCHED, SNATCHED_ANY, SNATCHED_BEST, \
UNAIRED, UNKNOWN, WANTED, Quality, qualityPresetStrings, statusStrings SNATCHED_PROPER, UNAIRED, UNKNOWN, WANTED, Quality, qualityPresetStrings, statusStrings
from .helpers import remove_article from .helpers import remove_article
from .indexers import indexer_api, indexer_config from .indexers import indexer_api, indexer_config
from .indexers.indexer_config import * from .indexers.indexer_config import *
@ -1618,10 +1618,13 @@ class CMD_SickGearHistory(ApiCall):
""" get the sickgear downloaded/snatched history """ """ get the sickgear downloaded/snatched history """
# typeCodes = [] # typeCodes = []
type_filter = []
if "downloaded" == self.type: if "downloaded" == self.type:
type_filter = [DOWNLOADED, ARCHIVED, FAILED]
self.type = "Downloaded" self.type = "Downloaded"
typeCodes = Quality.DOWNLOADED + Quality.ARCHIVED + Quality.FAILED typeCodes = Quality.DOWNLOADED + Quality.ARCHIVED + Quality.FAILED
elif "snatched" == self.type: elif "snatched" == self.type:
type_filter = SNATCHED_ANY
self.type = "Snatched" self.type = "Snatched"
typeCodes = Quality.SNATCHED_ANY typeCodes = Quality.SNATCHED_ANY
else: else:
@ -1649,9 +1652,9 @@ class CMD_SickGearHistory(ApiCall):
results = [] results = []
for cur_result in sql_result: for cur_result in sql_result:
status, quality = Quality.splitCompositeStatus(int(cur_result["action"])) status, quality = Quality.splitCompositeStatus(int(cur_result["action"]))
status = _get_status_Strings(status) if type_filter and status not in type_filter:
if self.type and not status == self.type:
continue continue
status = _get_status_Strings(status)
cur_result["status"] = status cur_result["status"] = status
cur_result["quality"] = _get_quality_string(quality) cur_result["quality"] = _get_quality_string(quality)
cur_result["date"] = _historyDate_to_dateTimeForm(str(cur_result["date"])) cur_result["date"] = _historyDate_to_dateTimeForm(str(cur_result["date"]))

Loading…
Cancel
Save