moparisthebest/SickRage
1
0
Fork 0
mirror of https://github.com/moparisthebest/SickRage synced 2025-01-07 03:48:02 -05:00
Code Issues Releases Wiki Activity

Added restore folder to gitignore list.

Browse Source
This commit is contained in:
echel0n 2014-06-19 07:43:12 -07:00
parent 2b7df8e67d
commit b9c22582cf
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -9,6 +9,7 @@ failed.db*
autoProcessTV/autoProcessTV.cfg autoProcessTV/autoProcessTV.cfg
server.crt server.crt
server.key server.key
restore/
# SB Test Related # # SB Test Related #
###################### ######################

16
SickBeard.py
View File

@ -192,14 +192,6 @@ def main():
# Rename the main thread # Rename the main thread
threading.currentThread().name = "MAIN" 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: try:
opts, args = getopt.getopt(sys.argv[1:], "qfdp::", opts, args = getopt.getopt(sys.argv[1:], "qfdp::",
['quiet', 'forceupdate', 'daemon', 'port=', 'pidfile=', 'nolaunch', 'config=', ['quiet', 'forceupdate', 'daemon', 'port=', 'pidfile=', 'nolaunch', 'config=',
@ -277,6 +269,14 @@ def main():
sickbeard.CREATEPID = False 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 they don't specify a config file then put it in the data dir
if not sickbeard.CONFIG_FILE: if not sickbeard.CONFIG_FILE:
sickbeard.CONFIG_FILE = os.path.join(sickbeard.DATA_DIR, "config.ini") sickbeard.CONFIG_FILE = os.path.join(sickbeard.DATA_DIR, "config.ini")