moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2025-01-05 19:08:02 -05:00
Code Issues Releases Wiki Activity

Merge branch 'origin/dev'

Browse Source
This commit is contained in:
echel0n 2014-04-21 20:58:27 -07:00
commit 11e40a865b
4 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
autoProcessTV/autoProcessTV.py
View File

@ -49,7 +49,7 @@ else:
HTTPBasicAuthHandler = urllib2.HTTPBasicAuthHandler HTTPBasicAuthHandler = urllib2.HTTPBasicAuthHandler
def processEpisode(dir_to_process, org_NZB_name=None): def processEpisode(dir_to_process, org_NZB_name=None, status=None):
# Default values # Default values
host = "localhost" host = "localhost"
port = "8081" port = "8081"
@ -117,6 +117,9 @@ def processEpisode(dir_to_process, org_NZB_name=None):
if org_NZB_name != None: if org_NZB_name != None:
params['nzbName'] = org_NZB_name params['nzbName'] = org_NZB_name
if status != None:
params['failed'] = status
if ssl: if ssl:
protocol = "https://" protocol = "https://"
else: else:

5
sickbeard/metadata/wdtv.py
View File

@ -265,9 +265,8 @@ class WDTVMetadata(generic.GenericMetadata):
genre.text = " / ".join([x for x in myShow["genre"].split('|') if x]) genre.text = " / ".join([x for x in myShow["genre"].split('|') if x])
director = etree.SubElement(episode, "director") director = etree.SubElement(episode, "director")
if getattr(myEp, 'director', None) is not None: director_text = getattr(myEp, 'director', None)
director_text = myEp['director'] if director_text is not None:
if director_text != None:
director.text = director_text director.text = director_text
if getattr(myShow, '_actors', None) is not None: if getattr(myShow, '_actors', None) is not None:

2
sickbeard/metadata/xbmc_12plus.py
View File

@ -330,7 +330,7 @@ class XBMC_12PlusMetadata(generic.GenericMetadata):
director = etree.SubElement(episode, "director") director = etree.SubElement(episode, "director")
director_text = getattr(myEp, 'director', None) director_text = getattr(myEp, 'director', None)
if director_text != None: if director_text is not None:
director.text = director_text director.text = director_text
rating = etree.SubElement(episode, "rating") rating = etree.SubElement(episode, "rating")

2
sickbeard/providers/rsstorrent.py
View File

@ -127,7 +127,7 @@ class TorrentRssProvider(generic.TorrentProvider):
except Exception, e: except Exception, e:
return (False, 'Error when trying to load RSS: ' + ex(e)) return (False, 'Error when trying to load RSS: ' + ex(e))
def getURL(self, url, headers=None): def getURL(self, url, post_data=None, headers=None):
if not self.session: if not self.session:
self.session = requests.Session() self.session = requests.Session()