diff options
| author | morpheus65535 <[email protected]> | 2021-03-27 08:29:01 -0400 |
|---|---|---|
| committer | morpheus65535 <[email protected]> | 2021-03-27 08:29:01 -0400 |
| commit | eb899187f723f258cf2a40843490e8100067ba4c (patch) | |
| tree | bb1f5988e4344220923de7f3532d5939e295f032 | |
| parent | e56760bbac46c00e3e6c22c38516118f8b7fc9a1 (diff) | |
| parent | c83f47b2d02470da70ad42797a0f4aa1085ee20a (diff) | |
| download | bazarr-eb899187f723f258cf2a40843490e8100067ba4c.tar.gz bazarr-eb899187f723f258cf2a40843490e8100067ba4c.zip | |
Merge branch 'development' of https://github.com/morpheus65535/bazarr into development
| -rw-r--r-- | .github/workflows/release_beta_to_dev.yaml | 7 | ||||
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | .release-it.json | 3 | ||||
| -rw-r--r-- | libs/subliminal_patch/providers/greeksubs.py | 9 |
4 files changed, 19 insertions, 2 deletions
diff --git a/.github/workflows/release_beta_to_dev.yaml b/.github/workflows/release_beta_to_dev.yaml index 800596b8a..2883f6d43 100644 --- a/.github/workflows/release_beta_to_dev.yaml +++ b/.github/workflows/release_beta_to_dev.yaml @@ -7,6 +7,7 @@ jobs: env: GITHUB_TOKEN: "${{ secrets.GITHUB_TOKEN }}" UI_DIRECTORY: ./frontend + ASSET_DIRECTORY: ./__builds__ FETCH_DEPTH: 15 # Should be enough steps: - name: Validate branch @@ -49,5 +50,11 @@ jobs: run: npm run build && git add . working-directory: ${{ env.UI_DIRECTORY }} + - name: Save UI to Asset + run: | + mkdir -p ../.${{ env.ASSET_DIRECTORY }} && + zip -r ../.${{ env.ASSET_DIRECTORY }}/ui.zip ./ -x '*.map' -b $(mktemp -d) + working-directory: ${{ env.UI_DIRECTORY }}/build + - name: Create Release run: release-it --ci --increment prerelease --preRelease=beta diff --git a/.gitignore b/.gitignore index 325ee9aa5..540572f9f 100644 --- a/.gitignore +++ b/.gitignore @@ -11,6 +11,8 @@ bazarr.pid /bin /.vscode +# CI +/__builds__ /package.json /package-lock.json diff --git a/.release-it.json b/.release-it.json index c831e1733..dca102111 100644 --- a/.release-it.json +++ b/.release-it.json @@ -1,7 +1,8 @@ { "git": { "requireCleanWorkingDir": false, - "changelog": "auto-changelog --stdout" + "changelog": "auto-changelog --stdout", + "tagName": "v${version}" }, "github": { "release": true, diff --git a/libs/subliminal_patch/providers/greeksubs.py b/libs/subliminal_patch/providers/greeksubs.py index a5944f8a6..d138fcd49 100644 --- a/libs/subliminal_patch/providers/greeksubs.py +++ b/libs/subliminal_patch/providers/greeksubs.py @@ -70,7 +70,14 @@ class GreekSubsProvider(Provider): search_link = self.server_url + 'en/view/' + imdb_id r = self.session.get(search_link, timeout=30) - r.raise_for_status() + + # 404 is returned if the imdb_id was not found + if r.status_code != 404: + r.raise_for_status() + + if r.status_code != 200: + logger.debug('No subtitles found') + return subtitles soup_page = ParserBeautifulSoup(r.content.decode('utf-8', 'ignore'), ['html.parser']) |