diff --git a/SickBeard.py b/SickBeard.py index c51d433eed..239fd438ea 100755 --- a/SickBeard.py +++ b/SickBeard.py @@ -3,20 +3,20 @@ # Author: Nic Wolfe # URL: http://code.google.com/p/sickbeard/ # -# This file is part of SickRage. +# This file is part of Medusa. # -# SickRage is free software: you can redistribute it and/or modify +# Medusa is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by # the Free Software Foundation, either version 3 of the License, or # (at your option) any later version. # -# SickRage is distributed in the hope that it will be useful, +# Medusa is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with SickRage. If not, see . +# along with Medusa. If not, see . """ @@ -35,9 +35,9 @@ -p, --port=[PORT] Override default/configured port to listen on --datadir=[PATH] Override folder (full path) as location for storing database, config file, cache, and log files - Default SickRage directory + Default Medusa directory --config=[FILE] Override config filename for loading configuration - Default config.ini in SickRage directory or + Default config.ini in Medusa directory or location specified with --datadir --noresize Prevent resizing of the banner/posters even if PIL is installed @@ -111,7 +111,7 @@ class SickRage(object): # pylint: disable=too-many-instance-attributes """ - Main SickRage module + Main Medusa module """ def __init__(self): @@ -154,13 +154,13 @@ def help_message(): """ help_msg = __doc__ help_msg = help_msg.replace('SickBeard.py', sickbeard.MY_FULLNAME) - help_msg = help_msg.replace('SickRage directory', sickbeard.PROG_DIR) + help_msg = help_msg.replace('Medusa directory', sickbeard.PROG_DIR) return help_msg def start(self): # pylint: disable=too-many-branches,too-many-statements """ - Start SickRage + Start Medusa """ # do some preliminary stuff sickbeard.MY_FULLNAME = ek(os.path.normpath, ek(os.path.abspath, __file__)) @@ -188,7 +188,7 @@ def start(self): # pylint: disable=too-many-branches,too-many-statements # On non-unicode builds this will raise an AttributeError, if encoding type is not valid it throws a LookupError sys.setdefaultencoding(sickbeard.SYS_ENCODING) # pylint: disable=no-member except (AttributeError, LookupError): - sys.exit('Sorry, you MUST add the SickRage folder to the PYTHONPATH environment variable\n' + sys.exit('Sorry, you MUST add the Medusa folder to the PYTHONPATH environment variable\n' 'or find another way to force Python to use %s for string encoding.' % sickbeard.SYS_ENCODING) # Need console logging for SickBeard.py and SickBeard-console.exe @@ -242,7 +242,7 @@ def start(self): # pylint: disable=too-many-branches,too-many-statements self.create_pid = True self.pid_file = str(value) - # If the pid file already exists, SickRage may still be running, so exit + # If the pid file already exists, Medusa may still be running, so exit if ek(os.path.exists, self.pid_file): sys.exit('PID file: %s already exists. Exiting.' % self.pid_file) @@ -322,7 +322,7 @@ def start(self): # pylint: disable=too-many-branches,too-many-statements # Build from the DB to start with self.load_shows_from_db() - logger.log('Starting SickRage [{branch}] using \'{config}\''.format + logger.log('Starting Medusa [{branch}] using \'{config}\''.format (branch=sickbeard.BRANCH, config=sickbeard.CONFIG_FILE)) self.clear_cache() @@ -511,7 +511,7 @@ def restore_db(src_dir, dst_dir): def shutdown(self, event): """ - Shut down SickRage + Shut down Medusa :param event: Type of shutdown event, used to see if restart required """ @@ -543,14 +543,14 @@ def shutdown(self, event): if install_type in ('git', 'source'): popen_list = [sys.executable, sickbeard.MY_FULLNAME] elif install_type == 'win': - logger.log('You are using a binary Windows build of SickRage. ' # pylint: disable=no-member + logger.log('You are using a binary Windows build of Medusa. ' # pylint: disable=no-member 'Please switch to using git.', logger.ERROR) if popen_list and not sickbeard.NO_RESTART: popen_list += sickbeard.MY_ARGS if '--nolaunch' not in popen_list: popen_list += ['--nolaunch'] - logger.log('Restarting SickRage with {options}'.format(options=popen_list)) # pylint: disable=no-member + logger.log('Restarting Medusa with {options}'.format(options=popen_list)) # pylint: disable=no-member # shutdown the logger to make sure it's released the logfile BEFORE it restarts SR. logger.shutdown() # pylint: disable=no-member subprocess.Popen(popen_list, cwd=os.getcwd()) @@ -561,5 +561,5 @@ def shutdown(self, event): if __name__ == '__main__': - # start SickRage + # start Medusa SickRage().start() diff --git a/gui/slick/images/banner.png b/gui/slick/images/banner.png index 69f1f0a34f..f5849a2a61 100644 Binary files a/gui/slick/images/banner.png and b/gui/slick/images/banner.png differ diff --git a/gui/slick/images/ico/favicon-114.png b/gui/slick/images/ico/favicon-114.png index daa7f23917..f66f1e2c56 100644 Binary files a/gui/slick/images/ico/favicon-114.png and b/gui/slick/images/ico/favicon-114.png differ diff --git a/gui/slick/images/ico/favicon-120.png b/gui/slick/images/ico/favicon-120.png index 0271be077f..3d2f0eb011 100644 Binary files a/gui/slick/images/ico/favicon-120.png and b/gui/slick/images/ico/favicon-120.png differ diff --git a/gui/slick/images/ico/favicon-144.png b/gui/slick/images/ico/favicon-144.png index d2da2691f5..ff5e69d2b7 100644 Binary files a/gui/slick/images/ico/favicon-144.png and b/gui/slick/images/ico/favicon-144.png differ diff --git a/gui/slick/images/ico/favicon-150.png b/gui/slick/images/ico/favicon-150.png index 19102c37b0..d5ed3fa8dc 100644 Binary files a/gui/slick/images/ico/favicon-150.png and b/gui/slick/images/ico/favicon-150.png differ diff --git a/gui/slick/images/ico/favicon-152.png b/gui/slick/images/ico/favicon-152.png index 8295ea5792..795f9fa424 100644 Binary files a/gui/slick/images/ico/favicon-152.png and b/gui/slick/images/ico/favicon-152.png differ diff --git a/gui/slick/images/ico/favicon-16.png b/gui/slick/images/ico/favicon-16.png index f7e20e98e8..c8c076032c 100644 Binary files a/gui/slick/images/ico/favicon-16.png and b/gui/slick/images/ico/favicon-16.png differ diff --git a/gui/slick/images/ico/favicon-160.png b/gui/slick/images/ico/favicon-160.png index 0ccfa33da0..35989b1b26 100644 Binary files a/gui/slick/images/ico/favicon-160.png and b/gui/slick/images/ico/favicon-160.png differ diff --git a/gui/slick/images/ico/favicon-196.png b/gui/slick/images/ico/favicon-196.png index 6461a9b9a7..87182dc1e0 100644 Binary files a/gui/slick/images/ico/favicon-196.png and b/gui/slick/images/ico/favicon-196.png differ diff --git a/gui/slick/images/ico/favicon-310.png b/gui/slick/images/ico/favicon-310.png index 6166a4f344..0346e970fa 100644 Binary files a/gui/slick/images/ico/favicon-310.png and b/gui/slick/images/ico/favicon-310.png differ diff --git a/gui/slick/images/ico/favicon-32.png b/gui/slick/images/ico/favicon-32.png index 4e375754e5..b161ca94b9 100644 Binary files a/gui/slick/images/ico/favicon-32.png and b/gui/slick/images/ico/favicon-32.png differ diff --git a/gui/slick/images/ico/favicon-57.png b/gui/slick/images/ico/favicon-57.png index 64abfa5f16..1c4077040f 100644 Binary files a/gui/slick/images/ico/favicon-57.png and b/gui/slick/images/ico/favicon-57.png differ diff --git a/gui/slick/images/ico/favicon-64.png b/gui/slick/images/ico/favicon-64.png index 2b6771e57d..4df1af3e35 100644 Binary files a/gui/slick/images/ico/favicon-64.png and b/gui/slick/images/ico/favicon-64.png differ diff --git a/gui/slick/images/ico/favicon-70.png b/gui/slick/images/ico/favicon-70.png index 2c5bc04247..e3a1e95f15 100644 Binary files a/gui/slick/images/ico/favicon-70.png and b/gui/slick/images/ico/favicon-70.png differ diff --git a/gui/slick/images/ico/favicon-72.png b/gui/slick/images/ico/favicon-72.png index 50d1fc21fe..ac5ae7044b 100644 Binary files a/gui/slick/images/ico/favicon-72.png and b/gui/slick/images/ico/favicon-72.png differ diff --git a/gui/slick/images/ico/favicon-76.png b/gui/slick/images/ico/favicon-76.png index bb44fceee0..4d0db1cebc 100644 Binary files a/gui/slick/images/ico/favicon-76.png and b/gui/slick/images/ico/favicon-76.png differ diff --git a/gui/slick/images/ico/favicon-96.png b/gui/slick/images/ico/favicon-96.png index 827794c2a0..ab9d5e711a 100644 Binary files a/gui/slick/images/ico/favicon-96.png and b/gui/slick/images/ico/favicon-96.png differ diff --git a/gui/slick/images/ico/favicon.ico b/gui/slick/images/ico/favicon.ico index 277e9f872d..fdbbd28e8b 100644 Binary files a/gui/slick/images/ico/favicon.ico and b/gui/slick/images/ico/favicon.ico differ diff --git a/gui/slick/images/medusa-snake-mascot.png b/gui/slick/images/medusa-snake-mascot.png new file mode 100644 index 0000000000..ac5ae7044b Binary files /dev/null and b/gui/slick/images/medusa-snake-mascot.png differ diff --git a/gui/slick/images/medusa.png b/gui/slick/images/medusa.png new file mode 100644 index 0000000000..4eb1707d02 Binary files /dev/null and b/gui/slick/images/medusa.png differ diff --git a/gui/slick/images/poster.png b/gui/slick/images/poster.png index c280c1849d..6baa160643 100644 Binary files a/gui/slick/images/poster.png and b/gui/slick/images/poster.png differ diff --git a/gui/slick/images/sickrage-shark-mascot.png b/gui/slick/images/sickrage-shark-mascot.png deleted file mode 100644 index af5337f01d..0000000000 Binary files a/gui/slick/images/sickrage-shark-mascot.png and /dev/null differ diff --git a/gui/slick/images/sickrage.png b/gui/slick/images/sickrage.png deleted file mode 100644 index f531944161..0000000000 Binary files a/gui/slick/images/sickrage.png and /dev/null differ diff --git a/gui/slick/images/xbmc-notify.png b/gui/slick/images/xbmc-notify.png index af5337f01d..ac5ae7044b 100644 Binary files a/gui/slick/images/xbmc-notify.png and b/gui/slick/images/xbmc-notify.png differ diff --git a/gui/slick/views/IRC.mako b/gui/slick/views/IRC.mako index 13a40727a6..534bb432fd 100644 --- a/gui/slick/views/IRC.mako +++ b/gui/slick/views/IRC.mako @@ -2,7 +2,7 @@ <%block name="content"> <% from sickbeard import GIT_USERNAME -username = ("SickRageUI|?", GIT_USERNAME)[bool(GIT_USERNAME)] +username = ("MedusaUI|?", GIT_USERNAME)[bool(GIT_USERNAME)] %> - + diff --git a/gui/slick/views/addShows.mako b/gui/slick/views/addShows.mako index 3bf5e84d8d..bd00ab60ad 100644 --- a/gui/slick/views/addShows.mako +++ b/gui/slick/views/addShows.mako @@ -16,7 +16,7 @@

Add New Show

-

For shows that you haven't downloaded yet, this option finds a show on theTVDB.com, creates a directory for it's episodes, and adds it to SickRage.

+

For shows that you haven't downloaded yet, this option finds a show on theTVDB.com, creates a directory for it's episodes, and adds it to Medusa.

@@ -25,7 +25,7 @@

Add From Trakt Lists

-

For shows that you haven't downloaded yet, this option lets you choose from a show from one of the Trakt lists to add to SickRage .

+

For shows that you haven't downloaded yet, this option lets you choose from a show from one of the Trakt lists to add to Medusa .

@@ -45,7 +45,7 @@

Add Existing Shows

-

Use this option to add shows that already have a folder created on your hard drive. SickRage will scan your existing metadata/episodes and add the show accordingly.

+

Use this option to add shows that already have a folder created on your hard drive. Medusa will scan your existing metadata/episodes and add the show accordingly.

diff --git a/gui/slick/views/addShows_addExistingShow.mako b/gui/slick/views/addShows_addExistingShow.mako index ad6d318e31..d332325813 100644 --- a/gui/slick/views/addShows_addExistingShow.mako +++ b/gui/slick/views/addShows_addExistingShow.mako @@ -35,14 +35,14 @@
-

SickRage can add existing shows, using the current options, by using locally stored NFO/XML metadata to eliminate user interaction. - If you would rather have SickRage prompt you to customize each show, then use the checkbox below.

+

Medusa can add existing shows, using the current options, by using locally stored NFO/XML metadata to eliminate user interaction. + If you would rather have Medusa prompt you to customize each show, then use the checkbox below.

-

Displaying folders within these directories which aren't already added to SickRage:

+

Displaying folders within these directories which aren't already added to Medusa:


diff --git a/gui/slick/views/addShows_newShow.mako b/gui/slick/views/addShows_newShow.mako index 2abd76d958..5d388a4030 100644 --- a/gui/slick/views/addShows_newShow.mako +++ b/gui/slick/views/addShows_newShow.mako @@ -57,7 +57,7 @@

* This will only affect the language of the retrieved metadata file contents and episode filenames.
- This DOES NOT allow SickRage to download non-english TV episodes!

+ This DOES NOT allow Medusa to download non-english TV episodes!


% endif diff --git a/gui/slick/views/apiBuilder.mako b/gui/slick/views/apiBuilder.mako index d100f8e3c9..3f37766b32 100644 --- a/gui/slick/views/apiBuilder.mako +++ b/gui/slick/views/apiBuilder.mako @@ -16,7 +16,7 @@ % endif - SickRage - BRANCH:[${sickbeard.BRANCH}] - ${title} + Medusa - BRANCH:[${sickbeard.BRANCH}] - ${title}