loop-through directory in cat_search + deluge

TorrentToMedia.py

@@ -18,41 +18,69 @@ from nzbToMediaUtil import *
 nzbtomedia_configure_logging(os.path.dirname(sys.argv[0]))      
 Logger = logging.getLogger(__name__)
 
-def category_search(inputDirectory, inputCategory, root):
+def category_search(inputDirectory, inputCategory, root, inputName, categories):
-	categorySearch = os.path.split(os.path.normpath(inputDirectory)) # Test for blackhole sub-directory
+        categorySearch = [os.path.normpath(inputDirectory),""] #initializie
-	if categorySearch[1] == inputName:
+        notfound = 0
-		Logger.info("SEARCH: Files appear to be in their own directory")
+        for x in range(10): # loop up through 10 directories looking for category.
+                try:
                         categorySearch2 = os.path.split(os.path.normpath(categorySearch[0]))
-		if categorySearch2[1] == movieCategory or categorySearch2[1] == tvCategory:
+                except: # this might happen when we can't go higher.
-			if not inputCategory:
+                        if inputCategory and inputName: # if these exists, we are ok to proceed, but assume we are in a root/common directory.
-				Logger.info("SEARCH: Determined Category to be: %s", categorySearch2[1])
+                                Logger.info("SEARCH: Could not find a category in the directory structure")
-				inputCategory = categorySearch2[1]
+                                Logger.info("SEARCH: We assume the directory passed is the root directory for your downlaoder")
-		elif not inputCategory:
-			Logger.error("SEARCH: Could not identify category from the directory structure. please check downlaoder settings")
-			sys.exit(-1)
-		else:
-			pass
-		
-	elif categorySearch[1] == movieCategory or categorySearch[1] == tvCategory:
-		if os.path.isdir(os.path.join(inputDirectory, inputName)):
-			Logger.info("SEARCH: Found torrent directory %s in category directory %s", os.path.join(inputDirectory, inputName), inputDirectory)
-			inputDirectory = os.path.join(inputDirectory, inputName)
-		else:
-			Logger.info("SEARCH: The directory passed is the root directory 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 = 1
+                                break #we are done
+                        else:
+                                Logger.error("SEARCH: Could not identify category 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", categorySearch[1])
                         if not inputCategory:
                                 Logger.info("SEARCH: Determined Category to be: %s", categorySearch[1])
-			inputCategory = categorySearch[1]
+                                inputCategory = categorySearch2[1]
-	elif not inputCategory:
+                        if inputName and categorySearch[0] != os.path.normpath(inputDirectory): # if we are not in the root directory and we have inputName we can continue.
-		Logger.error("SEARCH: Could not identify category from the directory structure. please check downlaoder settings")
+                                Logger.info("SEARCH: Identified Category: %s and Torrent Name: %s. We are in a unique directory, so we can proceed.", inputCategory, inputName)
-		sys.exit(-1)
+                                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 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
+                        else: #this is a problem! if we don't have Torrent name and are in the root category dir, we can't proceed.
+                                Logger.error("SEARCH: Could not identify a torrent name and the directory passed is common to all downloads for category %s. Exiting.", categorySearch[1])
+                                sys.exit(-1) # Oh yeah.... WE ARE DONE!
+                else if 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.info("SEARCH: The directory passed does not appear to include a category or the torrent name")
+                                Logger.debug("SEARCH: Continuing scan to determin category.")
-		Logger.warn("SEARCH: You should change settings to download torrents to their own directory if possible and include Label/Category directories")
+                                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:
+                                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
+        
+        if (not inputCategory) or (not inputName): #we didn't find these 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, inputCategory, root 
 
 def is_sample(filePath, inputName):
@@ -207,20 +235,35 @@ if not os.path.isfile(configFilename):
 Logger.info("MAIN: Loading config from %s", configFilename)
 config.read(configFilename)
 
-if len(sys.argv) > 2:
+if len(sys.argv) == 2: #for other clients we assume we must at least get the directory.
-        # We will pass in %D, %N, and %L (if it exists), from uTorrent
+        # We will assume this to be the passin from deluge. torrent id, torrent name, torrent save path.
+        inputDirectory = os.path.normpath(sys.argv[1)
+        inputName = '' # We dont have a name yet
+        inputCategory = '' # We dont have a category yet
+
+elif len(sys.argv) > 3 and sys.argv[1] == 'utorrent': #distinguish utorrent from others like deluge.
+        # We will pass in 'utorrent' '%D', '%N', and '%L' (if it exists), from uTorrent
         # In short pass "/path/to/downloaded/torrent/ name" to TorrentToMedia.py, eg  >>>> TorrentToMedia.py /Downloaded/MovieName.2013.BluRay.1080p.x264-10bit.DTS MovieName.2013.BluRay.1080p.x264-10bit.DTS <<<<
-        inputDirectory = os.path.normpath(sys.argv[1])
+        inputDirectory = os.path.normpath(sys.argv[2])
+        inputName = sys.argv[3]
+        try: #assume we have a label.
+                inputCategory = sys.argv[4] # We dont have a category yet
+        except:
+                inputCategory = '' # We dont have a category yet
+
+elif len(sys.argv) == 4:
+        # We will assume this to be the passin from deluge. torrent id, torrent name, torrent save path.
+        inputDirectory = os.path.normpath(sys.argv[3])
         inputName = sys.argv[2]
         inputCategory = '' # We dont have a category yet
-        if len (sys.argv) > 3: #assume we have a label.
+
-                inputCategory = sys.argv[3] # We dont have a category yet
 elif os.getenv('TR_TORRENT_DIR'):
         # We will pass in %TR_TORRENT_DIR% %TR_TORRENT_NAME% from Transmission
         # In short pass "/path/to/downloaded/torrent/ name" to TorrentToMedia.py, eg  >>>> TorrentToMedia.py /Downloaded/MovieName.2013.BluRay.1080p.x264-10bit.DTS MovieName.2013.BluRay.1080p.x264-10bit.DTS <<<<
         inputDirectory = os.path.normpath(os.getenv('TR_TORRENT_DIR'))
         inputName = os.getenv('TR_TORRENT_NAME')
         inputCategory = '' # We dont have a category yet
+
 else:
         Logger.error("MAIN: There was a problem loading variables: Exiting")
         sys.exit(-1)
@@ -241,6 +284,9 @@ extractionTool = os.path.normpath(config.get("Torrent", "extractionTool"))
 compressedContainer = config.get("Torrent", "compressedExtentions")
 mediaContainer = config.get("Torrent", "mediaExtentions")
 metaContainer = config.get("Torrent", "metaExtentions")
+categories = config.get("Torrent", "categories")
+categories = categories.append(movieCategory)
+categories = 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
 root = int(0)
@@ -249,13 +295,14 @@ video2 = int(0)
 failed_link = int(0)
 failed_extract = int(0)
 
-inputDirectory, inputCategory, root = category_search(inputDirectory, inputCategory, root) # Confirm the catgeogy by parsing directory structure
+inputDirectory, inputCategory, root = category_search(inputDirectory, inputCategory, root, inputName, categories) # Confirm the category by parsing directory structure
 if inputCategory == movieCategory:
         outputDestination = os.path.normpath(os.path.join(movieDestination, inputName))
 elif inputCategory == tvCategory:
         outputDestination = os.path.normpath(os.path.join(tvDestination, inputName))
 else:
         Logger.error("MAIN: Category of %s does not match either %s or %s: Exiting", inputCategory, movieCategory, tvCategory)
+        Logger.debug("MAIN: Future versions of this script might do something for Category: %s. Keep updating ;)", inputCategory)
         sys.exit(-1)
 
 Logger.debug("MAIN: Scanning files in directory: %s", inputDirectory)