Merge branch 'develop' into feature/vue-root-dirs

Conflicts:
	themes-default/slim/views/addShows_addExistingShow.mako
	themes/dark/templates/addShows_addExistingShow.mako
	themes/light/templates/addShows_addExistingShow.mako

.travis.yml

@@ -19,8 +19,7 @@ install:
   - 'export PATH="$HOME/.yarn/bin:$PATH" && yarn install'
 script:
   - yarn test
-  # Skip Python tests if the exit code of `.github/check_changes.py` is 0
-  - python .github/check_changes.py; if [[ $? -eq 0 ]]; then tox -v --recreate; fi
+  - tox -v --recreate
 cache:
   yarn: true
   directories:

medusa/bs4_parser.py

@@ -16,7 +16,9 @@
 # along with Medusa. If not, see <http://www.gnu.org/licenses/>.
 
 from __future__ import unicode_literals
+
 from builtins import object
+
 from bs4 import BeautifulSoup
 
 

medusa/clients/torrent/download_station_client.py

@@ -44,7 +44,6 @@ def __init__(self, host=None, username=None, password=None):
             'login': urljoin(self.host, 'webapi/auth.cgi'),
             'task': urljoin(self.host, 'webapi/DownloadStation/task.cgi'),
             'info': urljoin(self.host, '/webapi/DownloadStation/info.cgi'),
-            'dsminfo': urljoin(self.host, '/webapi/entry.cgi'),
         }
 
         self.url = self.urls['task']
@@ -159,14 +158,14 @@ def _check_destination(self):
             return True
 
         params = {
-            'api': 'SYNO.DSM.Info',
+            'api': 'SYNO.DownloadStation.Info',
             'version': 2,
             'method': 'getinfo',
             'session': 'DownloadStation',
         }
 
         try:
-            self.response = self.session.get(self.urls['dsminfo'], params=params, verify=False, timeout=120)
+            self.response = self.session.get(self.urls['info'], params=params, verify=False, timeout=120)
             self.response.raise_for_status()
         except RequestException as error:
             handle_requests_exception(error)