release: v2.5.0

a4k-openproject · Apr 2, 2021 · 5540de1 · 5540de1
1 parent 0340064
commit 5540de1
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+* [v2.5.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-2.5.0):
+  * Add TLS adapter fallback
+
 * [v2.4.0](https://github.com/newt-sc/a4kSubtitles/releases/tag/service.subtitles.a4ksubtitles%2Fservice.subtitles.a4ksubtitles-2.4.0):
   * Fix some ssl issues
 

diff --git a/a4kSubtitles/lib/request.py b/a4kSubtitles/lib/request.py
@@ -55,11 +55,15 @@ def execute(core, request, progress=True):
         response = session.request(**request)
         exc = ''
     except:  # pragma: no cover
-        exc = traceback.format_exc()
-        response = lambda: None
-        response.text = ''
-        response.content = ''
-        response.status_code = 500
+        try:
+            response = requests.request(verify=False, **request)
+            exc = ''
+        except:  # pragma: no cover
+            exc = traceback.format_exc()
+            response = lambda: None
+            response.text = ''
+            response.content = ''
+            response.status_code = 500
     logger.debug('%s $ - %s - %s, %s' % (request['method'], request['url'], response.status_code, exc))
 
     alt_request = validate(response)

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.4.0"
+       version="2.5.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.5.0]:
+  * Add TLS adapter fallback
+
 [v2.4.0]:
   * Fix some ssl issues
 

diff --git a/packages/addons.xml b/packages/addons.xml
@@ -4,7 +4,7 @@
 <addons>
 <addon id="service.subtitles.a4ksubtitles"
        name="a4kSubtitles"
-       version="2.4.0"
+       version="2.5.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.5.0]:
+  * Add TLS adapter fallback
+
 [v2.4.0]:
   * Fix some ssl issues
 

diff --git a/packages/addons.xml.crc b/packages/addons.xml.crc
@@ -1 +1 @@
-c2916b4b36e9d51f074627cb68c2be0e1e8b7949
+ffd194a94b96801a0bf4512fcd5d65ac00836de4