Private GIT

Skip to content
Snippets Groups Projects
Commit a8bf61c2 authored by miigotu's avatar miigotu Committed by GitHub
Browse files

Fixes #2809 (#3812)

parent 0fef50ea
No related branches found
No related tags found
No related merge requests found
......@@ -41,7 +41,9 @@ setup(
'rednose',
'mock',
'vcrpy-unittest',
'babel'
'babel',
'flake8-coding',
'isort'
],
classifiers=[
......
# coding=utf-8
# Author: Clinton Collins <clinton.collins@gmail.com>
# Medicine: Dustyn Gibson <miigotu@gmail.com>
# This file is part of SickRage.
......
......@@ -21,12 +21,12 @@
from __future__ import unicode_literals
import re
from requests.compat import urljoin
from requests.utils import dict_from_cookiejar
from sickbeard import logger, tvcache
from sickbeard.bs4_parser import BS4Parser
from sickrage.helper.common import convert_size, try_int
from sickrage.providers.torrent.TorrentProvider import TorrentProvider
......@@ -85,7 +85,8 @@ class TorrentBytesProvider(TorrentProvider): # pylint: disable=too-many-instanc
return results
search_params = {
"c41": 1, "c33": 1, "c38": 1, "c32": 1, "c37": 1
"Episode": {"c33": 1, "c38": 1, "c32": 1, "c37": 1},
"Season": {"c41": 1}
}
for mode in search_strings:
......@@ -97,8 +98,8 @@ class TorrentBytesProvider(TorrentProvider): # pylint: disable=too-many-instanc
logger.log("Search string: {0}".format
(search_string.decode("utf-8")), logger.DEBUG)
search_params["search"] = search_string
data = self.get_url(self.urls["search"], params=search_params, returns="text")
search_params[mode]["search"] = search_string
data = self.get_url(self.urls["search"], params=search_params[mode], returns="text")
if not data:
logger.log("No data returned from provider", logger.DEBUG)
continue
......@@ -151,7 +152,7 @@ class TorrentBytesProvider(TorrentProvider): # pylint: disable=too-many-instanc
(title, seeders, leechers), logger.DEBUG)
items.append(item)
except (AttributeError, TypeError):
except (AttributeError, TypeError, ValueError):
continue
# For each search mode sort all the items by seeders if available
......
# coding=utf-8
import re
......
......@@ -39,3 +39,18 @@ commands =
cmd /c del /f /q {toxinidir}\tests\sickbeard.db {toxinidir}\tests\cache.db {toxinidir}\tests\failed.db 2> nul
nosetests -c nose.cfg --nocapture
- codecov -e APPVEYOR_REPO_BRANCH PYTHON_ARCH
[testenv:py27-flake8]
platform = linux
envdir = {toxworkdir}/tox
passenv = CI TRAVIS TRAVIS_*
deps =
flake8-coding
isort
commands =
flake8 --exclude node_modules,bower_components,lib --select C101,C102,C103
isort -rc -c -w 160 -ca -dt -a "from __future__ import unicode_literals" -df sickbeard sickrage
[flake8]
accept-encodings = utf-8, latin-1
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment