github/nzbToMedia
1
0
Fork 0
mirror of https://github.com/clinton-hall/nzbToMedia.git synced 2025-07-16 02:02:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

added option for nzbExtractionBy. fixes #265

Browse source
This commit is contained in:
clinton-hall 2014-02-15 08:03:14 +10:30
parent b35dba4261
commit ff41f484a2
3 changed files with 7 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
autoProcess/autoProcessTV.py
View file

@ -104,6 +104,10 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC
SampleIDs = (config.get("Extensions", "SampleIDs")).split(',') SampleIDs = (config.get("Extensions", "SampleIDs")).split(',')
except (ConfigParser.NoOptionError, ValueError): except (ConfigParser.NoOptionError, ValueError):
SampleIDs = ['sample','-s.'] SampleIDs = ['sample','-s.']
try:
nzbExtractionBy = config.get("section", "nzbExtractionBy")
except (ConfigParser.NoOptionError, ValueError):
nzbExtractionBy = "Downloader"
TimeOut = 60 * int(wait_for) # SickBeard needs to complete all moving and renaming before returning the log sequence via url. TimeOut = 60 * int(wait_for) # SickBeard needs to complete all moving and renaming before returning the log sequence via url.
socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout. socket.setdefaulttimeout(int(TimeOut)) #initialize socket timeout.
@ -120,7 +124,7 @@ def processEpisode(dirName, nzbName=None, failed=False, clientAgent=None, inputC
SICKBEARD_TORRENT_USE = SICKBEARD_TORRENT SICKBEARD_TORRENT_USE = SICKBEARD_TORRENT
if clientAgent in ['nzbget','sabnzbd']: #Assume Torrent actions (unrar and link) don't happen. We need to check for valid media here. if clientAgent in ['nzbget','sabnzbd'] and not nzbExtractionBy == "Destination": #Assume Torrent actions (unrar and link) don't happen. We need to check for valid media here.
SICKBEARD_TORRENT_USE = [] SICKBEARD_TORRENT_USE = []
if not fork in SICKBEARD_TORRENT_USE: if not fork in SICKBEARD_TORRENT_USE:

1
autoProcessMedia.cfg.sample
View file

@ -35,6 +35,7 @@ wait_for = 5
watch_dir = watch_dir =
fork = default fork = default
delete_failed = 0 delete_failed = 0
nzbExtractionBy = Downloader
[HeadPhones] [HeadPhones]

2
changelog.txt
View file

@ -11,7 +11,7 @@ Added list of common sample ids and a way to set deletion of All media files les
Impacts NZBs Impacts NZBs
Fix Error with manual run of nzbToMedia Fix Error with manual run of nzbToMedia
Make sure SickBeard receives the individula download dir. Make sure SickBeard receives the individula download dir.
Disabled SickBeard Torrent handling for NZBs. Fixes failed handling of nzbs that fail to extract. Added option to set SickBeard extraction as either Downlaoder or Destination (SickBEard).
Impacts Torrents Impacts Torrents
Added option to run userscript once only (on directory). Added option to run userscript once only (on directory).