diff options
| author |  RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-03-07 17:24:58 +0100 |
|---|---|---|
| committer | RaNaN <Mast3rRaNaN@hotmail.de>
| 2011-03-07 17:24:58 +0100 |
| commit | 7dff8bc5fbb97bfd10d6568f78cd9354ac0be30b (patch) | |
| tree | e29b68a6b07374e4cd150552790c262d73aaf2d3 | |
| parent | fixed captcha status response (diff) | |
| download | pyload-7dff8bc5fbb97bfd10d6568f78cd9354ac0be30b.tar.xz | |
Youtube fix, thrift java fix
| -rw-r--r-- | module/plugins/hoster/YoutubeCom.py | 4 | ||||
| -rw-r--r-- | module/remote/thriftbackend/Handler.py | 4 | ||||
| -rw-r--r-- | module/remote/thriftbackend/pyload.thrift | 5 |
3 files changed, 8 insertions, 5 deletions
diff --git a/module/plugins/hoster/YoutubeCom.py b/module/plugins/hoster/YoutubeCom.py index 34d757ac0..8f8098efb 100644 --- a/module/plugins/hoster/YoutubeCom.py +++ b/module/plugins/hoster/YoutubeCom.py @@ -17,12 +17,12 @@ class YoutubeCom(Hoster): def process(self, pyfile): html = self.load(pyfile.url) - + if re.search(r"(.*eine fehlerhafte Video-ID\.)", html) is not None: self.offline() videoId = pyfile.url.split("v=")[1].split("&")[0] - videoHash = re.search(r'&t=(.+?)&', html).group(1) + videoHash = re.search(r'&t=(.+?)&', html).group(1) file_name_pattern = '<meta name="title" content="(.+?)">' diff --git a/module/remote/thriftbackend/Handler.py b/module/remote/thriftbackend/Handler.py index bde93b240..265d50fa3 100644 --- a/module/remote/thriftbackend/Handler.py +++ b/module/remote/thriftbackend/Handler.py @@ -264,7 +264,7 @@ class Handler(Iface): pdata.dest = pack["queue"] pdata.order = pack["order"] pdata.priority = pack["priority"] - pdata.links = [self._convertPyFile(x) for x in pack["links"].values()] + pdata.links = [int(x) for x in pack["links"].keys()] ret.append(pdata) return ret @@ -281,7 +281,7 @@ class Handler(Iface): pdata.dest = pack["queue"] pdata.order = pack["order"] pdata.priority = pack["priority"] - pdata.links = [int(x) for x in pack["links"].keys()] + pdata.links = [self._convertPyFile(x) for x in pack["links"].values()] ret.append(pdata) return ret diff --git a/module/remote/thriftbackend/pyload.thrift b/module/remote/thriftbackend/pyload.thrift index 7ea1d5f94..122ab783f 100644 --- a/module/remote/thriftbackend/pyload.thrift +++ b/module/remote/thriftbackend/pyload.thrift @@ -1,3 +1,5 @@ +namespace java org.pyload.thrift + typedef i32 FileID typedef i32 PackageID typedef i32 TaskID @@ -5,6 +7,7 @@ typedef list<string> LinkList typedef byte Progress typedef byte Priority + enum DownloadStatus { Finished Offline, @@ -82,7 +85,7 @@ struct FileData { 6: string format_size, 7: DownloadStatus status, 8: string statusmsg, - 9: PackageID package, + 9: PackageID packageID, 10: string error, 11: i16 order, 12: Progress progress |