Private GIT

Skip to content
Snippets Groups Projects
Commit c1e0e256 authored by Dustyn Gibson's avatar Dustyn Gibson
Browse files

Merge branch 'hotfix-1848'

parents 56fd7a94 dbddd3e6
No related branches found
No related tags found
No related merge requests found
...@@ -291,11 +291,11 @@ class GenericProvider: ...@@ -291,11 +291,11 @@ class GenericProvider:
Returns: A tuple containing two strings representing title and URL respectively Returns: A tuple containing two strings representing title and URL respectively
""" """
title = item.get('title') title = item.get('title', '')
if title: if title:
title = u'' + title.replace(' ', '.') title = u'' + title.replace(' ', '.')
url = item.get('link') url = item.get('link', '')
if url: if url:
url = url.replace('&', '&').replace('%26tr%3D', '&tr=') url = url.replace('&', '&').replace('%26tr%3D', '&tr=')
...@@ -303,18 +303,8 @@ class GenericProvider: ...@@ -303,18 +303,8 @@ class GenericProvider:
def _get_size(self, item): def _get_size(self, item):
"""Gets the size from the item""" """Gets the size from the item"""
if self.providerType != GenericProvider.NZB: logger.log(u"Provider type doesn't have _get_size() implemented yet", logger.ERROR)
logger.log(u"Torrent Generic providers doesn't have _get_size() implemented yet", logger.DEBUG)
return -1 return -1
else:
size = item.get('links')[1].get('length')
if size:
size = int(size)
return size
else:
logger.log(u"Size was not found in your provider response", logger.DEBUG)
return -1
def findSearchResults(self, show, episodes, search_mode, manualSearch=False, downCurQuality=False): def findSearchResults(self, show, episodes, search_mode, manualSearch=False, downCurQuality=False):
...@@ -549,6 +539,17 @@ class NZBProvider(GenericProvider): ...@@ -549,6 +539,17 @@ class NZBProvider(GenericProvider):
self.providerType = GenericProvider.NZB self.providerType = GenericProvider.NZB
def _get_size(self, item):
try:
size = item.get('links')[1].get('length', -1)
except IndexError:
size = -1
if not size:
logger.log(u"Size was not found in your provider response", logger.DEBUG)
return int(size)
class TorrentProvider(GenericProvider): class TorrentProvider(GenericProvider):
def __init__(self, name): def __init__(self, name):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment