From b9c22582cf253f66eaa6f447cf748efcf852fcef Mon Sep 17 00:00:00 2001 From: echel0n Date: Thu, 19 Jun 2014 07:43:12 -0700 Subject: [PATCH] Added restore folder to gitignore list. --- .gitignore | 1 + SickBeard.py | 16 ++++++++-------- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/.gitignore b/.gitignore index e3cf4db6..33ad38e9 100644 --- a/.gitignore +++ b/.gitignore @@ -9,6 +9,7 @@ failed.db* autoProcessTV/autoProcessTV.cfg server.crt server.key +restore/ # SB Test Related # ###################### diff --git a/SickBeard.py b/SickBeard.py index cd0f7fb6..c516afb9 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -192,14 +192,6 @@ def main(): # Rename the main thread threading.currentThread().name = "MAIN" - # Check if we need to perform a restore first - restoreDir = os.path.join(sickbeard.PROG_DIR, 'restore') - if os.path.exists(restoreDir): - if restore(restoreDir, sickbeard.PROG_DIR): - print "Restore successful..." - else: - print "Restore FAILED!" - try: opts, args = getopt.getopt(sys.argv[1:], "qfdp::", ['quiet', 'forceupdate', 'daemon', 'port=', 'pidfile=', 'nolaunch', 'config=', @@ -277,6 +269,14 @@ def main(): sickbeard.CREATEPID = False + # Check if we need to perform a restore first + restoreDir = os.path.join(sickbeard.PROG_DIR, 'restore') + if os.path.exists(restoreDir): + if restore(restoreDir, sickbeard.PROG_DIR): + logger.log(u"Restore successful...") + else: + logger.log(u"Restore FAILED!") + # If they don't specify a config file then put it in the data dir if not sickbeard.CONFIG_FILE: sickbeard.CONFIG_FILE = os.path.join(sickbeard.DATA_DIR, "config.ini")