diff options
77 files changed, 53 insertions, 78 deletions
diff --git a/.gitattributes b/.gitattributes index e34533a0d..0a6781fd8 100644 --- a/.gitattributes +++ b/.gitattributes @@ -18,4 +18,4 @@ # Denote all files that are truly binary and should not be modified. *.png binary *.jpg binary -*.mo binary
\ No newline at end of file +*.mo binary diff --git a/docs/access_api.rst b/docs/access_api.rst index df69da8b2..ce78364b9 100644 --- a/docs/access_api.rst +++ b/docs/access_api.rst @@ -118,4 +118,4 @@ Strings are wrapped in double qoutes, because `"username"` represents a string i every container type like lists and dicts are possible. You usually don't have to convert them. just use a json encoder before using them in the HTTP request. -Please note that the data have to be urlencoded at last. (Most libaries will do that automatically)
\ No newline at end of file +Please note that the data have to be urlencoded at last. (Most libaries will do that automatically) diff --git a/docs/extend_pyload.rst b/docs/extend_pyload.rst index 337cb6854..e8b60b63c 100755 --- a/docs/extend_pyload.rst +++ b/docs/extend_pyload.rst @@ -10,4 +10,4 @@ every detail of the pyLoad core. However you should have some basic knowledge of .. toctree:: write_hooks.rst - write_plugins.rst
\ No newline at end of file + write_plugins.rst diff --git a/docs/write_plugins.rst b/docs/write_plugins.rst index 23fda28b6..ff3be66d0 100644 --- a/docs/write_plugins.rst +++ b/docs/write_plugins.rst @@ -100,4 +100,4 @@ where urls is the list of urls contained in the packages. Thats all of your work Examples -------- -Best examples are already existing plugins in :file:`module/plugins/`.
\ No newline at end of file +Best examples are already existing plugins in :file:`module/plugins/`. diff --git a/module/Api.py b/module/Api.py index 8c11d9181..c76d93438 100644 --- a/module/Api.py +++ b/module/Api.py @@ -1030,4 +1030,4 @@ class Api(Iface): def setUserPermission(self, user, permission, role): self.core.db.setPermission(user, permission) - self.core.db.setRole(user, role)
\ No newline at end of file + self.core.db.setRole(user, role) diff --git a/module/HookManager.py b/module/HookManager.py index 7b8e9b555..9f173a79e 100644 --- a/module/HookManager.py +++ b/module/HookManager.py @@ -312,4 +312,3 @@ class HookManager: % (event, f, args, str(e))) if self.core.debug: traceback.print_exc() - diff --git a/module/Scheduler.py b/module/Scheduler.py index 568bc608e..cdc4c8360 100644 --- a/module/Scheduler.py +++ b/module/Scheduler.py @@ -138,4 +138,4 @@ class PriorityQueue(): except IndexError: return None, None finally: - self.lock.release()
\ No newline at end of file + self.lock.release() diff --git a/module/cli/AddPackage.py b/module/cli/AddPackage.py index a73401586..2c0c6f170 100644 --- a/module/cli/AddPackage.py +++ b/module/cli/AddPackage.py @@ -63,4 +63,4 @@ class AddPackage(Handler): println(line, "") println(line + 1, mag("0.") + _(" back to main menu")) - return line + 2
\ No newline at end of file + return line + 2 diff --git a/module/cli/Handler.py b/module/cli/Handler.py index 476d09386..13568d570 100644 --- a/module/cli/Handler.py +++ b/module/cli/Handler.py @@ -45,4 +45,4 @@ class Handler: def renderBody(self, line): """ gets the line where to render output and should return the line number below its content """ - return line + 1
\ No newline at end of file + return line + 1 diff --git a/module/cli/__init__.py b/module/cli/__init__.py index fa8a09291..f8db0ae7e 100644 --- a/module/cli/__init__.py +++ b/module/cli/__init__.py @@ -1,2 +1,2 @@ from AddPackage import AddPackage -from ManageFiles import ManageFiles
\ No newline at end of file +from ManageFiles import ManageFiles diff --git a/module/cli/printer.py b/module/cli/printer.py index c62c1800e..5ded53140 100644 --- a/module/cli/printer.py +++ b/module/cli/printer.py @@ -23,4 +23,4 @@ def white(string): return "\033[1;37m" + unicode(string) + "\033[0m" def println(line, content): - print "\033[" + str(line) + ";0H\033[2K" + content
\ No newline at end of file + print "\033[" + str(line) + ";0H\033[2K" + content diff --git a/module/common/APIExerciser.py b/module/common/APIExerciser.py index 96f5ce9cf..9fec308af 100644 --- a/module/common/APIExerciser.py +++ b/module/common/APIExerciser.py @@ -154,4 +154,4 @@ class APIExerciser(Thread): self.api.getAccounts(False) def getCaptchaTask(self): - self.api.getCaptchaTask(False)
\ No newline at end of file + self.api.getCaptchaTask(False) diff --git a/module/common/ImportDebugger.py b/module/common/ImportDebugger.py index a997f7b0c..ae3aef629 100644 --- a/module/common/ImportDebugger.py +++ b/module/common/ImportDebugger.py @@ -16,4 +16,4 @@ class ImportDebugger(object): print name, path -sys.meta_path.append(ImportDebugger())
\ No newline at end of file +sys.meta_path.append(ImportDebugger()) diff --git a/module/common/JsEngine.py b/module/common/JsEngine.py index 576be2a1b..fc641f48e 100644 --- a/module/common/JsEngine.py +++ b/module/common/JsEngine.py @@ -159,4 +159,4 @@ if __name__ == "__main__": js = JsEngine() test = u'"ü"+"ä"' - js.eval(test)
\ No newline at end of file + js.eval(test) diff --git a/module/database/DatabaseBackend.py b/module/database/DatabaseBackend.py index 642289647..0ef655450 100644 --- a/module/database/DatabaseBackend.py +++ b/module/database/DatabaseBackend.py @@ -349,4 +349,3 @@ if __name__ == "__main__": print end-start db.error() - diff --git a/module/database/__init__.py b/module/database/__init__.py index 545789c0c..10c5b35aa 100644 --- a/module/database/__init__.py +++ b/module/database/__init__.py @@ -3,4 +3,4 @@ from DatabaseBackend import style from FileDatabase import FileHandler from UserDatabase import UserMethods -from StorageDatabase import StorageMethods
\ No newline at end of file +from StorageDatabase import StorageMethods diff --git a/module/debug.py b/module/debug.py index 8d1ddd3d0..aa1c9cdaf 100644 --- a/module/debug.py +++ b/module/debug.py @@ -92,4 +92,4 @@ def initReport(): return frame, plugin, pyfile if __name__=='__main__': - print "No main method, use this module with your python shell"
\ No newline at end of file + print "No main method, use this module with your python shell" diff --git a/module/gui/Accounts.py b/module/gui/Accounts.py index d6bd442f1..4abd8752c 100644 --- a/module/gui/Accounts.py +++ b/module/gui/Accounts.py @@ -210,4 +210,3 @@ class AccountDelegate(QItemDelegate): QApplication.style().drawControl(QStyle.CE_ProgressBar, opts, painter) return QItemDelegate.paint(self, painter, option, index) - diff --git a/module/gui/CaptchaDock.py b/module/gui/CaptchaDock.py index 04e4ac6ad..8d924537f 100644 --- a/module/gui/CaptchaDock.py +++ b/module/gui/CaptchaDock.py @@ -91,4 +91,3 @@ class CaptchaDockWidget(QWidget): self.dock.emit(SIGNAL("done"), tid, str(text)) self.dock.hide() self.dock.processing = False - diff --git a/module/gui/Collector.py b/module/gui/Collector.py index d4cc0832f..50d45cf28 100644 --- a/module/gui/Collector.py +++ b/module/gui/Collector.py @@ -404,4 +404,3 @@ class CollectorView(QTreeView): self.setColumnWidth(3, 100) self.setEditTriggers(QAbstractItemView.DoubleClicked | QAbstractItemView.EditKeyPressed) - diff --git a/module/gui/ConnectionManager.py b/module/gui/ConnectionManager.py index 41b50df6f..8dfdf7dd2 100644 --- a/module/gui/ConnectionManager.py +++ b/module/gui/ConnectionManager.py @@ -299,4 +299,3 @@ class ConnectionManager(QWidget): data = self.getData() self.hide() self.emit(SIGNAL("save"), data) - diff --git a/module/gui/PackageDock.py b/module/gui/PackageDock.py index f38ffcbfc..a4bc02f93 100644 --- a/module/gui/PackageDock.py +++ b/module/gui/PackageDock.py @@ -87,4 +87,4 @@ class NewPackageWindow(QWidget): layout.addWidget(save, 5, 0, 1, 2) self.connect(save, SIGNAL("clicked()"), self.dock.slotDone) - self.connect(parseUri, SIGNAL("clicked()"), self.dock.parseUri)
\ No newline at end of file + self.connect(parseUri, SIGNAL("clicked()"), self.dock.parseUri) diff --git a/module/gui/Queue.py b/module/gui/Queue.py index f3df023a0..afbcc00f8 100644 --- a/module/gui/Queue.py +++ b/module/gui/Queue.py @@ -387,4 +387,3 @@ class QueueProgressBarDelegate(QItemDelegate): QApplication.style().drawControl(QStyle.CE_ProgressBar, opts, painter) return QItemDelegate.paint(self, painter, option, index) - diff --git a/module/gui/__init__.py b/module/gui/__init__.py index 8d1c8b69c..8b1378917 100644 --- a/module/gui/__init__.py +++ b/module/gui/__init__.py @@ -1 +1 @@ - + diff --git a/module/lib/Getch.py b/module/lib/Getch.py index 22b7ea7f8..c88e65089 100644 --- a/module/lib/Getch.py +++ b/module/lib/Getch.py @@ -73,4 +73,4 @@ class _GetchMacCarbon: # returned # (what, msg, when, where, mod) = Carbon.Evt.GetNextEvent(0x0008)[1] - return chr(msg)
\ No newline at end of file + return chr(msg) diff --git a/module/lib/thrift/TSerialization.py b/module/lib/thrift/TSerialization.py index b19f98aa8..05f88f838 100644 --- a/module/lib/thrift/TSerialization.py +++ b/module/lib/thrift/TSerialization.py @@ -31,4 +31,3 @@ def deserialize(base, buf, protocol_factory = TBinaryProtocol.TBinaryProtocolFac protocol = protocol_factory.getProtocol(transport) base.read(protocol) return base - diff --git a/module/lib/thrift/protocol/TBase.py b/module/lib/thrift/protocol/TBase.py index 514ba44e7..08e154026 100644 --- a/module/lib/thrift/protocol/TBase.py +++ b/module/lib/thrift/protocol/TBase.py @@ -69,4 +69,3 @@ class TExceptionBase(Exception): __ne__ = TBase.__ne__.im_func read = TBase.read.im_func write = TBase.write.im_func - diff --git a/module/lib/thrift/protocol/TProtocol.py b/module/lib/thrift/protocol/TProtocol.py index f987026d9..e23774784 100644 --- a/module/lib/thrift/protocol/TProtocol.py +++ b/module/lib/thrift/protocol/TProtocol.py @@ -401,4 +401,3 @@ class TProtocolBase: class TProtocolFactory: def getProtocol(self, trans): pass - diff --git a/module/lib/thrift/server/TProcessPoolServer.py b/module/lib/thrift/server/TProcessPoolServer.py index 7ed814a88..254f25340 100644 --- a/module/lib/thrift/server/TProcessPoolServer.py +++ b/module/lib/thrift/server/TProcessPoolServer.py @@ -122,4 +122,3 @@ class TProcessPoolServer(TServer): self.stopCondition.acquire() self.stopCondition.notify() self.stopCondition.release() - diff --git a/module/lib/thrift/server/TServer.py b/module/lib/thrift/server/TServer.py index 8456e2d40..5b5fd6813 100644 --- a/module/lib/thrift/server/TServer.py +++ b/module/lib/thrift/server/TServer.py @@ -270,5 +270,3 @@ class TForkingServer(TServer): self.children.remove(pid) else: break - - diff --git a/module/lib/wsgiserver/__init__.py b/module/lib/wsgiserver/__init__.py index f2c2e866a..2754c1144 100644 --- a/module/lib/wsgiserver/__init__.py +++ b/module/lib/wsgiserver/__init__.py @@ -1790,4 +1790,3 @@ class CherryPyWSGIServer(object): ssl_environ[wsgikey] = value self.environ.update(ssl_environ) - diff --git a/module/network/Browser.py b/module/network/Browser.py index d68a23687..8c9dfa737 100644 --- a/module/network/Browser.py +++ b/module/network/Browser.py @@ -143,4 +143,3 @@ if __name__ == "__main__": #browser.getPage("http://google.com/search?q=bar") browser.httpDownload("http://speedtest.netcologne.de/test_10mb.bin", "test_10mb.bin") - diff --git a/module/network/Bucket.py b/module/network/Bucket.py index add3861d6..727d28eb9 100644 --- a/module/network/Bucket.py +++ b/module/network/Bucket.py @@ -58,4 +58,3 @@ class Bucket: delta = self.rate * (now - self.timestamp) self.tokens = min(self.rate, self.tokens + delta) self.timestamp = now - diff --git a/module/network/HTTPChunk.py b/module/network/HTTPChunk.py index 91a1b06e8..14c24be15 100644 --- a/module/network/HTTPChunk.py +++ b/module/network/HTTPChunk.py @@ -290,4 +290,4 @@ class HTTPChunk(HTTPRequest): """ closes everything, unusable after this """ if self.fp: self.fp.close() self.c.close() - if hasattr(self, "p"): del self.p
\ No newline at end of file + if hasattr(self, "p"): del self.p diff --git a/module/network/HTTPRequest.py b/module/network/HTTPRequest.py index 6b4df665d..302ed75df 100644 --- a/module/network/HTTPRequest.py +++ b/module/network/HTTPRequest.py @@ -303,4 +303,3 @@ if __name__ == "__main__": url = "http://pyload.org" c = HTTPRequest() print c.load(url) - diff --git a/module/remote/socketbackend/create_ttypes.py b/module/remote/socketbackend/create_ttypes.py index 05662cb50..61dae99ac 100644 --- a/module/remote/socketbackend/create_ttypes.py +++ b/module/remote/socketbackend/create_ttypes.py @@ -88,4 +88,4 @@ class BaseObject(object): f.close() if __name__ == "__main__": - main()
\ No newline at end of file + main() diff --git a/module/remote/socketbackend/ttypes.py b/module/remote/socketbackend/ttypes.py index f8ea121fa..8140821c3 100644 --- a/module/remote/socketbackend/ttypes.py +++ b/module/remote/socketbackend/ttypes.py @@ -380,4 +380,3 @@ class Iface: pass def uploadContainer(self, filename, data): pass - diff --git a/module/remote/thriftbackend/Protocol.py b/module/remote/thriftbackend/Protocol.py index c42d01459..a5822df18 100644 --- a/module/remote/thriftbackend/Protocol.py +++ b/module/remote/thriftbackend/Protocol.py @@ -27,4 +27,4 @@ class ProtocolFactory(TBinaryProtocol.TBinaryProtocolFactory): def getProtocol(self, trans): prot = Protocol(trans, self.strictRead, self.strictWrite) - return prot
\ No newline at end of file + return prot diff --git a/module/remote/thriftbackend/ThriftClient.py b/module/remote/thriftbackend/ThriftClient.py index 74363cf62..4e11fdc0d 100644 --- a/module/remote/thriftbackend/ThriftClient.py +++ b/module/remote/thriftbackend/ThriftClient.py @@ -106,4 +106,4 @@ if __name__ == "__main__": print client.getConfigValue("download", "limit_speed", "core") - client.close()
\ No newline at end of file + client.close() diff --git a/module/remote/thriftbackend/Transport.py b/module/remote/thriftbackend/Transport.py index 5772c5a9e..b5b6c8104 100644 --- a/module/remote/thriftbackend/Transport.py +++ b/module/remote/thriftbackend/Transport.py @@ -34,4 +34,4 @@ class TransportFactoryCompressed: ztrans = TransportCompressed(Transport(trans), compresslevel) self._last_trans = trans self._last_z = ztrans - return ztrans
\ No newline at end of file + return ztrans diff --git a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py index 78a42f16a..a61ecf8fe 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/Pyload.py +++ b/module/remote/thriftbackend/thriftgen/pyload/Pyload.py @@ -5531,4 +5531,3 @@ class setCaptchaResult_result(TBase): thrift_spec = ( ) - diff --git a/module/remote/thriftbackend/thriftgen/pyload/constants.py b/module/remote/thriftbackend/thriftgen/pyload/constants.py index f8960dc63..d1f015464 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/constants.py +++ b/module/remote/thriftbackend/thriftgen/pyload/constants.py @@ -8,4 +8,3 @@ 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 1299b515d..58fff20ad 100644 --- a/module/remote/thriftbackend/thriftgen/pyload/ttypes.py +++ b/module/remote/thriftbackend/thriftgen/pyload/ttypes.py @@ -832,4 +832,3 @@ class ServiceException(TExceptionBase): def __str__(self): return repr(self) - diff --git a/module/unescape.py b/module/unescape.py index d8999e077..74e7b5c67 100644 --- a/module/unescape.py +++ b/module/unescape.py @@ -1,3 +1,3 @@ from module.utils import html_unescape #deprecated -unescape = html_unescape
\ No newline at end of file +unescape = html_unescape diff --git a/module/web/filters.py b/module/web/filters.py index 13b8345fc..bc253d170 100644 --- a/module/web/filters.py +++ b/module/web/filters.py @@ -59,4 +59,4 @@ def truncate(value, n): return value def date(date, format): - return date
\ No newline at end of file + return date diff --git a/module/web/media/default/css/MooDialog.css b/module/web/media/default/css/MooDialog.css index 48c9166ad..c313a5292 100644 --- a/module/web/media/default/css/MooDialog.css +++ b/module/web/media/default/css/MooDialog.css @@ -89,4 +89,3 @@ .MooDialog .MooDialogError { background: url(/media/img/dialog-error.png) no-repeat; } - diff --git a/module/web/media/default/css/default.css b/module/web/media/default/css/default.css index 116f9725a..aa050fef3 100644 --- a/module/web/media/default/css/default.css +++ b/module/web/media/default/css/default.css @@ -905,4 +905,4 @@ table.system td { table.system tr > td:first-child { font-weight: bold; padding-right: 10px; -}
\ No newline at end of file +} diff --git a/module/web/media/default/css/log.css b/module/web/media/default/css/log.css index 27ed7a8ad..26449b244 100644 --- a/module/web/media/default/css/log.css +++ b/module/web/media/default/css/log.css @@ -68,4 +68,4 @@ td.loglevel { text-align: center; color: red; -}
\ No newline at end of file +} diff --git a/module/web/media/js/admin.coffee b/module/web/media/js/admin.coffee index 82b0dd3ec..c4ab86911 100644 --- a/module/web/media/js/admin.coffee +++ b/module/web/media/js/admin.coffee @@ -55,4 +55,4 @@ window.addEvent "domready", -> onSuccess: (data) -> alert "{{_('pyLoad restarted')}}" }).send() , -> - e.stop()
\ No newline at end of file + e.stop() diff --git a/module/web/media/js/admin.js b/module/web/media/js/admin.js index d34d310a0..94a5e494d 100644 --- a/module/web/media/js/admin.js +++ b/module/web/media/js/admin.js @@ -1,3 +1,3 @@ {% autoescape true %} var root;root=this;window.addEvent("domready",function(){var f,c,b,e,a,d;root.passwordDialog=new MooDialog({destroyOnHide:false});root.passwordDialog.setContent($("password_box"));$("login_password_reset").addEvent("click",function(g){return root.passwordDialog.close()});$("login_password_button").addEvent("click",function(j){var h,i,g;i=$("login_new_password").get("value");g=$("login_new_password2").get("value");if(i===g){h=$("password_form");h.set("send",{onSuccess:function(k){return root.notify.alert("Success",{className:"success"})},onFailure:function(k){return root.notify.alert("Error",{className:"error"})}});h.send();root.passwordDialog.close()}else{alert('{{_("Passwords did not match.")}}')}return j.stop()});d=$$(".change_password");for(e=0,a=d.length;e<a;e++){c=d[e];f=c.get("id");b=f.split("|")[1];$("user_login").set("value",b);c.addEvent("click",function(g){return root.passwordDialog.open()})}$("quit-pyload").addEvent("click",function(g){new MooDialog.Confirm("{{_('You are really sure you want to quit pyLoad?')}}",function(){return new Request.JSON({url:"/api/kill",method:"get"}).send()},function(){});return g.stop()});return $("restart-pyload").addEvent("click",function(g){new MooDialog.Confirm("{{_('Are you sure you want to restart pyLoad?')}}",function(){return new Request.JSON({url:"/api/restart",method:"get",onSuccess:function(h){return alert("{{_('pyLoad restarted')}}")}}).send()},function(){});return g.stop()})}); -{% endautoescape %}
\ No newline at end of file +{% endautoescape %} diff --git a/module/web/media/js/base.coffee b/module/web/media/js/base.coffee index 3b5d33e82..55151acc9 100644 --- a/module/web/media/js/base.coffee +++ b/module/web/media/js/base.coffee @@ -170,4 +170,4 @@ on_captcha_click = (e) -> x = e.page.x - position.x y = e.page.y - position.y $('cap_result').value = x + "," + y - submit_captcha()
\ No newline at end of file + submit_captcha() diff --git a/module/web/media/js/base.js b/module/web/media/js/base.js index c68b1047a..1ba1d73f9 100644 --- a/module/web/media/js/base.js +++ b/module/web/media/js/base.js @@ -1,3 +1,3 @@ {% autoescape true %} var LoadJsonToContent,clear_captcha,humanFileSize,load_captcha,on_captcha_click,parseUri,root,set_captcha,submit_captcha;root=this;humanFileSize=function(f){var c,d,e,b;d=new Array("B","KiB","MiB","GiB","TiB","PiB");b=Math.log(f)/Math.log(1024);e=Math.floor(b);c=Math.pow(1024,e);if(f===0){return"0 B"}else{return Math.round(f*100/c)/100+" "+d[e]}};parseUri=function(){var b,c,g,e,d,f,a;b=$("add_links").value;g=new RegExp("(ht|f)tp(s?)://[a-zA-Z0-9-./?=_&%#]+[<| |\"|'|\r|\n|\t]{1}","g");d=b.match(g);if(d===null){return}e="";for(f=0,a=d.length;f<a;f++){c=d[f];if(c.indexOf(" ")!==-1){e=e+c.replace(" "," \n")}else{if(c.indexOf("\t")!==-1){e=e+c.replace("\t"," \n")}else{if(c.indexOf("\r")!==-1){e=e+c.replace("\r"," \n")}else{if(c.indexOf('"')!==-1){e=e+c.replace('"'," \n")}else{if(c.indexOf("<")!==-1){e=e+c.replace("<"," \n")}else{if(c.indexOf("'")!==-1){e=e+c.replace("'"," \n")}else{e=e+c.replace("\n"," \n")}}}}}}}return $("add_links").value=e};Array.prototype.remove=function(d,c){var a,b;a=this.slice((c||d)+1||this.length);this.length=(b=d<0)!=null?b:this.length+{from:d};if(this.length===0){return[]}return this.push.apply(this,a)};document.addEvent("domready",function(){root.notify=new Purr({mode:"top",position:"center"});root.captchaBox=new MooDialog({destroyOnHide:false});root.captchaBox.setContent($("cap_box"));root.addBox=new MooDialog({destroyOnHide:false});root.addBox.setContent($("add_box"));$("add_form").onsubmit=function(){$("add_form").target="upload_target";if($("add_name").value===""&&$("add_file").value===""){alert('{{_("Please Enter a packagename.")}}');return false}else{root.addBox.close();return true}};$("add_reset").addEvent("click",function(){return root.addBox.close()});$("action_add").addEvent("click",function(){$("add_form").reset();return root.addBox.open()});$("action_play").addEvent("click",function(){return new Request({method:"get",url:"/api/unpauseServer"}).send()});$("action_cancel").addEvent("click",function(){return new Request({method:"get",url:"/api/stopAllDownloads"}).send()});$("action_stop").addEvent("click",function(){return new Request({method:"get",url:"/api/pauseServer"}).send()});$("cap_info").addEvent("click",function(){load_captcha("get","");return root.captchaBox.open()});$("cap_reset").addEvent("click",function(){return root.captchaBox.close()});$("cap_form").addEvent("submit",function(a){submit_captcha();return a.stop()});$("cap_positional").addEvent("click",on_captcha_click);return new Request.JSON({url:"/json/status",onSuccess:LoadJsonToContent,secure:false,async:true,initialDelay:0,delay:4000,limit:3000}).startTimer()});LoadJsonToContent=function(a){$("speed").set("text",humanFileSize(a.speed)+"/s");$("aktiv").set("text",a.active);$("aktiv_from").set("text",a.queue);$("aktiv_total").set("text",a.total);if(a.captcha){if($("cap_info").getStyle("display")!=="inline"){$("cap_info").setStyle("display","inline");root.notify.alert('{{_("New Captcha Request")}}',{className:"notify"})}}else{$("cap_info").setStyle("display","none")}if(a.download){$("time").set("text",' {{_("on")}}');$("time").setStyle("background-color","#8ffc25")}else{$("time").set("text",' {{_("off")}}');$("time").setStyle("background-color","#fc6e26")}if(a.reconnect){$("reconnect").set("text",' {{_("on")}}');$("reconnect").setStyle("background-color","#8ffc25")}else{$("reconnect").set("text",' {{_("off")}}');$("reconnect").setStyle("background-color","#fc6e26")}return null};set_captcha=function(a){$("cap_id").set("value",a.id);if(a.result_type==="textual"){$("cap_textual_img").set("src",a.src);$("cap_title").set("text",'{{_("Please read the text on the captcha.")}}');$("cap_submit").setStyle("display","inline");$("cap_textual").setStyle("display","block");return $("cap_positional").setStyle("display","none")}else{if(a.result_type==="positional"){$("cap_positional_img").set("src",a.src);$("cap_title").set("text",'{{_("Please click on the right captcha position.")}}');$("cap_submit").setStyle("display","none");return $("cap_textual").setStyle("display","none")}}};load_captcha=function(b,a){return new Request.JSON({url:"/json/set_captcha",onSuccess:function(c){return set_captcha(c)(c.captcha?void 0:clear_captcha())},secure:false,async:true,method:b}).send(a)};clear_captcha=function(){$("cap_textual").setStyle("display","none");$("cap_textual_img").set("src","");$("cap_positional").setStyle("display","none");$("cap_positional_img").set("src","");return $("cap_title").set("text",'{{_("No Captchas to read.")}}')};submit_captcha=function(){load_captcha("post","cap_id="+$("cap_id").get("value")+"&cap_result="+$("cap_result").get("value"));$("cap_result").set("value","");return false};on_captcha_click=function(c){var b,a,d;b=c.target.getPosition();a=c.page.x-b.x;d=c.page.y-b.y;$("cap_result").value=a+","+d;return submit_captcha()}; -{% endautoescape %}
\ No newline at end of file +{% endautoescape %} diff --git a/module/web/media/js/mootools-core-1.4.1.js b/module/web/media/js/mootools-core-1.4.1.js index 835b4bbe2..828a7200e 100644 --- a/module/web/media/js/mootools-core-1.4.1.js +++ b/module/web/media/js/mootools-core-1.4.1.js @@ -473,4 +473,4 @@ params.movie=path;}else{properties.type="application/x-shockwave-flash";}propert }build+=">";for(var param in params){if(params[param]){build+='<param name="'+param+'" value="'+params[param]+'" />';}}build+="</object>";this.object=((container)?container.empty():new Element("div")).set("html",build).firstChild; },replaces:function(element){element=document.id(element,true);element.parentNode.replaceChild(this.toElement(),element);return this;},inject:function(element){document.id(element,true).appendChild(this.toElement()); return this;},remote:function(){return Swiff.remote.apply(Swiff,[this.toElement()].append(arguments));}});Swiff.CallBacks={};Swiff.remote=function(obj,fn){var rs=obj.CallFunction('<invoke name="'+fn+'" returntype="javascript">'+__flash__argumentsToXML(arguments,2)+"</invoke>"); -return eval(rs);};})();
\ No newline at end of file +return eval(rs);};})(); diff --git a/module/web/media/js/mootools-more-1.4.0.1.js b/module/web/media/js/mootools-more-1.4.0.1.js index f3f8e4ee1..cf1f041be 100644 --- a/module/web/media/js/mootools-more-1.4.0.1.js +++ b/module/web/media/js/mootools-more-1.4.0.1.js @@ -213,4 +213,4 @@ if(g!=0){var e=(j-c)/l;var b=(j-d)/l;var m=(j-k)/l;if(c==j){h=m-b;}else{if(d==j) },hsbToRgb:function(){var d=Math.round(this[2]/100*255);if(this[1]==0){return[d,d,d];}else{var b=this[0]%360;var g=b%60;var h=Math.round((this[2]*(100-this[1]))/10000*255); var e=Math.round((this[2]*(6000-this[1]*g))/600000*255);var c=Math.round((this[2]*(6000-this[1]*(60-g)))/600000*255);switch(Math.floor(b/60)){case 0:return[d,c,h]; case 1:return[e,d,h];case 2:return[h,d,c];case 3:return[h,e,d];case 4:return[c,h,d];case 5:return[d,h,e];}}return false;}});String.implement({rgbToHsb:function(){var b=this.match(/\d{1,3}/g); -return(b)?b.rgbToHsb():null;},hsbToRgb:function(){var b=this.match(/\d{1,3}/g);return(b)?b.hsbToRgb():null;}});})();
\ No newline at end of file +return(b)?b.rgbToHsb():null;},hsbToRgb:function(){var b=this.match(/\d{1,3}/g);return(b)?b.hsbToRgb():null;}});})(); diff --git a/module/web/media/js/package_ui.js b/module/web/media/js/package_ui.js index 3ea965649..8b4df7927 100644 --- a/module/web/media/js/package_ui.js +++ b/module/web/media/js/package_ui.js @@ -374,4 +374,3 @@ var Package = new Class({ } }); - diff --git a/module/web/media/js/purr_static.js b/module/web/media/js/purr_static.js index 7e0aee949..504fac038 100644 --- a/module/web/media/js/purr_static.js +++ b/module/web/media/js/purr_static.js @@ -305,4 +305,4 @@ Element.implement({ } -});
\ No newline at end of file +}); diff --git a/module/web/media/js/settings.coffee b/module/web/media/js/settings.coffee index 0fc908d46..68ca6c6a0 100644 --- a/module/web/media/js/settings.coffee +++ b/module/web/media/js/settings.coffee @@ -104,4 +104,4 @@ class SettingsUI } form.send() - e.stop()
\ No newline at end of file + e.stop() diff --git a/module/web/media/js/settings.js b/module/web/media/js/settings.js index 9191fac72..41d1cb25a 100644 --- a/module/web/media/js/settings.js +++ b/module/web/media/js/settings.js @@ -1,3 +1,3 @@ {% autoescape true %} var SettingsUI,root;var __bind=function(a,b){return function(){return a.apply(b,arguments)}};root=this;window.addEvent("domready",function(){root.accountDialog=new MooDialog({destroyOnHide:false});root.accountDialog.setContent($("account_box"));new TinyTab($$("#toptabs li a"),$$("#tabs-body > span"));$$("ul.nav").each(function(a){return new MooDropMenu(a,{onOpen:function(b){return b.fade("in")},onClose:function(b){return b.fade("out")},onInitialize:function(b){return b.fade("hide").set("tween",{duration:500})}})});return new SettingsUI()});SettingsUI=(function(){function a(){var c,e,b,d;this.menu=$$("#general-menu li");this.menu.append($$("#plugin-menu li"));this.name=$("tabsback");this.general=$("general_form_content");this.plugin=$("plugin_form_content");d=this.menu;for(e=0,b=d.length;e<b;e++){c=d[e];c.addEvent("click",this.menuClick.bind(this))}$("general|submit").addEvent("click",this.configSubmit.bind(this));$("plugin|submit").addEvent("click",this.configSubmit.bind(this));$("account_add").addEvent("click",function(f){root.accountDialog.open();return f.stop()});$("account_reset").addEvent("click",function(f){return root.accountDialog.close()});$("account_add_button").addEvent("click",this.addAccount.bind(this));$("account_submit").addEvent("click",this.submitAccounts.bind(this))}a.prototype.menuClick=function(h){var c,b,g,f,d;d=h.target.get("id").split("|"),c=d[0],g=d[1];b=h.target.get("text");f=c==="general"?this.general:this.plugin;f.dissolve();return new Request({method:"get",url:"/json/load_config/"+c+"/"+g,onSuccess:__bind(function(e){f.set("html",e);f.reveal();return this.name.set("text",b)},this)}).send()};a.prototype.configSubmit=function(d){var c,b;c=d.target.get("id").split("|")[0];b=$(""+c+"_form");b.set("send",{method:"post",url:"/json/save_config/"+c,onSuccess:function(){return root.notify.alert('{{ _("Settings saved.")}}',{className:"success"})},onFailure:function(){return root.notify.alert('{{ _("Error occured.")}}',{className:"error"})}});b.send();return d.stop()};a.prototype.addAccount=function(c){var b;b=$("add_account_form");b.set("send",{method:"post",onSuccess:function(){return window.location.reload()},onFailure:function(){return root.notify.alert('{{_("Error occured.")}}',{className:"error"})}});b.send();return c.stop()};a.prototype.submitAccounts=function(c){var b;b=$("account_form");b.set("send",{method:"post",onSuccess:function(){return window.location.reload()},onFailure:function(){return root.notify.alert('{{ _("Error occured.") }}',{className:"error"})}});b.send();return c.stop()};return a})(); -{% endautoescape %}
\ No newline at end of file +{% endautoescape %} diff --git a/module/web/media/js/tinytab_static.js b/module/web/media/js/tinytab_static.js index 6c38292f5..4146038a5 100644 --- a/module/web/media/js/tinytab_static.js +++ b/module/web/media/js/tinytab_static.js @@ -47,4 +47,4 @@ provides: TinyTab this.fireEvent('change',[content,el]); } }); -})(document.id);
\ No newline at end of file +})(document.id); diff --git a/module/web/middlewares.py b/module/web/middlewares.py index e0e6c3102..73a5b8b9d 100644 --- a/module/web/middlewares.py +++ b/module/web/middlewares.py @@ -130,4 +130,4 @@ class GzipResponse(object): content_length = self.buffer.tell() update_header(self.headers, "Content-Length" , str(content_length)) - self.start_response(self.status, self.headers)
\ No newline at end of file + self.start_response(self.status, self.headers) diff --git a/module/web/servers/lighttpd_default.conf b/module/web/servers/lighttpd_default.conf index e56dda35f..bbeb5f7a7 100644 --- a/module/web/servers/lighttpd_default.conf +++ b/module/web/servers/lighttpd_default.conf @@ -150,4 +150,4 @@ url.rewrite-once = ( "^(/.*)$" => "/pyload.fcgi$1", ) -%(ssl)
\ No newline at end of file +%(ssl) diff --git a/module/web/templates/default/captcha.html b/module/web/templates/default/captcha.html index 288375b76..541fe99da 100644 --- a/module/web/templates/default/captcha.html +++ b/module/web/templates/default/captcha.html @@ -39,4 +39,4 @@ </form> -</div>
\ No newline at end of file +</div> diff --git a/module/web/templates/default/downloads.html b/module/web/templates/default/downloads.html index 20ff9a120..122ca1b82 100644 --- a/module/web/templates/default/downloads.html +++ b/module/web/templates/default/downloads.html @@ -26,4 +26,4 @@ </ul> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/folder.html b/module/web/templates/default/folder.html index b385e80cb..86132fee5 100644 --- a/module/web/templates/default/folder.html +++ b/module/web/templates/default/folder.html @@ -12,4 +12,4 @@ </span> </span> <div style="display:none">{{ _("Folder is empty") }}</div> -</li>
\ No newline at end of file +</li> diff --git a/module/web/templates/default/home.html b/module/web/templates/default/home.html index ddba9077b..3702893d0 100644 --- a/module/web/templates/default/home.html +++ b/module/web/templates/default/home.html @@ -263,4 +263,4 @@ var LinkEntry = new Class({ </tbody> </table> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/info.html b/module/web/templates/default/info.html index 77ae57376..839e18a98 100644 --- a/module/web/templates/default/info.html +++ b/module/web/templates/default/info.html @@ -78,4 +78,4 @@ </tr> </table> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/logout.html b/module/web/templates/default/logout.html index d3f07472b..83dba3bf4 100644 --- a/module/web/templates/default/logout.html +++ b/module/web/templates/default/logout.html @@ -6,4 +6,4 @@ {% block content %} <p><b>{{_("You were successfully logged out.")}}</b></p> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/logs.html b/module/web/templates/default/logs.html index d6288df0e..857598a78 100644 --- a/module/web/templates/default/logs.html +++ b/module/web/templates/default/logs.html @@ -38,4 +38,4 @@ </form> </div> <div style="clear: both; height: 10px;"> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/pathchooser.html b/module/web/templates/default/pathchooser.html index 1467fe926..3cd211a03 100644 --- a/module/web/templates/default/pathchooser.html +++ b/module/web/templates/default/pathchooser.html @@ -73,4 +73,4 @@ </table> </center> </body> -</html>
\ No newline at end of file +</html> diff --git a/module/web/templates/default/queue.html b/module/web/templates/default/queue.html index fff3d9ce9..53fd45219 100644 --- a/module/web/templates/default/queue.html +++ b/module/web/templates/default/queue.html @@ -101,4 +101,4 @@ document.addEvent("domready", function(){ </form> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/settings.html b/module/web/templates/default/settings.html index 8f084c352..da0b535ac 100644 --- a/module/web/templates/default/settings.html +++ b/module/web/templates/default/settings.html @@ -201,4 +201,4 @@ </form> </div> -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/settings_item.html b/module/web/templates/default/settings_item.html index 813383343..28de1a1a9 100644 --- a/module/web/templates/default/settings_item.html +++ b/module/web/templates/default/settings_item.html @@ -45,4 +45,4 @@ </tr> {% endif %} {% endfor %} -</table>
\ No newline at end of file +</table> diff --git a/module/web/templates/default/setup.html b/module/web/templates/default/setup.html index 39ef6f1e8..37b1c0e0e 100644 --- a/module/web/templates/default/setup.html +++ b/module/web/templates/default/setup.html @@ -10,4 +10,4 @@ {% block content %} Comming Soon. -{% endblock %}
\ No newline at end of file +{% endblock %} diff --git a/module/web/templates/default/window.html b/module/web/templates/default/window.html index a11323fe0..841cda553 100644 --- a/module/web/templates/default/window.html +++ b/module/web/templates/default/window.html @@ -43,4 +43,4 @@ </form> -</div>
\ No newline at end of file +</div> diff --git a/pyLoadCore.py b/pyLoadCore.py index 35cac4682..7311ec573 100755 --- a/pyLoadCore.py +++ b/pyLoadCore.py @@ -665,4 +665,3 @@ def main(): # And so it begins... if __name__ == "__main__": main() - diff --git a/pyLoadGui.py b/pyLoadGui.py index a28b3f1b0..a19053def 100755 --- a/pyLoadGui.py +++ b/pyLoadGui.py @@ -762,4 +762,3 @@ if __name__ == "__main__": renameProcess('pyLoadGui') app = main() app.loop() - diff --git a/tests/test_json.py b/tests/test_json.py index ff56e8f5a..320a42d4f 100644 --- a/tests/test_json.py +++ b/tests/test_json.py @@ -45,4 +45,4 @@ class TestJson: except HTTPError, e: assert e.code == 404 else: - assert False
\ No newline at end of file + assert False |