Merge branch 'develop' into subs-improve

SickBeard.py

@@ -3,20 +3,20 @@
 # Author: Nic Wolfe <nic@wolfeden.ca>
 # 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 <http://www.gnu.org/licenses/>.
+# along with Medusa. If not, see <http://www.gnu.org/licenses/>.
 
 
 """
@@ -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()

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)]
 %>
-<iframe id="extFrame" src="https://kiwiirc.com/client/irc.freenode.net/?nick=${username}&theme=basic#sickrage-issues" width="100%" height="500" frameBorder="0" style="border: 1px black solid;"></iframe>
+<iframe id="extFrame" src="https://kiwiirc.com/client/irc.freenode.net/?nick=${username}&theme=basic#pymedusa" width="100%" height="500" frameBorder="0" style="border: 1px black solid;"></iframe>
 </%block>

gui/slick/views/addShows.mako

@@ -16,7 +16,7 @@
         <div class="button"><div class="add-list-icon-addnewshow"></div></div>
         <div class="buttontext">
             <h3>Add New Show</h3>
-            <p>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.</p>
+            <p>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.</p>
         </div>
     </a>
 
@@ -25,7 +25,7 @@
         <div class="button"><div class="add-list-icon-addtrakt"></div></div>
         <div class="buttontext">
             <h3>Add From Trakt Lists</h3>
-            <p>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 .</p>
+            <p>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 .</p>
         </div>
     </a>
 
@@ -45,7 +45,7 @@
         <div class="button"><div class="add-list-icon-addexistingshow"></div></div>
         <div class="buttontext">
             <h3>Add Existing Shows</h3>
-            <p>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.</p>
+            <p>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.</p>
         </div>
     </a>
 

gui/slick/views/addShows_addExistingShow.mako

@@ -35,14 +35,14 @@
     </div>
     <br>
 
-    <p>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.</p>
+    <p>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.</p>
 
     <p><input type="checkbox" name="promptForSettings" id="promptForSettings" /> <label for="promptForSettings">Prompt me to set settings for each show</label></p>
 
     <hr />
 
-    <p><b>Displaying folders within these directories which aren't already added to SickRage:</b></p>
+    <p><b>Displaying folders within these directories which aren't already added to Medusa:</b></p>
 
     <ul id="rootDirStaticList"><li></li></ul>
     <br>

gui/slick/views/addShows_newShow.mako

@@ -57,7 +57,7 @@
 
                             <br><br>
                             <b>*</b> This will only affect the language of the retrieved metadata file contents and episode filenames.<br>
-                            This <b>DOES NOT</b> allow SickRage to download non-english TV episodes!<br><br>
+                            This <b>DOES NOT</b> allow Medusa to download non-english TV episodes!<br><br>
                             <div id="searchResults" style="height: 100%;"><br></div>
                         % endif
                     </div>

gui/slick/views/apiBuilder.mako

@@ -16,7 +16,7 @@
     <meta name="theme-color" content="#333333">
     % endif
 
-    <title>SickRage - BRANCH:[${sickbeard.BRANCH}] - ${title}</title>
+    <title>Medusa - BRANCH:[${sickbeard.BRANCH}] - ${title}</title>
 
     <!--[if lt IE 9]>
     <script src="https://oss.maxcdn.com/html5shiv/3.7.2/html5shiv.min.js"></script>
@@ -77,7 +77,7 @@
                 <span class="icon-bar"></span>
             </button>
             <a class="navbar-brand" href="${srRoot}/apibuilder/" title="SickRage">
-                <img alt="SickRage" src="${srRoot}/images/sickrage.png" style="height: 50px;" class="img-responsive pull-left" />
+                <img alt="SickRage" src="${srRoot}/images/medusa.png" style="height: 50px;" class="img-responsive pull-left" />
                 <p class="navbar-text hidden-xs">${title}</p>
             </a>
         </div>
@@ -93,7 +93,7 @@
             </div>
 
             <ul class="nav navbar-nav navbar-right">
-                <li><a href="${srRoot}/home/">Back to SickRage</a></li>
+                <li><a href="${srRoot}/home/">Back to Medusa</a></li>
                 <li class="hidden-xs">
                     <a href="https://github.com/PyMedusa/SickRage/wiki/Donations" rel="noreferrer" onclick="window.open('${sickbeard.ANON_REDIRECT}' + this.href); return false;">
                         <img src="${srRoot}/images/donate.jpg" alt="[donate]" class="navbaricon" />

gui/slick/views/config.mako

@@ -17,7 +17,7 @@
 <div id="config-content">
 <table class="infoTable" cellspacing="1" border="0" cellpadding="0" width="100%">
     % if sr_version:
-    <tr><td class="infoTableHeader" style="vertical-align: top;"><i class="icon16-config-sickrage"></i> SickRage Info:</td>
+    <tr><td class="infoTableHeader" style="vertical-align: top;"><i class="icon16-config-sickrage"></i> Medusa Info:</td>
         <td class="infoTableCell">
         Branch: <a href="${anon_url('https://github.com/PyMedusa/SickRage/tree/%s' % sickbeard.BRANCH)}">${sickbeard.BRANCH}</a><br>
         Commit: <a href="${anon_url('https://github.com/PyMedusa/SickRage/commit/%s' % sickbeard.CUR_COMMIT_HASH)}">${sickbeard.CUR_COMMIT_HASH}</a><br>
@@ -48,7 +48,7 @@
     <tr><td class="infoTableHeader"><i class="icon16-config-web"></i> Website:</td><td class="infoTableCell"><a href="${anon_url('http://github.com/PyMedusa/sickrage.github.io/')}" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">http://github.com/PyMedusa/sickrage.github.io/</a></td></tr>
     <tr><td class="infoTableHeader"><i class="icon16-config-wiki"></i> Wiki:</td><td class="infoTableCell"><a href="${anon_url('https://github.com/PyMedusa/SickRage-issues/wiki')}" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/PyMedusa/SickRage-issues/wiki</a></td></tr>
     <tr><td class="infoTableHeader"><i class="icon16-config-github"></i> Source:</td><td class="infoTableCell"><a href="${anon_url('https://github.com/PyMedusa/SickRage/')}" rel="noreferrer" onclick="window.open(this.href, '_blank'); return false;">https://github.com/PyMedusa/SickRage/</a></td></tr>
-    <tr><td class="infoTableHeader"><i class="icon16-config-mirc"></i> IRC Chat:</td><td class="infoTableCell"><a href="irc://irc.freenode.net/#sickrage-issues" rel="noreferrer"><i>#sickrage-issues</i> on <i>irc.freenode.net</i></a></td></tr>
+    <tr><td class="infoTableHeader"><i class="icon16-config-mirc"></i> IRC Chat:</td><td class="infoTableCell"><a href="irc://irc.freenode.net/#sickrage-issues" rel="noreferrer"><i>#pymedusa</i> on <i>irc.freenode.net</i></a></td></tr>
 </table>
 </div>
 </%block>

gui/slick/views/config_anime.mako

@@ -30,7 +30,7 @@
                             <input type="checkbox" class="enabler" name="use_anidb" id="use_anidb" ${('', 'checked="checked"')[bool(sickbeard.USE_ANIDB)]} />
                             <label for="use_notifo">
                                 <span class="component-title">Enable</span>
-                                <span class="component-desc">Should SickRage use data from AniDB?</span>
+                                <span class="component-desc">Should Medusa use data from AniDB?</span>
                             </label>
                         </div>
 

gui/slick/views/config_general.mako

@@ -63,7 +63,7 @@
                                 <span class="component-title">Launch browser</span>
                                 <span class="component-desc">
                                     <input type="checkbox" name="launch_browser" id="launch_browser" ${('', 'checked="checked"')[bool(sickbeard.LAUNCH_BROWSER)]}/>
-                                    <p>open the SickRage home page on startup</p>
+                                    <p>open the Medusa home page on startup</p>
                                 </span>
                             </label>
                         </div>
@@ -78,7 +78,7 @@
                                         <option value="news" ${('', 'selected="selected"')[sickbeard.DEFAULT_PAGE == 'news']}>News</option>
                                         <option value="IRC" ${('', 'selected="selected"')[sickbeard.DEFAULT_PAGE == 'IRC']}>IRC</option>
                                     </select>
-                                    <span>when launching SickRage interface</span>
+                                    <span>when launching Medusa interface</span>
                                 </span>
                             </label>
                         </div>
@@ -88,7 +88,7 @@
                                 <span class="component-desc">
                                     <input type="number" min="0" max="23" step="1" name="showupdate_hour" id="showupdate_hour" value="${sickbeard.SHOWUPDATE_HOUR}" class="form-control input-sm input75" autocapitalize="off" />
                                     <p>with information such as next air dates, show ended, etc. Use 15 for 3pm, 4 for 4am etc.</p>
-                                    <p>Note: minutes are randomized each time SickRage is started</p>
+                                    <p>Note: minutes are randomized each time Medusa is started</p>
                                 </span>
                             </label>
                         </div>
@@ -220,7 +220,7 @@
                                 <span class="component-title">Notify on software update</span>
                                 <span class="component-desc">
                                     <input type="checkbox" name="notify_on_update" id="notify_on_update" ${('', 'checked="checked"')[bool(sickbeard.NOTIFY_ON_UPDATE)]}/>
-                                    <p>send a message to all enabled notifiers when SickRage has been updated</p>
+                                    <p>send a message to all enabled notifiers when Medusa has been updated</p>
                                 </span>
                             </label>
                         </div>
@@ -373,7 +373,7 @@
 
                     <div class="component-group-desc">
                         <h3>Web Interface</h3>
-                        <p>It is recommended that you enable a username and password to secure SickRage from being tampered with remotely.</p>
+                        <p>It is recommended that you enable a username and password to secure Medusa from being tampered with remotely.</p>
                         <p><b>These options require a manual restart to take effect.</b></p>
                     </div>
 
@@ -386,7 +386,7 @@
                                     <input type="text" name="api_key" id="api_key" value="${sickbeard.API_KEY}" class="form-control input-sm input300" readonly="readonly" autocapitalize="off" />
                                     <input class="btn btn-inline" type="button" id="generate_new_apikey" value="Generate">
                                     <div class="clear-left">
-                                        <p>used to give 3rd party programs limited access to SickRage</p>
+                                        <p>used to give 3rd party programs limited access to Medusa</p>
                                         <p>you can try all the features of the API <a href="${srRoot}/apibuilder/">here</a></p>
                                     </div>
                                 </span>
@@ -427,7 +427,7 @@
                                 <span class="component-title">HTTP port</span>
                                 <span class="component-desc">
                                     <input type="number" min="1" step="1" name="web_port" id="web_port" value="${sickbeard.WEB_PORT}" class="form-control input-sm input100" autocapitalize="off" />
-                                    <p>web port to browse and access SickRage (default:8081)</p>
+                                    <p>web port to browse and access Medusa (default:8081)</p>
                                 </span>
                             </label>
                         </div>
@@ -627,7 +627,7 @@
                                 <p>Skip detection of removed files. If disabled the episode will be set to the default deleted status</p>
                                  </span>
                                 <div class="clear-left">
-                                <span class="component-desc"><b>NOTE:</b> This may mean SickRage misses renames as well</span>
+                                <span class="component-desc"><b>NOTE:</b> This may mean Medusa misses renames as well</span>
                                 </div>
                         </div>