0.4.20

pyload · Feb 20, 2020 · 1f29cd1 · 1f29cd1
1 parent b65ab7b
commit 1f29cd1
Show file tree

Hide file tree

Showing 84 changed files with 948 additions and 569 deletions.
diff --git a/docs/conf.py b/docs/conf.py
@@ -66,7 +66,7 @@
 cog.outl("release = '%s'" % ".".join(v))
 ]]]"""
 version = '0.4'
-release = '0.4.9'
+release = '0.4.20'
 # [[[end]]]
 
 

diff --git a/locale/cli.pot b/locale/cli.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pyLoad 0.4.9\n"
-"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
+"Project-Id-Version: pyLoad 0.4.20\n"
+"Report-Msgid-Bugs-To: 'bugs@pyload.net'\n"
 "POT-Creation-Date: 2011-12-07 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

diff --git a/locale/core.pot b/locale/core.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pyLoad 0.4.9\n"
-"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
+"Project-Id-Version: pyLoad 0.4.20\n"
+"Report-Msgid-Bugs-To: 'bugs@pyload.net'\n"
 "POT-Creation-Date: 2011-12-07 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
@@ -484,7 +484,7 @@ msgid "***  New pyLoad Version %s available  ***"
 msgstr ""
 
 #: module/plugins/hooks/UpdateManager.py:94
-msgid "***  Get it here: http://pyload.org/download  ***"
+msgid "***  Get it here: http://pyload.net/download  ***"
 msgstr ""
 
 #: module/plugins/hooks/UpdateManager.py:97

diff --git a/locale/django.pot b/locale/django.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pyLoad 0.4.9\n"
-"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
+"Project-Id-Version: pyLoad 0.4.20\n"
+"Report-Msgid-Bugs-To: 'bugs@pyload.net'\n"
 "POT-Creation-Date: 2011-12-07 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

diff --git a/locale/gui.pot b/locale/gui.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pyLoad 0.4.9\n"
-"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
+"Project-Id-Version: pyLoad 0.4.20\n"
+"Report-Msgid-Bugs-To: 'bugs@pyload.net'\n"
 "POT-Creation-Date: 2011-12-07 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

diff --git a/locale/setup.pot b/locale/setup.pot
@@ -6,8 +6,8 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: pyLoad 0.4.9\n"
-"Report-Msgid-Bugs-To: 'bugs@pyload.org'\n"
+"Project-Id-Version: pyLoad 0.4.20\n"
+"Report-Msgid-Bugs-To: 'bugs@pyload.net'\n"
 "POT-Creation-Date: 2011-12-07 19:21+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"

diff --git a/module/Api.py b/module/Api.py
@@ -321,7 +321,8 @@ def addPackage(self, name, links, dest=Destination.Queue):
         else:
             folder = ""
 
-        folder = folder.replace("http://", "").replace(":", "").replace("/", "_").replace("\\", "_")
+        folder = folder.replace("http://", "").replace("https://", "").rstrip("/") \
+            .replace(":", "").replace("/", "_").replace("\\", "_")
 
         pid = self.core.files.addPackage(name, folder, dest)
 

diff --git a/module/ConfigParser.py b/module/ConfigParser.py
@@ -258,7 +258,7 @@ def cast(self, typ, value):
             return value
         elif typ in ("str", "file", "folder"):
             try:
-                return value.encode("utf8")
+                return value.decode("utf8")
             except:
                 return value
         else:

diff --git a/module/PyFile.py b/module/PyFile.py
@@ -283,3 +283,8 @@ def setProgress(self, value):
         if not value == self.progress:
             self.progress = value
             self.notifyChange()
+
+    def setName(self, value):
+        if not value == self.name:
+            self.name = value
+            self.notifyChange()
diff --git a/module/gui/connector.py b/module/gui/connector.py
@@ -16,7 +16,7 @@
     @author: mkaay
 """
 
-SERVER_VERSION = "0.4.9"
+SERVER_VERSION = "0.4.20"
 
 from time import sleep
 from uuid import uuid4 as uuid

diff --git a/module/network/Browser.py b/module/network/Browser.py
@@ -80,11 +80,12 @@ def abortDownloads(self):
             self.dl.abort = True
 
     def httpDownload(self, url, filename, size=0, get={}, post={}, ref=True, cookies=True, chunks=1, resume=False,
-                     progressNotify=None, disposition=False):
+                     status_notify=None, disposition=False):
         """ this can also download ftp """
         self._size = 0
         self.dl = HTTPDownload(url, filename, size=size, get=get, post=post, referer=self.lastEffectiveURL if ref else None,
-             cj=self.cj if cookies else None, bucket=self.bucket, options=self.options, progressNotify=progressNotify, disposition=disposition)
+                               cj=self.cj if cookies else None, bucket=self.bucket, options=self.options,
+                               status_notify=status_notify, disposition=disposition)
         name = self.dl.download(chunks, resume)
         self._size = self.dl.size