release: v2.1.0

a4k-openproject · Dec 26, 2020 · f5b176d · f5b176d
1 parent 2e35e18
commit f5b176d
Show file tree

Hide file tree

Showing 6 changed files with 49 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* [v2.1.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-2.1.0):
+  * Fix Persian search in Subscene
+
 * [v2.0.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-2.0.0):
   * Use IMDb as main source for all meta.
   * Retry on 503 (Service Unavailable). OpenSubtitles and Subscene seems to return it occasionally.

diff --git a/a4kSubtitles/services/subscene.py b/a4kSubtitles/services/subscene.py
@@ -66,7 +66,8 @@ def parse_search_response(core, service_name, meta, response):
 
     def map_result(result):
         download_href = '%s%s%s' % (__url, title_href, result[0])
-        lang = result[0].split('/')[1].capitalize()
+        lang_default = result[0].split('/')[1]
+        lang = lang_default.split('_')[-1].capitalize()
         lang_code = core.kodi.xbmc.convertLanguage(lang, core.kodi.xbmc.ISO_639_1)
         name = result[1].strip()
         name_with_ext = '%s.srt' % name
@@ -84,7 +85,7 @@ def map_result(result):
             'color': 'dodgerblue',
             'action_args': {
                 'url': download_href,
-                'lang': lang,
+                'lang': lang_default,
                 'filename': name_with_ext,
                 'episodeid': '' if meta.is_movie else episodeid
             }

diff --git a/addon.xml b/addon.xml
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <addon id="service.subtitles.a4ksubtitles"
        name="a4kSubtitles"
-       version="2.0.0"
+       version="2.1.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -27,6 +27,9 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, Subscene, Addic7ed
             <screenshot>screenshot-03.png</screenshot>
         </assets>
         <news>
+[v2.1.0]:
+  * Fix Persian search in Subscene
+
 [v2.0.0]:
   * Use IMDb as main source for all meta.
   * Retry on 503 (Service Unavailable). OpenSubtitles and Subscene seems to return it occasionally.

diff --git a/packages/addons.xml b/packages/addons.xml
@@ -4,7 +4,7 @@
 <addons>
 <addon id="service.subtitles.a4ksubtitles"
        name="a4kSubtitles"
-       version="2.0.0"
+       version="2.1.0"
        provider-name="Unknown">
     <requires>
       <import addon="script.module.requests"/>
@@ -30,6 +30,9 @@ Supports: OpenSubtitles, BSPlayer, Podnadpisi.NET, Subscene, Addic7ed
             <screenshot>screenshot-03.png</screenshot>
         </assets>
         <news>
+[v2.1.0]:
+  * Fix Persian search in Subscene
+
 [v2.0.0]:
   * Use IMDb as main source for all meta.
   * Retry on 503 (Service Unavailable). OpenSubtitles and Subscene seems to return it occasionally.

diff --git a/packages/addons.xml.crc b/packages/addons.xml.crc
@@ -1 +1 @@
-a720a2682dce0e0aaa430feb0ebfaf1af0bf4d32
+7c5a8672adc3cb80d72461335233f142c762fb24
diff --git a/tests/test_suite.py b/tests/test_suite.py
@@ -98,10 +98,10 @@ def __remove_all_cache(a4ksubtitles_api):
     __remove_tvshow_years_cache(a4ksubtitles_api)
     __remove_last_results(a4ksubtitles_api)
 
-def __search(a4ksubtitles_api, settings={}, video_meta={}):
+def __search(a4ksubtitles_api, settings={}, video_meta={}, languages='English'):
     search = lambda: None
     search.params = {
-        'languages': 'English',
+        'languages': languages,
         'preferredlanguage': '',
     }
 
@@ -130,10 +130,10 @@ def __search_movie(a4ksubtitles_api, settings={}, video_meta={}):
     movie_video_meta.update(video_meta)
     return __search(a4ksubtitles_api, settings, movie_video_meta)
 
-def __search_tvshow(a4ksubtitles_api, settings={}, video_meta={}):
+def __search_tvshow(a4ksubtitles_api, settings={}, video_meta={}, languages='English'):
     tvshow_video_meta = __tvshow_video_meta.copy()
     tvshow_video_meta.update(video_meta)
-    return __search(a4ksubtitles_api, settings, tvshow_video_meta)
+    return __search(a4ksubtitles_api, settings, tvshow_video_meta, languages)
 
 def __search_tvshow_alt_title(a4ksubtitles_api, settings={}, video_meta={}):
     tvshow_video_meta = __tvshow_alt_title_video_meta.copy()
@@ -527,6 +527,36 @@ def test_subscene_tvshow():
 
     assert filepath != ''
 
+def test_subscene_tvshow_persian():
+    a4ksubtitles_api = api.A4kSubtitlesApi({'kodi': True})
+    __remove_all_cache(a4ksubtitles_api)
+
+    # search
+    settings = {
+        'subscene.enabled': 'true',
+    }
+
+    if os.getenv('CI', None) is not None:
+        time.sleep(4)
+
+    search = __search_tvshow(a4ksubtitles_api, settings, {}, 'Persian')
+
+    # download
+    item = search.results[0]
+
+    params = {
+        'action': 'download',
+        'service_name': 'subscene',
+        'action_args': item['action_args']
+    }
+
+    if os.getenv('CI', None) is not None:
+        time.sleep(4)
+
+    filepath = a4ksubtitles_api.download(params, search.settings)
+
+    assert filepath != ''
+
 def test_addic7ed_tvshow():
     a4ksubtitles_api = api.A4kSubtitlesApi({'kodi': True})
     __remove_all_cache(a4ksubtitles_api)
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		a720a2682dce0e0aaa430feb0ebfaf1af0bf4d32
		7c5a8672adc3cb80d72461335233f142c762fb24