move error fixing

TVEncoder.py

@@ -12,7 +12,7 @@ from libsettings import Settings
 from libhandbrake import Encoder
 import libtvdatasource
 
-TVRECORDINGSDIR = "/srv/storage2/videos/TVRecordings/" # TODO move this to settings
+TVRECORDINGSDIR = "/Volumes/TV Recordings/"#"/srv/storage2/videos/TVRecordings/" # TODO move this to settings
 
 def ShowHelp():
     print 'TVEncoder.py -p -n <number of files to prepare for processing> - prepare n recordings'
@@ -53,16 +53,16 @@ def main(argv):
           readOnly = True
           doList = True
     
-    shows = Settings("") # TODO call actual settings file
+    showSettings = Settings("settings.xml") # TODO call actual settings file
 
     if readOnly and doList:
         if doEncode:
             #Generate the list of files that would be encoded
-            showData = libfilemanager.GetEncodingFiles(shows, readOnly)
+            showData = libfilemanager.GetEncodingFiles(showSettings, readOnly)
             PrintShowsToEncode(showData)
         else:
             # Generate the list of files to process
-            shows = libfilemanager.GetFilesToPrepare(TVRECORDINGSDIR, numFiles, shows)
+            shows = libfilemanager.GetFilesToPrepare(TVRECORDINGSDIR, numFiles, showSettings)
             PrintShowsToPrepare(shows)
     else:
         if doEncode:

libfilemanager.py

@@ -88,7 +88,7 @@ def GetFilesToPrepare(path, numberofFiles, shows):
     for file in files:
         # TODO get these from settings
         #if TVData.CheckTitleIsInList('localhost', 'script', 'script', 'mythconverg', file):
-        showData = TVData.RetrieveEpisodeData('localhost', 'script', 'script', 'mythconverg', file, shows)
+        showData = TVData.RetrieveEpisodeData('192.168.0.2', 'script', 'script', 'mythconverg', file, shows, '192.168.0.2', '8081', '3678177136222bf5002be209220ccb20') # TODO all these settings need to move to settings
         if showData:
             showsToProcess.append(showData)
             i = i + 1

libmythtv.py

@@ -8,8 +8,7 @@ Created on Fri Jul  5 14:10:47 2013
 import MySQLdb as mdb
 from libtvshow import TVShow
 
-class MythTV:
-    def RetrieveEpisodeData(serverAddress, user, password, database, inputFile):
+def RetrieveEpisodeData(serverAddress, user, password, database, inputFile):
     con = mdb.connect(serverAddress, user, password, database)
         
     with con:

libsettings.py

@@ -5,18 +5,23 @@ Created on Fri Jul  5 20:14:15 2013
 @author: shanef
 """
 
-from libtvdatasource import TVShow
 from xml.etree import ElementTree
 
+class ShowSettings:
+    def __init__(self, name, inputDirectory, outputDirectory):
+        self.name = name
+        self.inputDirectory = inputDirectory
+        self.outputDirectory = outputDirectory
+
 class Settings:
     def __init__(self, settingsFile):
         self.shows = self.LoadSettings(settingsFile)
     
-    def LoadSettings(source):
+    def LoadSettings(self, source):
         shows = []
         settingsXml = ElementTree.parse(source).getroot()
 
         for show in settingsXml.findall('show'):     
-            newShow = TVShow(show[0].text, show[1].text, show[2].text)
+            newShow = ShowSettings(show[0].text, show[1].text, show[2].text)
             shows.append(newShow)
         return shows

libtvdatasource.py

@@ -9,7 +9,6 @@ import libmythtv as MythTV
 from libsickbeard import Sickbeard
 import os
 import shutil
-from libtvshow import TVShow
 
 # TODO Move these to settings
 PROCESSDIR="/srv/storage2/files/VideoProcessing/"
@@ -46,18 +45,19 @@ def GetDirectory(title, season):
     
     return os.path.join(PROCESSDIR, directory, INPUTDIR, season)
         
-def RetrieveEpisodeData(serverAddress, user, password, database, inputFile, showsToProcess):
+def RetrieveEpisodeData(serverAddress, user, password, database, inputFile, showsToProcess, sickbeardAddress, sickbeardPort, sickbeardAPIKey):
     file = os.path.basename(inputFile)
-    show = MythTV.RetrieveEpisodeData('localhost', 'script', 'script', 'mythconverg', file)
+    show = MythTV.RetrieveEpisodeData(serverAddress, user, password, database, file)
     
     if show.title and show.title in showsToProcess:
         if show.subtitle:
             show.subtitle = GetEpisodeName(show.subtitle, show.title)
 
         if (show.season == '0' or show.episode == '0'):
-            showId = Sickbeard.FindShowId(show.title)
+            sickbeard = Sickbeard(sickbeardAddress, sickbeardPort, sickbeardAPIKey)
+            showId = sickbeard.FindShowId(show.title)
             
-            result = Sickbeard.FindEpisode(showId, show.subtitle, show.description)
+            result = sickbeard.FindEpisode(showId, show.subtitle, show.description)
             show.season = result[0]
             show.episode = result[1]