monkee.ch/SickGear
1
0
Fork 0
mirror of https://github.com/SickGear/SickGear.git synced 2025-01-22 09:33:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #212 from adam111316/feature/TidyStartup

Browse source 
Change startup code cleanup and PEP8
This commit is contained in:
adam111316 2015-02-24 20:10:25 +08:00
commit 9a95b7f2a1
2 changed files with 69 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGES.md
View file

@ -6,6 +6,7 @@
* Add text to explain params passed to extra scripts on Config/Post Processing * Add text to explain params passed to extra scripts on Config/Post Processing
* Remove unused SickBeardURLOpener and AuthURLOpener classes * Remove unused SickBeardURLOpener and AuthURLOpener classes
* Update Pushbullet notifier (port from midgetspy/sickbeard) * Update Pushbullet notifier (port from midgetspy/sickbeard)
* Change startup code cleanup and PEP8
[develop changelog] [develop changelog]

135
SickBeard.py
View file

@ -25,9 +25,14 @@ import signal
import sys import sys
import shutil import shutil
import subprocess import subprocess
import os
import locale
import datetime
import threading
import getopt
if sys.version_info < (2, 6): if sys.version_info < (2, 6):
print "Sorry, requires Python 2.6 or 2.7." print 'Sorry, requires Python 2.6 or 2.7.'
sys.exit(1) sys.exit(1)
try: try:
@ -36,27 +41,20 @@ try:
if Cheetah.Version[0] != '2': if Cheetah.Version[0] != '2':
raise ValueError raise ValueError
except ValueError: except ValueError:
print "Sorry, requires Python module Cheetah 2.1.0 or newer." print 'Sorry, requires Python module Cheetah 2.1.0 or newer.'
sys.exit(1) sys.exit(1)
except: except:
print "The Python module Cheetah is required" print 'The Python module Cheetah is required'
sys.exit(1) sys.exit(1)
import os
sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib'))) sys.path.insert(0, os.path.abspath(os.path.join(os.path.dirname(__file__), 'lib')))
# We only need this for compiling an EXE and I will just always do that on 2.6+ # We only need this for compiling an EXE and I will just always do that on 2.6+
if sys.hexversion >= 0x020600F0: if sys.hexversion >= 0x020600F0:
from multiprocessing import freeze_support # @UnresolvedImport from multiprocessing import freeze_support # @UnresolvedImport
import locale
import datetime
import threading
import getopt
import sickbeard import sickbeard
from sickbeard import db, logger, network_timezones, failed_history, name_cache, versionChecker from sickbeard import db, logger, network_timezones, failed_history, name_cache
from sickbeard.tv import TVShow from sickbeard.tv import TVShow
from sickbeard.webserveInit import WebServer from sickbeard.webserveInit import WebServer
from sickbeard.databases.mainDB import MIN_DB_VERSION, MAX_DB_VERSION from sickbeard.databases.mainDB import MIN_DB_VERSION, MAX_DB_VERSION
@ -85,35 +83,36 @@ class SickGear(object):
self.forcedPort = None self.forcedPort = None
self.noLaunch = False self.noLaunch = False
def help_message(self): @staticmethod
def help_message():
""" """
print help message for commandline options print help message for commandline options
""" """
help_msg = "\n" help_msg = '\n'
help_msg += "Usage: " + sickbeard.MY_FULLNAME + " <option> <another option>\n" help_msg += 'Usage: %s <option> <another option>\n' % sickbeard.MY_FULLNAME
help_msg += "\n" help_msg += '\n'
help_msg += "Options:\n" help_msg += 'Options:\n'
help_msg += "\n" help_msg += '\n'
help_msg += " -h --help Prints this message\n" help_msg += ' -h --help Prints this message\n'
help_msg += " -f --forceupdate Force update all shows in the DB (from tvdb) on startup\n" help_msg += ' -f --forceupdate Force update all shows in the DB (from tvdb) on startup\n'
help_msg += " -q --quiet Disables logging to console\n" help_msg += ' -q --quiet Disables logging to console\n'
help_msg += " --nolaunch Suppress launching web browser on startup\n" help_msg += ' --nolaunch Suppress launching web browser on startup\n'
if sys.platform == 'win32': if sys.platform == 'win32':
help_msg += " -d --daemon Running as real daemon is not supported on Windows\n" help_msg += ' -d --daemon Running as real daemon is not supported on Windows\n'
help_msg += " On Windows, --daemon is substituted with: --quiet --nolaunch\n" help_msg += ' On Windows, --daemon is substituted with: --quiet --nolaunch\n'
else: else:
help_msg += " -d --daemon Run as double forked daemon (includes options --quiet --nolaunch)\n" help_msg += ' -d --daemon Run as double forked daemon (includes options --quiet --nolaunch)\n'
help_msg += " --pidfile=<path> Combined with --daemon creates a pidfile (full path including filename)\n" help_msg += ' --pidfile=<path> Combined with --daemon creates a pidfile (full path including filename)\n'
help_msg += " -p <port> --port=<port> Override default/configured port to listen on\n" help_msg += ' -p <port> --port=<port> Override default/configured port to listen on\n'
help_msg += " --datadir=<path> Override folder (full path) as location for\n" help_msg += ' --datadir=<path> Override folder (full path) as location for\n'
help_msg += " storing database, configfile, cache, logfiles \n" help_msg += ' storing database, configfile, cache, logfiles \n'
help_msg += " Default: " + sickbeard.PROG_DIR + "\n" help_msg += ' Default: %s\n' % sickbeard.PROG_DIR
help_msg += " --config=<path> Override config filename (full path including filename)\n" help_msg += ' --config=<path> Override config filename (full path including filename)\n'
help_msg += " to load configuration from \n" help_msg += ' to load configuration from \n'
help_msg += " Default: config.ini in " + sickbeard.PROG_DIR + " or --datadir location\n" help_msg += ' Default: config.ini in %s or --datadir location\n' % sickbeard.PROG_DIR
help_msg += " --noresize Prevent resizing of the banner/posters even if PIL is installed\n" help_msg += ' --noresize Prevent resizing of the banner/posters even if PIL is installed\n'
return help_msg return help_msg
@ -127,7 +126,7 @@ class SickGear(object):
sickbeard.SYS_ENCODING = None sickbeard.SYS_ENCODING = None
try: try:
locale.setlocale(locale.LC_ALL, "") locale.setlocale(locale.LC_ALL, '')
except (locale.Error, IOError): except (locale.Error, IOError):
pass pass
try: try:
@ -139,7 +138,7 @@ class SickGear(object):
if not sickbeard.SYS_ENCODING or sickbeard.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'): if not sickbeard.SYS_ENCODING or sickbeard.SYS_ENCODING in ('ANSI_X3.4-1968', 'US-ASCII', 'ASCII'):
sickbeard.SYS_ENCODING = 'UTF-8' sickbeard.SYS_ENCODING = 'UTF-8'
if not hasattr(sys, "setdefaultencoding"): if not hasattr(sys, 'setdefaultencoding'):
reload(sys) reload(sys)
try: try:
@ -148,17 +147,17 @@ class SickGear(object):
sys.setdefaultencoding(sickbeard.SYS_ENCODING) sys.setdefaultencoding(sickbeard.SYS_ENCODING)
except: except:
print 'Sorry, you MUST add the SickGear folder to the PYTHONPATH environment variable' print 'Sorry, you MUST add the SickGear folder to the PYTHONPATH environment variable'
print 'or find another way to force Python to use ' + sickbeard.SYS_ENCODING + ' for string encoding.' print 'or find another way to force Python to use %s for string encoding.' % sickbeard.SYS_ENCODING
sys.exit(1) sys.exit(1)
# Need console logging for SickBeard.py and SickBeard-console.exe # Need console logging for SickBeard.py and SickBeard-console.exe
self.consoleLogging = (not hasattr(sys, "frozen")) or (sickbeard.MY_NAME.lower().find('-console') > 0) self.consoleLogging = (not hasattr(sys, 'frozen')) or (sickbeard.MY_NAME.lower().find('-console') > 0)
# Rename the main thread # Rename the main thread
threading.currentThread().name = "MAIN" threading.currentThread().name = 'MAIN'
try: try:
opts, args = getopt.getopt(sys.argv[1:], "hfqdp::", opts, args = getopt.getopt(sys.argv[1:], 'hfqdp::',
['help', 'forceupdate', 'quiet', 'nolaunch', 'daemon', 'pidfile=', 'port=', ['help', 'forceupdate', 'quiet', 'nolaunch', 'daemon', 'pidfile=', 'port=',
'datadir=', 'config=', 'noresize']) # @UnusedVariable 'datadir=', 'config=', 'noresize']) # @UnusedVariable
except getopt.GetoptError: except getopt.GetoptError:
@ -188,7 +187,7 @@ class SickGear(object):
try: try:
self.forcedPort = int(a) self.forcedPort = int(a)
except ValueError: except ValueError:
sys.exit("Port: " + str(a) + " is not a number. Exiting.") sys.exit('Port: %s is not a number. Exiting.' % a)
# Run as a double forked daemon # Run as a double forked daemon
if o in ('-d', '--daemon'): if o in ('-d', '--daemon'):
@ -207,7 +206,7 @@ class SickGear(object):
# If the pidfile already exists, sickbeard may still be running, so exit # If the pidfile already exists, sickbeard may still be running, so exit
if os.path.exists(self.PIDFILE): if os.path.exists(self.PIDFILE):
sys.exit("PID file: " + self.PIDFILE + " already exists. Exiting.") sys.exit('PID file: %s already exists. Exiting.' % self.PIDFILE)
# Specify folder to load the config file from # Specify folder to load the config file from
if o in ('--config',): if o in ('--config',):
@ -238,14 +237,14 @@ class SickGear(object):
# 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')
# Make sure that we can create the data dir # Make sure that we can create the data dir
if not os.access(sickbeard.DATA_DIR, os.F_OK): if not os.access(sickbeard.DATA_DIR, os.F_OK):
try: try:
os.makedirs(sickbeard.DATA_DIR, 0744) os.makedirs(sickbeard.DATA_DIR, 0744)
except os.error: except os.error:
sys.exit(u'Unable to create data directory: %s + Exiting.' % sickbeard.DATA_DIR) sys.exit(u'Unable to create data directory: %s Exiting.' % sickbeard.DATA_DIR)
# Make sure we can write to the data dir # Make sure we can write to the data dir
if not os.access(sickbeard.DATA_DIR, os.W_OK): if not os.access(sickbeard.DATA_DIR, os.W_OK):
@ -261,7 +260,7 @@ class SickGear(object):
os.chdir(sickbeard.DATA_DIR) os.chdir(sickbeard.DATA_DIR)
if self.consoleLogging: if self.consoleLogging:
print u'Starting up SickGear from %s' % sickbeard.CONFIG_FILE print u'Starting up SickGear from %s' % sickbeard.CONFIG_FILE
# Load the config and publish it to the sickbeard package # Load the config and publish it to the sickbeard package
if not os.path.isfile(sickbeard.CONFIG_FILE): if not os.path.isfile(sickbeard.CONFIG_FILE):
@ -279,7 +278,8 @@ class SickGear(object):
if CUR_DB_VERSION > MAX_DB_VERSION: if CUR_DB_VERSION > MAX_DB_VERSION:
print u'Your database version (%s) has been incremented past what this version of SickGear supports' \ print u'Your database version (%s) has been incremented past what this version of SickGear supports' \
% CUR_DB_VERSION % CUR_DB_VERSION
sys.exit(u'If you have used other forks of SB, your database may be unusable due to their modifications') sys.exit(
u'If you have used other forks of SG, your database may be unusable due to their modifications')
# Initialize the config and our threads # Initialize the config and our threads
sickbeard.initialize(consoleLogging=self.consoleLogging) sickbeard.initialize(consoleLogging=self.consoleLogging)
@ -291,7 +291,7 @@ class SickGear(object):
sickbeard.PID = os.getpid() sickbeard.PID = os.getpid()
if self.forcedPort: if self.forcedPort:
logger.log(u"Forcing web server to port " + str(self.forcedPort)) logger.log(u'Forcing web server to port %s' % self.forcedPort)
self.startPort = self.forcedPort self.startPort = self.forcedPort
else: else:
self.startPort = sickbeard.WEB_PORT self.startPort = sickbeard.WEB_PORT
@ -334,10 +334,10 @@ class SickGear(object):
self.webserver = WebServer(self.web_options) self.webserver = WebServer(self.web_options)
self.webserver.start() self.webserver.start()
except Exception: except Exception:
logger.log(u"Unable to start web server, is something else running on port %d?" % self.startPort, logger.log(u'Unable to start web server, is something else running on port %d?' % self.startPort,
logger.ERROR) logger.ERROR)
if sickbeard.LAUNCH_BROWSER and not self.runAsDaemon: if sickbeard.LAUNCH_BROWSER and not self.runAsDaemon:
logger.log(u"Launching browser and exiting", logger.ERROR) logger.log(u'Launching browser and exiting', logger.ERROR)
sickbeard.launchBrowser(self.startPort) sickbeard.launchBrowser(self.startPort)
os._exit(1) os._exit(1)
@ -345,9 +345,9 @@ class SickGear(object):
restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore') restoreDir = os.path.join(sickbeard.DATA_DIR, 'restore')
if os.path.exists(restoreDir): if os.path.exists(restoreDir):
if self.restore(restoreDir, sickbeard.DATA_DIR): if self.restore(restoreDir, sickbeard.DATA_DIR):
logger.log(u"Restore successful...") logger.log(u'Restore successful...')
else: else:
logger.log_error_and_exit(u"Restore FAILED!", logger.ERROR) logger.log_error_and_exit(u'Restore FAILED!')
# Build from the DB to start with # Build from the DB to start with
self.loadShowsFromDB() self.loadShowsFromDB()
@ -374,7 +374,7 @@ class SickGear(object):
sickbeard.launchBrowser(self.startPort) sickbeard.launchBrowser(self.startPort)
# main loop # main loop
while (True): while True:
time.sleep(1) time.sleep(1)
def daemonize(self): def daemonize(self):
@ -388,7 +388,7 @@ class SickGear(object):
if pid != 0: if pid != 0:
os._exit(0) os._exit(0)
except OSError, e: except OSError, e:
sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror)) sys.stderr.write('fork #1 failed: %d (%s)\n' % (e.errno, e.strerror))
sys.exit(1) sys.exit(1)
os.setsid() # @UndefinedVariable - only available in UNIX os.setsid() # @UndefinedVariable - only available in UNIX
@ -403,19 +403,18 @@ class SickGear(object):
if pid != 0: if pid != 0:
os._exit(0) os._exit(0)
except OSError, e: except OSError, e:
sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror)) sys.stderr.write('fork #2 failed: %d (%s)\n' % (e.errno, e.strerror))
sys.exit(1) sys.exit(1)
# Write pid # Write pid
if self.CREATEPID: if self.CREATEPID:
pid = str(os.getpid()) pid = str(os.getpid())
logger.log(u"Writing PID: " + pid + " to " + str(self.PIDFILE)) logger.log(u'Writing PID: %s to %s' % (pid, self.PIDFILE))
try: try:
file(self.PIDFILE, 'w').write("%s\n" % pid) file(self.PIDFILE, 'w').write('%s\n' % pid)
except IOError, e: except IOError, e:
logger.log_error_and_exit( logger.log_error_and_exit(
u"Unable to write PID file: " + self.PIDFILE + " Error: " + str(e.strerror) + " [" + str( u'Unable to write PID file: %s Error: %s [%s]' % (self.PIDFILE, e.strerror, e.errno))
e.errno) + "]")
# Redirect all output # Redirect all output
sys.stdout.flush() sys.stdout.flush()
@ -429,7 +428,8 @@ class SickGear(object):
os.dup2(stdout.fileno(), sys.stdout.fileno()) os.dup2(stdout.fileno(), sys.stdout.fileno())
os.dup2(stderr.fileno(), sys.stderr.fileno()) os.dup2(stderr.fileno(), sys.stderr.fileno())
def remove_pid_file(self, PIDFILE): @staticmethod
def remove_pid_file(PIDFILE):
try: try:
if os.path.exists(PIDFILE): if os.path.exists(PIDFILE):
os.remove(PIDFILE) os.remove(PIDFILE)
@ -439,26 +439,27 @@ class SickGear(object):
return True return True
def loadShowsFromDB(self): @staticmethod
def loadShowsFromDB():
""" """
Populates the showList with shows from the database Populates the showList with shows from the database
""" """
logger.log(u"Loading initial show list") logger.log(u'Loading initial show list')
myDB = db.DBConnection() myDB = db.DBConnection()
sqlResults = myDB.select("SELECT * FROM tv_shows") sqlResults = myDB.select('SELECT * FROM tv_shows')
sickbeard.showList = [] sickbeard.showList = []
for sqlShow in sqlResults: for sqlShow in sqlResults:
try: try:
curShow = TVShow(int(sqlShow["indexer"]), int(sqlShow["indexer_id"])) curShow = TVShow(int(sqlShow['indexer']), int(sqlShow['indexer_id']))
curShow.nextEpisode() curShow.nextEpisode()
sickbeard.showList.append(curShow) sickbeard.showList.append(curShow)
except Exception, e: except Exception, e:
logger.log( logger.log(
u"There was an error creating the show in " + sqlShow["location"] + ": " + str(e).decode('utf-8', u'There was an error creating the show in %s: %s' % (sqlShow['location'], str(e).decode('utf-8',
'replace'), 'replace')),
logger.ERROR) logger.ERROR)
def restore(self, srcDir, dstDir): def restore(self, srcDir, dstDir):
@ -485,7 +486,7 @@ class SickGear(object):
# shutdown web server # shutdown web server
if self.webserver: if self.webserver:
logger.log("Shutting down Tornado") logger.log('Shutting down Tornado')
self.webserver.shutDown() self.webserver.shutDown()
try: try:
self.webserver.join(10) self.webserver.join(10)
@ -508,7 +509,7 @@ class SickGear(object):
popen_list += sickbeard.MY_ARGS popen_list += sickbeard.MY_ARGS
if '--nolaunch' not in popen_list: if '--nolaunch' not in popen_list:
popen_list += ['--nolaunch'] popen_list += ['--nolaunch']
logger.log(u"Restarting SickGear with " + str(popen_list)) logger.log(u'Restarting SickGear with %s' % popen_list)
logger.close() logger.close()
subprocess.Popen(popen_list, cwd=os.getcwd()) subprocess.Popen(popen_list, cwd=os.getcwd())
@ -516,7 +517,7 @@ class SickGear(object):
os._exit(0) os._exit(0)
if __name__ == "__main__": if __name__ == '__main__':
if sys.hexversion >= 0x020600F0: if sys.hexversion >= 0x020600F0:
freeze_support() freeze_support()