version 0.9

Corrections for history file inspection
Enhancement: no double download for several emissions of same episode of a movie / film

Author: TomMeHo

.gitignore

@@ -2,6 +2,7 @@
 Scripts/
 pyvenv.cfg
 .vscode/
+test_dl/
 
 # Byte-compiled / optimized / DLL files
 __pycache__/

README.md

@@ -65,16 +65,14 @@ Options:
 #!/bin/sh
 #encoding: utf8 
 
-#go to the work directory
+#Go to the directory of the venv - where this script should be located
 cd /volumeX/[path]
 
 #Download using the venv
-bin/python3 cleanup-generic.py /volume1/video/Kinder/Löwenzahn "https://mediathekviewweb.de/feed?query=%23L%C3%B6wenzahn%20%20%3E20"
+bin/python3 -m mediathekDownloader -S -m 20 -v  -s '!ARD #Maus >10 <40' /volume1/video/Maus
 
-#Index neu aufbauen
-/usr/syno/bin/synoindex -R /volume1/video/Kinder/Löwenzahn &
-#/usr/syno/bin/synoindex -R /volume1/video/Kinder/Maus &
-#/usr/syno/bin/synoindex -R /volume1/video/Kinder/MausSpezial/ &
+#Rebuild video station's index
+/usr/syno/bin/synoindex -R /volume1/video/Maus &
 ```
 
 ## Installation

mediathekDownloader/__main__.py

@@ -154,14 +154,31 @@ def fileIsInHistory(outPath : str, fileName : str) -> bool:
 		historyFile = '%s/downloaded.txt' % outPath
 		with open( historyFile, 'rt') as history:
 			for line in history:
-				if line == fileName: 
+				if line.rstrip() == fileName: 
 					isInHistory = True
 					debug('File already in download history.')
 					break
 	except:
 		pass
 	return isInHistory
 
+localQueue = []
+
+def isFileInLocalQueue(term : str) -> bool:
+
+	global localQueue
+	isQueued = False
+
+	for queuedItem in localQueue:
+		if term == queuedItem:
+			isQueued = True
+			debug('File already considered for queue.')
+			break
+
+	if isQueued == False:
+		localQueue.append(term)
+
+	return isQueued
 
 def retrieveFeed(feedUrl:str, outputPath:str, printFeedItems:bool=False)->[]:
 
@@ -182,10 +199,11 @@ def retrieveFeed(feedUrl:str, outputPath:str, printFeedItems:bool=False)->[]:
 
 			skip = skipDedicatedEpisodeVariants(vsInfo.episodeTitle)
 			existsAlready = determineFileAlreadyExists(downloadQueueItem.fullFilePath())
-			isInHistory = fileIsInHistory(downloadQueueItem.path, downloadQueueItem.fileName)
+			isInHistory = ( fileIsInHistory(downloadQueueItem.path, downloadQueueItem.fileName) ) or ( fileIsInHistory(downloadQueueItem.path, vsInfo.identifyingTerm ) ) 
 			isInPast = True if (vsInfo.episodeReleaseDate < datetime.now().date()) else False
+			isAlreadyQueued = isFileInLocalQueue( vsInfo.identifyingTerm )
 
-			if skip == False and existsAlready == False and isInHistory == False and isInPast == True:
+			if skip == False and existsAlready == False and isInHistory == False and isInPast == True and isAlreadyQueued == False:
 				downloadQueueItems.append(downloadQueueItem)
 				if printFeedItems: printFeedItem(entry)
 			else:
@@ -218,6 +236,7 @@ def downloadFeedItem(dlQuItem:DownloadQueueItem, barIndicator:bool=True) -> bool
 
 	information('File downloaded: %s' % (dlQuItem.vsInfo.episodeTitle))
 	notedownDownload(dlQuItem.path, dlQuItem.fileName)
+	notedownDownload(dlQuItem.path, dlQuItem.vsInfo.identifyingTerm)
 	success = True
 
 	return success

mediathekDownloader/downloadQueueItem.py

@@ -1,8 +1,6 @@
 import os
 from .vsMetaInfoGenerator import VsMetaInfoGenerator
 
-# TODO Filename Param ausbauen
-
 class DownloadQueueItem():
     def __init__(self, vsInfo: VsMetaInfoGenerator, path: str):
 

mediathekDownloader/vsMetaInfoGenerator.py

@@ -41,6 +41,8 @@ def __init__(self, feedItem):
         self.episodeLocked = False
         self.tvshowLocked = False
 
+        self.identifyingTerm = '%s - %s -s%se%s' % (self.showTitle, self.episodeTitle, self.season, self.episode)
+
     def isUsable(self) ->bool:
         if (len(self.episodeTitle) > 0 or len(self.showTitle) > 0 or len(self.showTitle2) > 0) and len(self.download_url) > 0: 
             return True

setup.py

@@ -4,7 +4,7 @@
     long_description = fh.read()
 
 setuptools.setup(name='mediathekDownloader',
-      version='0.1.2',
+      version='0.9.0',
       description=' Downloads series and movies from German public media libraries (Öffentlich-Rechtliche Sender) to your Synology NAS, for use with Synology Video Station.',
       long_description=long_description,
       long_description_content_type="text/markdown",