v0.4.10:

- fix error when getting proxies from 'freshproxies.net'
fayer3 · Aug 7, 2020 · 88bfeba · 88bfeba
1 parent 274458e
commit 88bfeba
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 4 deletions.
diff --git a/addon.xml b/addon.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<addon id="plugin.video.joyn_app" name="Joyn" version="0.4.9" provider-name="fayer3">
+<addon id="plugin.video.joyn_app" name="Joyn" version="0.4.10" provider-name="fayer3">
     <requires>
         <import addon="xbmc.python" version="2.25.0"/>
         <import addon="script.module.routing" version="0.2.0"/>
@@ -65,6 +65,8 @@
   - Fehler behoben, welcher nicht funktionierende Proxies als gut eingestuft hat
   - es wird nun ein Dialog angezeigt, welcher Proxy gerade überprüft wird
   - zwei weiter webseiten zum Proxy abrufen hinzugefügt
+0.4.10:
+- fehler mit Proxy abrufen von 'freshproxies.net' behoben
         </news>
         <assets>
             <icon>resources/icon.png</icon>

diff --git a/changelog.txt b/changelog.txt
@@ -69,4 +69,6 @@ v0.4.9:
   - fixed bug, which skipped proxies
   - fixed bug, which marked bad proxies as good
   - a dialog is now shown while checking proxies
-  - added two additional proxy sites
+  - added two additional proxy sites
+v0.4.10:
+- fix error when getting proxies from 'freshproxies.net'
diff --git a/resources/lib/plugin.py b/resources/lib/plugin.py
@@ -1531,14 +1531,18 @@ def get_new_proxy():
             data = get_url(site, key=False, critical=False)
             if data != '':
                 newproxy = json.loads(data)
+                log('original proxies: {0}'.format(json.dumps(newproxy)))
                 if not 'data' in newproxy:
-                    newproxy = {'data': [newproxy]}
+                    if 'proxies' in newproxy:
+                        newproxy = {'data': newproxy['proxies']}
+                    else:
+                        newproxy = {'data': [newproxy]}
                 i = 0
                 for proxy in newproxy['data']:
                     i += 1
                     if (progress.iscanceled()):
                         return found_new
-                    if not 'error' in proxy:
+                    if not 'error' in proxy and 'ip' in proxy and 'port' in proxy:
                         progress.update(i*100/len(newproxy['data']), line1=kodiutils.get_string(32046).format(sitetext, '{0}://{1}:{2}'.format(proxy.get('type', proxy.get('protocol', proxy.get('proxyType'))), proxy['ip'], proxy['port']), i, len(newproxy['data'])))
                         if (proxy['ip'] != ip or proxy['port'] != port) and proxy['ip'] != '0.0.0.0':
                             if test_proxy('{0}://{1}:{2}'.format(proxy.get('type', proxy.get('protocol', proxy.get('proxyType'))), proxy['ip'], proxy['port'])):