diff options
| -rw-r--r-- | module/gui/Collector.py | 5 | ||||
| -rw-r--r-- | module/plugins/hoster/ZippyshareCom.py | 2 | ||||
| -rw-r--r-- | module/web/cnl/urls.py | 1 | ||||
| -rw-r--r-- | module/web/cnl/views.py | 10 | ||||
| -rwxr-xr-x | pyLoadCore.py | 4 |
5 files changed, 20 insertions, 2 deletions
diff --git a/module/gui/Collector.py b/module/gui/Collector.py index 08d82daf8..5fc041a8e 100644 --- a/module/gui/Collector.py +++ b/module/gui/Collector.py @@ -194,7 +194,10 @@ class CollectorModel(QAbstractItemModel): pointer = self._data[row] index = self.createIndex(row, column, pointer) elif parent.isValid(): - pointer = parent.internalPointer().children[row] + try: + pointer = parent.internalPointer().children[row] + except: + return QModelIndex() index = self.createIndex(row, column, pointer) else: index = QModelIndex() diff --git a/module/plugins/hoster/ZippyshareCom.py b/module/plugins/hoster/ZippyshareCom.py index d42ce3578..f0605d63b 100644 --- a/module/plugins/hoster/ZippyshareCom.py +++ b/module/plugins/hoster/ZippyshareCom.py @@ -17,7 +17,7 @@ class ZippyshareCom(Hoster): def setup(self): self.html = None self.wantReconnect = False - self.multiDL = False + self.multiDL = True def process(self, pyfile): self.pyfile = pyfile diff --git a/module/web/cnl/urls.py b/module/web/cnl/urls.py index 7887953b7..635e751ca 100644 --- a/module/web/cnl/urls.py +++ b/module/web/cnl/urls.py @@ -16,5 +16,6 @@ urlpatterns = patterns('cnl', (r'^addcrypted2$', 'views.addcrypted2'), (r'^crossdomain\.xml', 'views.crossdomain'), (r'^jdcheck\.js', 'views.jdcheck'), + (r'^checkSupportForUrl', 'views.checksupport'), (r'', 'views.flash') ) diff --git a/module/web/cnl/views.py b/module/web/cnl/views.py index 46db5e76e..c2e95151c 100644 --- a/module/web/cnl/views.py +++ b/module/web/cnl/views.py @@ -160,6 +160,16 @@ def crossdomain(request): return HttpResponse(rep) @local_check +def checksupport(request): + supported = False + + url = request.GET.get("url") + res = settings.PYLOAD.checkURLs([url]) + supported = (not res[0][1] is None) + + return JsonResponse(str(supported).lower(), request) + +@local_check def jdcheck(request): rep = "jdownloader=true;\n" rep += "var version='10629';\n" diff --git a/pyLoadCore.py b/pyLoadCore.py index 2f9f7783b..5c977e8a8 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -782,6 +782,10 @@ class ServerMethods(): p.sync() self.core.files.save() + + def checkURLs(self, urls): + support = self.core.pluginManager.parseUrls(urls) + return [(u, p) if not p == "BasePlugin" else (u, None) for u, p in support] def is_time_download(self): start = self.core.config['downloadTime']['start'].split(":") |