mirror of
https://github.com/clinton-hall/nzbToMedia.git
synced 2025-08-20 13:23:18 -07:00
cleanup and more
This commit is contained in:
Joel Kåberg
parent
98ce939b62
commit
833d9556d9
1 changed files with 160 additions and 316 deletions
|
|
@ -12,7 +12,6 @@ from subprocess import call
|
||||||
|
|
||||||
|
|
||||||
# Custom imports
|
# Custom imports
|
||||||
import linktastic.linktastic as linktastic
|
|
||||||
import extractor.extractor as extractor
|
import extractor.extractor as extractor
|
||||||
import autoProcessMovie
|
import autoProcessMovie
|
||||||
import autoProcessTV
|
import autoProcessTV
|
||||||
|
|
@ -20,174 +19,17 @@ from nzbToMediaEnv import *
|
||||||
from nzbToMediaUtil import *
|
from nzbToMediaUtil import *
|
||||||
from utorrent.client import UTorrentClient
|
from utorrent.client import UTorrentClient
|
||||||
|
|
||||||
|
# Logging
|
||||||
nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
|
nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))
|
||||||
Logger = logging.getLogger(__name__)
|
Logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
def main()
|
||||||
def category_search(inputDirectory, inputName, inputCategory, root, categories):
|
|
||||||
categorySearch = [os.path.normpath(inputDirectory), ""] # initializie
|
|
||||||
notfound = 0
|
|
||||||
for x in range(10): # loop up through 10 directories looking for category.
|
|
||||||
try:
|
|
||||||
categorySearch2 = os.path.split(os.path.normpath(categorySearch[0]))
|
|
||||||
except: # this might happen when we can't go higher.
|
|
||||||
if inputCategory and inputName: # if these exists, we are ok to proceed, but assume we are in a root/common directory.
|
|
||||||
Logger.info("SEARCH: Could not find a Torrent Name or category in the directory structure")
|
|
||||||
Logger.info("SEARCH: We assume the directory passed is the root directory for your downlaoder")
|
|
||||||
Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible")
|
|
||||||
Logger.info("SEARCH: We will try and determine which files to process, individually")
|
|
||||||
root = 1
|
|
||||||
break # we are done
|
|
||||||
elif inputCategory: # if this exists, we are ok to proceed, but assume we are in a root/common directory and we have to check file dates.
|
|
||||||
Logger.info("SEARCH: Could not find a Torrent Name or Category in the directory structure")
|
|
||||||
Logger.info("SEARCH: We assume the directory passed is the root directory for your downlaoder")
|
|
||||||
Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible")
|
|
||||||
Logger.info("SEARCH: We will try and determine which files to process, individually")
|
|
||||||
root = 2
|
|
||||||
break # we are done
|
|
||||||
else:
|
|
||||||
Logger.error("SEARCH: Could not identify Category of Torrent Name in the directory structure. Please check downloader settings. Exiting")
|
|
||||||
sys.exit(-1)
|
|
||||||
|
|
||||||
if categorySearch2[1] in categories:
|
|
||||||
Logger.debug("SEARCH: Found Category: %s in directory structure", categorySearch2[1])
|
|
||||||
if not inputCategory:
|
|
||||||
Logger.info("SEARCH: Determined Category to be: %s", categorySearch2[1])
|
|
||||||
inputCategory = categorySearch2[1]
|
|
||||||
if inputName and categorySearch[0] != os.path.normpath(inputDirectory): # if we are not in the root directory and we have inputName we can continue.
|
|
||||||
if ('.cp(tt' in categorySearch[1]) and (not '.cp(tt' in inputName): # if the directory was created by CouchPotato, and this tag is not in Torrent name, we want to add it.
|
|
||||||
Logger.info("SEARCH: Changing Torrent Name to %s to preserve imdb id.", categorySearch[1])
|
|
||||||
inputName = categorySearch[1]
|
|
||||||
Logger.info("SEARCH: Identified Category: %s and Torrent Name: %s. We are in a unique directory, so we can proceed.", inputCategory, inputName)
|
|
||||||
break # we are done
|
|
||||||
elif categorySearch[1] and not inputName: # assume the the next directory deep is the torrent name.
|
|
||||||
Logger.info("SEARCH: Found torrent directory %s in category directory %s", os.path.join(categorySearch[0], categorySearch[1]), categorySearch[0])
|
|
||||||
inputName = categorySearch[1]
|
|
||||||
break # we are done
|
|
||||||
elif ('.cp(tt' in categorySearch[1]) and (not '.cp(tt' in inputName): # if the directory was created by CouchPotato, and this tag is not in Torrent name, we want to add it.
|
|
||||||
Logger.info("SEARCH: Changing Torrent Name to %s to preserve imdb id.", categorySearch[1])
|
|
||||||
inputName = categorySearch[1]
|
|
||||||
break # we are done
|
|
||||||
elif os.path.isdir(os.path.join(categorySearch[0], inputName)) and inputName: # testing for torrent name in first sub directory
|
|
||||||
Logger.info("SEARCH: Found torrent directory %s in category directory %s", os.path.join(categorySearch[0], inputName), categorySearch[0])
|
|
||||||
if categorySearch[0] == os.path.normpath(inputDirectory): # only true on first pass, x =0
|
|
||||||
inputDirectory = os.path.join(categorySearch[0], inputName) # we only want to search this next dir up.
|
|
||||||
break # we are done
|
|
||||||
elif inputName: # if these exists, we are ok to proceed, but we are in a root/common directory.
|
|
||||||
Logger.info("SEARCH: Could not find a unique torrent folder in the directory structure")
|
|
||||||
Logger.info("SEARCH: The directory passed is the root directory for category %s", categorySearch2[1])
|
|
||||||
Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible")
|
|
||||||
Logger.info("SEARCH: We will try and determine which files to process, individually")
|
|
||||||
root = 1
|
|
||||||
break # we are done
|
|
||||||
else: # this is a problem! if we don't have Torrent name and are in the root category dir, we can't proceed.
|
|
||||||
Logger.warn("SEARCH: Could not identify a torrent name and the directory passed is common to all downloads for category %s.", categorySearch[1])
|
|
||||||
Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible")
|
|
||||||
Logger.info("SEARCH: We will try and determine which files to process, individually")
|
|
||||||
root = 2
|
|
||||||
break
|
|
||||||
elif categorySearch2[1] == inputName and inputName: # we have identified a unique directory.
|
|
||||||
Logger.info("SEARCH: Files appear to be in their own directory")
|
|
||||||
if inputCategory: # we are ok to proceed.
|
|
||||||
break # we are done
|
|
||||||
else:
|
|
||||||
Logger.debug("SEARCH: Continuing scan to determin category.")
|
|
||||||
categorySearch = categorySearch2 # ready for next loop
|
|
||||||
continue # keep going
|
|
||||||
else:
|
|
||||||
if x == 9: # This is the last pass in the loop and we didn't find anything.
|
|
||||||
notfound = 1
|
|
||||||
break # we are done
|
|
||||||
else:
|
|
||||||
categorySearch = categorySearch2 # ready for next loop
|
|
||||||
continue # keep going
|
|
||||||
|
|
||||||
if notfound == 1:
|
|
||||||
if inputCategory and inputName: # if these exists, we are ok to proceed, but assume we are in a root/common directory.
|
|
||||||
Logger.info("SEARCH: Could not find a category in the directory structure")
|
|
||||||
Logger.info("SEARCH: We assume the directory passed is the root directory for your downlaoder")
|
|
||||||
Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible")
|
|
||||||
Logger.info("SEARCH: We will try and determine which files to process, individually")
|
|
||||||
root = 1
|
|
||||||
elif inputCategory: # if this exists, we are ok to proceed, but assume we are in a root/common directory and we have to check file dates.
|
|
||||||
Logger.info("SEARCH: Could not find a Torrent Name or Category in the directory structure")
|
|
||||||
Logger.info("SEARCH: We assume the directory passed is the root directory for your downlaoder")
|
|
||||||
Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible")
|
|
||||||
Logger.info("SEARCH: We will try and determine which files to process, individually")
|
|
||||||
root = 2
|
|
||||||
if not inputCategory: # we didn't find this after 10 loops. This is a problem.
|
|
||||||
Logger.error("SEARCH: Could not identify category and torrent name from the directory structure. Please check downloader settings. Exiting")
|
|
||||||
sys.exit(-1) # Oh yeah.... WE ARE DONE!
|
|
||||||
|
|
||||||
return inputDirectory, inputName, inputCategory, root
|
|
||||||
|
|
||||||
|
|
||||||
def is_sample(filePath, inputName, minSampleSize):
|
|
||||||
# 200 MB in bytes
|
|
||||||
SIZE_CUTOFF = minSampleSize * 1024 * 1024
|
|
||||||
# Ignore 'sample' in files unless 'sample' in Torrent Name
|
|
||||||
return ('sample' in filePath.lower()) and (not 'sample' in inputName) and (os.path.getsize(filePath) < SIZE_CUTOFF)
|
|
||||||
|
|
||||||
|
|
||||||
def copy_link(source, target, useLink, outputDestination):
|
|
||||||
create_destination(outputDestination)
|
|
||||||
if useLink:
|
|
||||||
try:
|
|
||||||
Logger.info("COPYLINK: Linking %s to %s", source, target)
|
|
||||||
linktastic.link(source, target)
|
|
||||||
except:
|
|
||||||
if os.path.isfile(target):
|
|
||||||
Logger.info("COPYLINK: Something went wrong in linktastic.link, but the destination file was created")
|
|
||||||
else:
|
|
||||||
Logger.info("COPYLINK: Something went wrong in linktastic.link, copying instead")
|
|
||||||
Logger.debug("COPYLINK: Copying %s to %s", source, target)
|
|
||||||
shutil.copy(source, target)
|
|
||||||
else:
|
|
||||||
Logger.debug("Copying %s to %s", source, target)
|
|
||||||
shutil.copy(source, target)
|
|
||||||
return True
|
|
||||||
|
|
||||||
|
|
||||||
def flatten(outputDestination):
|
|
||||||
Logger.info("FLATTEN: Flattening directory: %s", outputDestination)
|
|
||||||
for dirpath, dirnames, filenames in os.walk(outputDestination): # Flatten out the directory to make postprocessing easier
|
|
||||||
if dirpath == outputDestination:
|
|
||||||
continue # No need to try and move files in the root destination directory
|
|
||||||
for filename in filenames:
|
|
||||||
source = os.path.join(dirpath, filename)
|
|
||||||
target = os.path.join(outputDestination, filename)
|
|
||||||
try:
|
|
||||||
shutil.move(source, target)
|
|
||||||
except OSError:
|
|
||||||
Logger.error("FLATTEN: Could not flatten %s", source)
|
|
||||||
removeEmptyFolders(outputDestination) # Cleanup empty directories
|
|
||||||
|
|
||||||
|
|
||||||
def removeEmptyFolders(path):
|
|
||||||
Logger.info("REMOVER: Removing empty folders in: %s", path)
|
|
||||||
if not os.path.isdir(path):
|
|
||||||
return
|
|
||||||
|
|
||||||
# Remove empty subfolders
|
|
||||||
files = os.listdir(path)
|
|
||||||
if len(files):
|
|
||||||
for f in files:
|
|
||||||
fullpath = os.path.join(path, f)
|
|
||||||
if os.path.isdir(fullpath):
|
|
||||||
removeEmptyFolders(fullpath)
|
|
||||||
|
|
||||||
# If folder empty, delete it
|
|
||||||
files = os.listdir(path)
|
|
||||||
if len(files) == 0:
|
|
||||||
Logger.debug("REMOVER: Removing empty folder: %s", path)
|
|
||||||
os.rmdir(path)
|
|
||||||
|
|
||||||
Logger.info("==========================") # Seperate old from new log
|
Logger.info("==========================") # Seperate old from new log
|
||||||
Logger.info("TorrentToMedia %s", VERSION)
|
Logger.info("TorrentToMedia %s", VERSION)
|
||||||
config = ConfigParser.ConfigParser()
|
config = ConfigParser.ConfigParser()
|
||||||
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
|
configFilename = os.path.join(os.path.dirname(sys.argv[0]), "autoProcessMedia.cfg")
|
||||||
|
|
||||||
### TORRENT TO MEDIA ###
|
|
||||||
if not os.path.isfile(configFilename):
|
if not os.path.isfile(configFilename):
|
||||||
Logger.error("You need an autoProcessMedia.cfg file - did you rename and edit the .sample?")
|
Logger.error("You need an autoProcessMedia.cfg file - did you rename and edit the .sample?")
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
|
|
@ -195,7 +37,26 @@ if not os.path.isfile(configFilename):
|
||||||
Logger.info("MAIN: Loading config from %s", configFilename)
|
Logger.info("MAIN: Loading config from %s", configFilename)
|
||||||
config.read(configFilename)
|
config.read(configFilename)
|
||||||
|
|
||||||
clientAgent = config.get("Torrent", "clientAgent")
|
# EXAMPLE VALUES:
|
||||||
|
clientAgent = config.get("Torrent", "clientAgent") # utorrent | deluge | transmission | other
|
||||||
|
# Sick-Beard
|
||||||
|
tvCategory = config.get("SickBeard", "category") # tv
|
||||||
|
tvDestination = os.path.normpath(config.get("SickBeard", "outputDirectory")) # C:\downloaded\tv | /path/to/downloaded/tv
|
||||||
|
# CouchPotatoServer
|
||||||
|
movieCategory = config.get("CouchPotato", "category") # movie
|
||||||
|
movieDestination = os.path.normpath(config.get("CouchPotato", "outputDirectory")) # C:\downloaded\movies | /path/to/downloaded/movies
|
||||||
|
# Torrent specific
|
||||||
|
useLink = config.get("Torrent", "useLink") # true | false
|
||||||
|
minSampleSize = int(config.get("Torrent", "minSampleSize")) # 200
|
||||||
|
uTorrentWEBui = config.get("Torrent", "uTorrentWEBui") # http://localhost:8090/gui/
|
||||||
|
uTorrentUSR = config.get("Torrent", "uTorrentUSR") # mysecretusr
|
||||||
|
uTorrentPWD = config.get("Torrent", "uTorrentPWD") # mysecretpwr
|
||||||
|
compressedContainer = (config.get("Torrent", "compressedExtentions")).split(',') # .zip,.rar,.7z
|
||||||
|
mediaContainer = (config.get("Torrent", "mediaExtentions")).split(',') # .mkv,.avi,.divx
|
||||||
|
metaContainer = (config.get("Torrent", "metaExtentions")).split(',') # .nfo,.sub,.srt
|
||||||
|
categories = (config.get("Torrent", "categories")).split(',') # music,music_videos,pictures,software
|
||||||
|
categories.append(movieCategory)
|
||||||
|
categories.append(tvCategory) # now have a list of all categories in use.
|
||||||
|
|
||||||
try:
|
try:
|
||||||
inputDirectory, inputName, inputCategory, inputHash = parse_args(clientAgent)
|
inputDirectory, inputName, inputCategory, inputHash = parse_args(clientAgent)
|
||||||
|
|
@ -203,29 +64,8 @@ except:
|
||||||
Logger.error("MAIN: There was a problem loading variables: Exiting")
|
Logger.error("MAIN: There was a problem loading variables: Exiting")
|
||||||
sys.exit(-1)
|
sys.exit(-1)
|
||||||
|
|
||||||
#### Main routine starts here.
|
|
||||||
|
|
||||||
Logger.debug("MAIN: Received Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory)
|
Logger.debug("MAIN: Received Directory: %s | Name: %s | Category: %s", inputDirectory, inputName, inputCategory)
|
||||||
|
|
||||||
# Sick-Beard
|
|
||||||
tvCategory = config.get("SickBeard", "category")
|
|
||||||
tvDestination = os.path.normpath(config.get("SickBeard", "outputDirectory"))
|
|
||||||
# CouchPotatoServer
|
|
||||||
movieCategory = config.get("CouchPotato", "category")
|
|
||||||
movieDestination = os.path.normpath(config.get("CouchPotato", "outputDirectory"))
|
|
||||||
# Torrent specific
|
|
||||||
useLink = config.get("Torrent", "useLink")
|
|
||||||
minSampleSize = int(config.get("Torrent", "minSampleSize"))
|
|
||||||
uTorrentWEBui = config.get("Torrent", "uTorrentWEBui")
|
|
||||||
uTorrentUSR = config.get("Torrent", "uTorrentUSR")
|
|
||||||
uTorrentPWD = config.get("Torrent", "uTorrentPWD")
|
|
||||||
compressedContainer = (config.get("Torrent", "compressedExtentions")).split(',')
|
|
||||||
mediaContainer = (config.get("Torrent", "mediaExtentions")).split(',')
|
|
||||||
metaContainer = (config.get("Torrent", "metaExtentions")).split(',')
|
|
||||||
categories = (config.get("Torrent", "categories")).split(',')
|
|
||||||
categories.append(movieCategory)
|
|
||||||
categories.append(tvCategory) # now have a list of all categories in use.
|
|
||||||
|
|
||||||
status = int(1) # We start as "failed" until we verify movie file in destination
|
status = int(1) # We start as "failed" until we verify movie file in destination
|
||||||
root = int(0)
|
root = int(0)
|
||||||
video = int(0)
|
video = int(0)
|
||||||
|
|
@ -335,6 +175,7 @@ if inputHash and useLink:
|
||||||
utorrentClass = UTorrentClient(uTorrentWEBui, uTorrentUSR, uTorrentPWD)
|
utorrentClass = UTorrentClient(uTorrentWEBui, uTorrentUSR, uTorrentPWD)
|
||||||
except:
|
except:
|
||||||
Logger.error("MAIN: Failed to connect to uTorrent")
|
Logger.error("MAIN: Failed to connect to uTorrent")
|
||||||
|
|
||||||
Logger.debug("MAIN: Stoping torrent %s in uTorrent while processing", videofile)
|
Logger.debug("MAIN: Stoping torrent %s in uTorrent while processing", videofile)
|
||||||
utorrentClass.stop(inputHash)
|
utorrentClass.stop(inputHash)
|
||||||
time.sleep(5) # Give uTorrent some time to catch up with the change
|
time.sleep(5) # Give uTorrent some time to catch up with the change
|
||||||
|
|
@ -361,3 +202,6 @@ else: # CPS (and SickBeard) have finished. We can now resume seeding.
|
||||||
if inputHash and useLink:
|
if inputHash and useLink:
|
||||||
Logger.debug("MAIN: Starting torrent %s in uTorrent", inputName)
|
Logger.debug("MAIN: Starting torrent %s in uTorrent", inputName)
|
||||||
utorrentClass.start(inputHash)
|
utorrentClass.start(inputHash)
|
||||||
|
|
||||||
|
if __name__ == "__main__":
|
||||||
|
main()
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue