diff options
Diffstat (limited to 'module')
-rw-r--r-- | module/plugins/hoster/OronCom.py | 1 | ||||
-rwxr-xr-x | module/remote/thriftbackend/generateThrift.sh | 7 | ||||
-rwxr-xr-x | module/remote/thriftbackend/thriftgen/pyload/Pyload-remote | 5 | ||||
-rw-r--r-- | module/remote/thriftbackend/thriftgen/pyload/Pyload.py | 2 | ||||
-rw-r--r-- | module/remote/thriftbackend/thriftgen/pyload/constants.py | 2 | ||||
-rw-r--r-- | module/remote/thriftbackend/thriftgen/pyload/ttypes.py | 2 | ||||
-rwxr-xr-x | module/web/compile_js.sh | 7 |
7 files changed, 7 insertions, 19 deletions
diff --git a/module/plugins/hoster/OronCom.py b/module/plugins/hoster/OronCom.py index 778453aa2..7f09ea3a3 100644 --- a/module/plugins/hoster/OronCom.py +++ b/module/plugins/hoster/OronCom.py @@ -42,6 +42,7 @@ class OronCom(Hoster): def init(self): self.resumeDownload = self.multiDL = True if self.account else False + self.chunkLimit = 1 self.file_id = re.search(r'http://(?:www.)?oron.com/([a-zA-Z0-9]+)', self.pyfile.url).group(1) self.logDebug("File id is %s" % self.file_id) self.pyfile.url = "http://oron.com/" + self.file_id diff --git a/module/remote/thriftbackend/generateThrift.sh b/module/remote/thriftbackend/generateThrift.sh deleted file mode 100755 index d7e0cb68a..000000000 --- a/module/remote/thriftbackend/generateThrift.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh -rm -rf thriftgen - -# use thrift from trunk or a release with dynamic/slots python code generation - -thrift -v --strict --gen py:slots,dynamic --gen java pyload.thrift -mv gen-py thriftgen diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote b/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote index 8c3390438..e2e56d5ca 100755 --- a/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote +++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload-remote @@ -20,7 +20,7 @@ from ttypes import * if len(sys.argv) <= 1 or sys.argv[1] == '--help': print '' - print 'Usage: ' + sys.argv[0] + ' [-h host:port] [-u url] [-f[ramed]] function [arg1 [arg2...]]' + print 'Usage: ' + sys.argv[0] + ' [-h host[:port]] [-u url] [-f[ramed]] function [arg1 [arg2...]]' print '' print 'Functions:' print ' string getConfigValue(string category, string option, string section)' @@ -107,7 +107,8 @@ argi = 1 if sys.argv[argi] == '-h': parts = sys.argv[argi+1].split(':') host = parts[0] - port = int(parts[1]) + if len(parts) > 1: + port = int(parts[1]) argi += 2 if sys.argv[argi] == '-u': diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py index d54cfaedd..677e4afe2 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py +++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py @@ -6,7 +6,7 @@ # options string: py:slots,dynamic # -from thrift.Thrift import TType, TMessageType +from thrift.Thrift import TType, TMessageType, TException from ttypes import * from thrift.Thrift import TProcessor from thrift.protocol.TBase import TBase, TExceptionBase, TApplicationException diff --git a/module/remote/thriftbackend/thriftgen/pyload/constants.py b/module/remote/thriftbackend/thriftgen/pyload/constants.py index 1ca9842ff..f5ef663f1 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/constants.py +++ b/module/remote/thriftbackend/thriftgen/pyload/constants.py @@ -6,6 +6,6 @@ # options string: py:slots,dynamic # -from thrift.Thrift import TType, TMessageType +from thrift.Thrift import TType, TMessageType, TException from ttypes import * diff --git a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py index 204090577..626bd1c29 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py +++ b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py @@ -6,7 +6,7 @@ # options string: py:slots,dynamic # -from thrift.Thrift import TType, TMessageType +from thrift.Thrift import TType, TMessageType, TException from thrift.protocol.TBase import TBase, TExceptionBase diff --git a/module/web/compile_js.sh b/module/web/compile_js.sh deleted file mode 100755 index 79adb1bed..000000000 --- a/module/web/compile_js.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -for file in media/js/*.coffee -do - echo "Compiling ${file}" - cat ${file} | coffee -cbs | yuicompressor --type js > ${file/.coffee/.js} -done |