Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

release: v1.8.0 #46

Merged
merged 1 commit into from
Dec 24, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
name: CI

on:
push:
branches: [ master ]
pull_request:
branches: [ master ]
workflow_dispatch: ~
Expand Down
31 changes: 0 additions & 31 deletions .github/workflows/cron-tests-subdb.yml

This file was deleted.

4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
* [v1.8.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-1.8.0):
* Remove SubDb (Site is down)
* Make lib vfs optional since there are fallbacks and it is used as last case scenario. Thus making the addon installable on platforms which are not supported by lib vfs.

* [v1.7.2](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-1.7.2):
* Improve results sort based on title match

Expand Down
3 changes: 1 addition & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
### General Status
![general-service](https://github.com/a4k-openproject/a4kSubtitles/workflows/Service/badge.svg) ![general-api](https://github.com/a4k-openproject/a4kSubtitles/workflows/API/badge.svg) ![general-search](https://github.com/a4k-openproject/a4kSubtitles/workflows/Search/badge.svg) ![general-tvshow](https://github.com/a4k-openproject/a4kSubtitles/workflows/TVShow/badge.svg)
### Providers Status
![addic7ed](https://github.com/a4k-openproject/a4kSubtitles/workflows/Addic7ed/badge.svg) ![bsplayer](https://github.com/a4k-openproject/a4kSubtitles/workflows/BSPlayer/badge.svg) ![opensubtitles](https://github.com/a4k-openproject/a4kSubtitles/workflows/OpenSubtitles/badge.svg) ![podnadpisi](https://github.com/a4k-openproject/a4kSubtitles/workflows/Podnadpisi.NET/badge.svg) ![subdb](https://github.com/a4k-openproject/a4kSubtitles/workflows/Subdb/badge.svg) ![subscene](https://github.com/a4k-openproject/a4kSubtitles/workflows/Subscene/badge.svg)
![addic7ed](https://github.com/a4k-openproject/a4kSubtitles/workflows/Addic7ed/badge.svg) ![bsplayer](https://github.com/a4k-openproject/a4kSubtitles/workflows/BSPlayer/badge.svg) ![opensubtitles](https://github.com/a4k-openproject/a4kSubtitles/workflows/OpenSubtitles/badge.svg) ![podnadpisi](https://github.com/a4k-openproject/a4kSubtitles/workflows/Podnadpisi.NET/badge.svg) ![subscene](https://github.com/a4k-openproject/a4kSubtitles/workflows/Subscene/badge.svg)

## Description

Expand All @@ -15,7 +15,6 @@ Subtitle addon for KODI with support for multiple subtitle services:
* BSPlayer
* OpenSubtitles
* Podnadpisi.NET
* SubDB
* Subscene

## Configuration
Expand Down
1 change: 0 additions & 1 deletion a4kSubtitles/services/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
'bsplayer': 'BSPlayer',
'opensubtitles': 'OpenSubtitles',
'podnadpisi': 'Podnadpisi',
'subdb': 'SubDB',
'subscene': 'Subscene',
}

Expand Down
63 changes: 0 additions & 63 deletions a4kSubtitles/services/subdb.py

This file was deleted.

8 changes: 6 additions & 2 deletions addon.xml
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<addon id="service.subtitles.a4ksubtitles"
name="a4kSubtitles"
version="1.7.2"
version="1.8.0"
provider-name="Unknown">
<requires>
<import addon="vfs.libarchive"/>
<import addon="script.module.requests"/>
<import addon="vfs.libarchive" optional="true"/>
</requires>
<extension point="xbmc.subtitle.module" library="main.py"/>
<extension point="xbmc.service" library="main_service.py" />
Expand All @@ -27,6 +27,10 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, SubDB, Subscene, Addic7ed
<screenshot>screenshot-03.png</screenshot>
</assets>
<news>
[v1.8.0]:
* Remove SubDb (Site is down)
* Make lib vfs optional since there are fallbacks and it is used as last case scenario. Thus making the addon installable on platforms which are not supported by lib vfs.

[v1.7.2]:
* Improve results sort based on title match

Expand Down
2 changes: 0 additions & 2 deletions main_service.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# -*- coding: utf-8 -*-

import os
import importlib
from a4kSubtitles import api, service

if __name__ == '__main__':
Expand Down
8 changes: 6 additions & 2 deletions packages/addons.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
<addons>
<addon id="service.subtitles.a4ksubtitles"
name="a4kSubtitles"
version="1.7.2"
version="1.8.0"
provider-name="Unknown">
<requires>
<import addon="vfs.libarchive"/>
<import addon="script.module.requests"/>
<import addon="vfs.libarchive" optional="true"/>
</requires>
<extension point="xbmc.subtitle.module" library="main.py"/>
<extension point="xbmc.service" library="main_service.py" />
Expand All @@ -30,6 +30,10 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, SubDB, Subscene, Addic7ed
<screenshot>screenshot-03.png</screenshot>
</assets>
<news>
[v1.8.0]:
* Remove SubDb (Site is down)
* Make lib vfs optional since there are fallbacks and it is used as last case scenario. Thus making the addon installable on platforms which are not supported by lib vfs.

[v1.7.2]:
* Improve results sort based on title match

Expand Down
2 changes: 1 addition & 1 deletion packages/addons.xml.crc
Original file line number Diff line number Diff line change
@@ -1 +1 @@
35e4b34b1943a8d1fd3c23db47d36a52ca064b7f
bde01dcf6a9f3cc4714b9b86735740ce03d7ec73
4 changes: 0 additions & 4 deletions resources/language/resource.language.en_gb/strings.po
Original file line number Diff line number Diff line change
Expand Up @@ -49,10 +49,6 @@ msgctxt "#33203"
msgid "Podnadpisi"
msgstr ""

msgctxt "#33204"
msgid "SubDB"
msgstr ""

msgctxt "#33205"
msgid "Subscene"
msgstr ""
Expand Down
1 change: 0 additions & 1 deletion resources/settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
<setting id="bsplayer.enabled" label="33202" type="bool" default="true"/>
<setting id="opensubtitles.enabled" label="33201" type="bool" default="true"/>
<setting id="podnadpisi.enabled" label="33203" type="bool" default="true"/>
<setting id="subdb.enabled" label="33204" type="bool" default="true"/>
<setting id="subscene.enabled" label="33205" type="bool" default="true"/>
</category>
<!-- Accounts -->
Expand Down
48 changes: 0 additions & 48 deletions tests/test_suite.py
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ def __search(a4ksubtitles_api, settings={}, video_meta={}):
'opensubtitles.password': '',
'bsplayer.enabled': 'false',
'podnadpisi.enabled': 'false',
'subdb.enabled': 'false',
'subscene.enabled': 'false',
'addic7ed.enabled': 'false',
}
Expand Down Expand Up @@ -450,53 +449,6 @@ def test_podnadpisi_tvshow():

assert filepath != ''

# def test_subdb():
# a4ksubtitles_api = api.A4kSubtitlesApi({'kodi': True})
# __remove_all_cache(a4ksubtitles_api)

# # search
# settings = {
# 'subdb.enabled': 'true',
# }
# search = __search_movie(a4ksubtitles_api, settings)

# # download
# item = search.results[0]

# params = {
# 'action': 'download',
# 'service_name': 'subdb',
# 'action_args': item['action_args']
# }

# filepath = a4ksubtitles_api.download(params, search.settings)

# assert filepath != ''

def test_subdb_tvshow():
a4ksubtitles_api = api.A4kSubtitlesApi({'kodi': True})
__remove_all_cache(a4ksubtitles_api)

# search
settings = {
'subdb.enabled': 'true',
}

search = __search_tvshow(a4ksubtitles_api, settings)

# download
item = search.results[0]

params = {
'action': 'download',
'service_name': 'subdb',
'action_args': item['action_args']
}

filepath = a4ksubtitles_api.download(params, search.settings)

assert filepath != ''

def test_subscene():
a4ksubtitles_api = api.A4kSubtitlesApi({'kodi': True})
__remove_all_cache(a4ksubtitles_api)
Expand Down