Skip to content

Commit

Permalink
Merge pull request #7716 from pymedusa/release/release-0.3.12
Browse files Browse the repository at this point in the history
Release/release 0.3.12
  • Loading branch information
medariox authored Feb 8, 2020
2 parents 9a36461 + 08e8ec9 commit ee1b898
Show file tree
Hide file tree
Showing 15 changed files with 122 additions and 113 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,11 @@
## 0.3.12 (2020-02-08)

#### Fixes
- Fixed guessit parser not using scene exceptions ([#7699](https://github.com/pymedusa/Medusa/pull/7699))
- Updated YggTorrent provider domain ([#7703](https://github.com/pymedusa/Medusa/pull/7703))

-----

## 0.3.11 (2020-01-31)

#### Improvements
Expand Down
2 changes: 1 addition & 1 deletion medusa/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@
log.logger.addHandler(logging.NullHandler())

INSTANCE_ID = text_type(uuid.uuid1())
VERSION = '0.3.11'
VERSION = '0.3.12'
USER_AGENT = 'Medusa/{version} ({system}; {release}; {instance})'.format(
version=VERSION, system=platform.system(), release=platform.release(),
instance=INSTANCE_ID)
Expand Down
2 changes: 1 addition & 1 deletion medusa/name_parser/guessit_parser.py
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ def get_expected_titles(show_list):
"""
expected_titles = []
for show in show_list:
names = {show.name}.union(show.exceptions)
names = {show.name}.union(show.aliases)
for name in names:
if name.isdigit():
# do not add numbers to expected titles.
Expand Down
4 changes: 2 additions & 2 deletions medusa/providers/torrent/html/yggtorrent.py
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ def __init__(self):
self.password = None

# URLs
self.url = 'https://www2.yggtorrent.ws'
self.url = 'https://www.yggtorrent.to'
self.urls = {
'auth': urljoin(self.url, 'user/ajax_usermenu'),
'login': urljoin(self.url, 'user/login'),
Expand Down Expand Up @@ -177,7 +177,7 @@ def login(self):
log.warning('Unable to connect to provider')
return False

if not login_resp.ok:
if not login_resp.ok and login_resp.status_code == 401:
log.warning('Invalid username or password. Check your settings')
return False

Expand Down
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,6 @@
"test-api": "dredd --config dredd/dredd.yml"
},
"devDependencies": {
"dredd": "12.2.0"
"dredd": "12.2.1"
}
}
2 changes: 1 addition & 1 deletion tests/report_guessit.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ class MockTvShow(object):
def __init__(self, name):
self.is_anime = name.startswith('a:')
self.name = name[2:] if self.is_anime else name
self.exceptions = []
self.aliases = []


def main(argv):
Expand Down
8 changes: 4 additions & 4 deletions themes-default/slim/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@
"country-language": "0.1.7",
"date-fns": "2.9.0",
"is-visible": "2.2.0",
"javascript-time-ago": "2.0.6",
"javascript-time-ago": "2.0.7",
"jquery": "3.4.1",
"lodash": "4.17.15",
"tablesorter": "2.31.2",
Expand Down Expand Up @@ -69,16 +69,16 @@
"babel-loader": "8.0.6",
"browser-env": "3.3.0",
"clean-webpack-plugin": "3.0.0",
"codecov": "3.6.2",
"codecov": "3.6.5",
"copy-webpack-plugin": "5.1.1",
"cross-env": "7.0.0",
"css-loader": "3.4.2",
"eslint": "6.8.0",
"eslint-config-xo": "0.26.0",
"eslint-import-resolver-webpack": "0.12.1",
"eslint-plugin-eslint-comments": "3.1.2",
"eslint-plugin-import": "2.20.0",
"eslint-plugin-jest": "23.6.0",
"eslint-plugin-import": "2.20.1",
"eslint-plugin-jest": "23.7.0",
"eslint-plugin-unicorn": "10.0.0",
"eslint-plugin-vue": "6.1.2",
"file-loader": "5.0.2",
Expand Down
6 changes: 3 additions & 3 deletions themes-default/slim/src/components/config-post-processing.vue
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
<div class="col-sm-10 content">
<file-browser id="tv_download_dir" name="tv_download_dir" title="Select series download location" :initial-dir="postprocessing.showDownloadDir" @update="postprocessing.showDownloadDir = $event" />
<span class="clear-left">The folder where your download client puts the completed TV downloads.</span>
<div class="clear-left"><p><b>NOTE:</b> Please use seperate downloading and completed folders in your download client if possible.</p></div>
<div class="clear-left"><p><b>NOTE:</b> Please use separate downloading and completed folders in your download client if possible.</p></div>
</div>
</div>

Expand Down Expand Up @@ -92,7 +92,7 @@
</label>
<div class="col-sm-10 content">
<select-list name="sync_files" id="sync_files" csv-enabled :list-items="postprocessing.syncFiles" @change="onChangeSyncFiles" />
<span>comma seperated list of extensions or filename globs Medusa ignores when Post Processing</span>
<span>Comma separated list of extensions or filename globs Medusa ignores when post processing</span>
</div>
</div>

Expand Down Expand Up @@ -155,7 +155,7 @@
</label>
<div class="col-sm-10 content">
<select-list name="allowed_extensions" id="allowed_extensions" csv-enabled :list-items="postprocessing.allowedExtensions" @change="onChangeAllowedExtensions" />
<span>Comma seperated list of associated file extensions Medusa should keep while post processing.</span><br>
<span>Comma separated list of associated file extensions Medusa should keep while post processing.</span><br>
<span>Leaving it empty means all associated files will be deleted</span>
</div>
</div>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ exports[`ConfigPostProcessing.test.js renders 1`] = `
<b>
NOTE:
</b>
Please use seperate downloading and completed folders in your download client if possible.
Please use separate downloading and completed folders in your download client if possible.
</p>
</div>
</div>
Expand Down Expand Up @@ -332,7 +332,7 @@ exports[`ConfigPostProcessing.test.js renders 1`] = `
/>
<span>
comma seperated list of extensions or filename globs Medusa ignores when Post Processing
Comma separated list of extensions or filename globs Medusa ignores when post processing
</span>
</div>
</div>
Expand Down Expand Up @@ -534,7 +534,7 @@ exports[`ConfigPostProcessing.test.js renders 1`] = `
/>
<span>
Comma seperated list of associated file extensions Medusa should keep while post processing.
Comma separated list of associated file extensions Medusa should keep while post processing.
</span>
<br />
Expand Down
Loading

0 comments on commit ee1b898

Please sign in to comment.