Fix error, when a user switches back to master and then develop. This…

.github/CONTRIBUTING.md

@@ -36,14 +36,14 @@ Bugs in old versions of Medusa may have already been fixed. In order to avoid re
 
 ### Reporting the issue
 
-If the above steps fail and you are sure its a bug, issues are tracked in the [Medusa issue tracker](https://github.com/PyMedusa/sickrage).
+If the above steps fail and you are sure its a bug, issues are tracked in the [Medusa issue tracker](https://github.com/pymedusa/Medusa).
 
 ## Tips For Submitting Code
 
 
 ### Code
 
-**ALWAYS follow Medusa [Coding Standards](https://github.com/PyMedusa/SickRage.github.io/wiki/SickRage-Coding-Standards)**
+**ALWAYS follow Medusa [Coding Standards](https://github.com/pymedusa/Medusa/wiki/Medusa-Coding-Standards)**
 
 Review regularly as they are subject to change and submissions will not be accepted until they meet our guidelines.
 
@@ -58,15 +58,11 @@ Please follow these guidelines before reporting a bug:
 
 1. **Update to the latest version** — Check if you can reproduce the issue with the latest version from the `develop` branch.
 
-2. **Use the search on SickRage issues** — check if the issue has already been reported. If it has been, please comment on the existing issue.
+2. **Use the search on Medusa issues** — check if the issue has already been reported. If it has been, please comment on the existing issue.
 
 3. **Provide a means to reproduce the problem** — Please provide as much details as possible, e.g. Medusa log files (obfuscate apikey/passwords), browser and operating system versions, how you started Medusa, and of course the steps to reproduce the problem.
 
 
-### Feature requests
-Please follow the bug guidelines above for feature requests, i.e. update to the latest version and search for existing requests on [FeatHub](http://feathub.com/PyMedusa/SickRage) before posting a new request..
-[![Feature Requests](https://cloud.githubusercontent.com/assets/390379/10127973/045b3a96-6560-11e5-9b20-31a2032956b2.png)](http://feathub.com/PyMedusa/SickRage)
-
 ### Pull requests
 
 [Pull requests](https://help.github.com/articles/using-pull-requests) are welcome and the preferred way of accepting code contributions.
@@ -92,11 +88,11 @@ Please follow this process; it's the best way to get your work included in the p
 
 ```bash
    # clone your fork of the repo into the current directory in terminal
-   git clone [email protected]:<your username>/SickRage.git
+   git clone [email protected]:<your username>/Medusa.git
    # navigate to the newly cloned directory
-   cd SickRage
+   cd Medusa
    # assign the original repo to a remote called "upstream"
-   git remote add upstream https://github.com/PyMedusa/SickRage.git
+   git remote add upstream https://github.com/pymedusa/Medusa.git
    ```
 
 - If you cloned a while ago, get the latest changes from upstream:
@@ -142,4 +138,4 @@ Please follow this process; it's the best way to get your work included in the p
 
 ## Code guidelines
 
-Read and follow the [Medusa Coding Standards](https://github.com/PyMedusa/SickRage.github.io/wiki/SickRage-Coding-Standards).  Review these regularly as they are subject to change and code will not be accepted if it does not adhere to the standards.
+Read and follow the [Medusa Coding Standards](https://github.com/pymedusa/Medusa/wiki/Medusa-Coding-Standards).  Review these regularly as they are subject to change and code will not be accepted if it does not adhere to the standards.

.github/ISSUE_TEMPLATE.md

@@ -1,6 +1,6 @@
 ### Before submitting your issue:
 
-Enable debug logging in SickRage settings, reproduce the error (be sure to disable after the bug is fixed)
+Enable debug logging in Medusa settings, reproduce the error (be sure to disable after the bug is fixed)
 
 Branch/Commit:
 OS:

medusa/logger.py

@@ -787,7 +787,8 @@ def backwards_compatibility():
         match = log_re.match(filename)
         if match:
             new_file = os.path.join(cwd, app.LOG_DIR, app.LOG_FILENAME + (match.group('suffix') or ''))
-            os.rename(os.path.join(cwd, app.LOG_DIR, filename), new_file)
+            if not any(f.startswith(os.path.basename(filename)) for f in os.listdir(app.LOG_DIR)):
+                os.rename(os.path.join(cwd, app.LOG_DIR, filename), new_file)
             continue
 
 

start.py

@@ -404,7 +404,7 @@ def backwards_compatibility():
             backup_re = re.compile(r'[^\d]+(?P<suffix>-\d{14}\.zip)')
             for filename in os.listdir(app.DATA_DIR):
                 # Rename database file
-                if filename.startswith(app.LEGACY_DB):
+                if filename.startswith(app.LEGACY_DB) and not any(f.startswith(app.APPLICATION_DB) for f in os.listdir(app.DATA_DIR)):
                     new_file = os.path.join(cwd, app.DATA_DIR, app.APPLICATION_DB + filename[len(app.LEGACY_DB):])
                     os.rename(os.path.join(cwd, app.DATA_DIR, filename), new_file)
                     continue