extended cnl

4 files changed, 16 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"