From 34b7cb0292d75fcd151bd2020689d9aa1c02cc63 Mon Sep 17 00:00:00 2001 From: HelloZeroNet Date: Thu, 30 Apr 2015 11:49:03 +0200 Subject: [PATCH] rev126, Renamed disable_openssl to use_openssl, Renamed modified Peer command to listModified --- src/Config.py | 8 ++++---- src/Crypt/CryptBitcoin.py | 2 +- src/File/FileRequest.py | 6 +++--- src/Peer/Peer.py | 7 +++++++ src/Ui/media/img/logo.psd | Bin 62132 -> 62132 bytes 5 files changed, 15 insertions(+), 8 deletions(-) diff --git a/src/Config.py b/src/Config.py index 2d9e47ae..7aadfc98 100644 --- a/src/Config.py +++ b/src/Config.py @@ -4,7 +4,7 @@ import ConfigParser class Config(object): def __init__(self): self.version = "0.2.9" - self.rev = 125 + self.rev = 126 self.parser = self.createArguments() argv = sys.argv[:] # Copy command line arguments argv = self.parseConfig(argv) # Add arguments from config file @@ -29,9 +29,9 @@ class Config(object): else: coffeescript = None if sys.platform.startswith("Darwin"): # For some reasons openssl doesnt works on mac yet (https://github.com/HelloZeroNet/ZeroNet/issues/94) - disable_openssl = True + use_openssl = False else: - disable_openssl = False + use_openssl = True # Create parser parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter) @@ -105,9 +105,9 @@ class Config(object): parser.add_argument('--fileserver_ip', help='FileServer bind address', default="*", metavar='ip') parser.add_argument('--fileserver_port',help='FileServer bind port', default=15441, type=int, metavar='port') parser.add_argument('--disable_zeromq', help='Disable compatibility with old clients', action='store_true') - parser.add_argument('--disable_openssl',help='Disable usage of OpenSSL liblary', type='bool', choices=[True, False], default=disable_openssl) parser.add_argument('--disable_udp', help='Disable UDP connections', action='store_true') parser.add_argument('--proxy', help='Socks proxy address', metavar='ip:port') + parser.add_argument('--use_openssl', help='Use OpenSSL liblary for speedup', type='bool', choices=[True, False], default=use_openssl) parser.add_argument('--ip_external', help='External ip (tested on start if None)', metavar='ip') parser.add_argument('--coffeescript_compiler', help='Coffeescript compiler for developing', default=coffeescript, metavar='executable_path') diff --git a/src/Crypt/CryptBitcoin.py b/src/Crypt/CryptBitcoin.py index 5e4c99d7..295c1e8f 100644 --- a/src/Crypt/CryptBitcoin.py +++ b/src/Crypt/CryptBitcoin.py @@ -5,7 +5,7 @@ from Config import config # Try to load openssl try: - if config.disable_openssl: raise Exception("Disabled by config") + if not config.use_openssl: raise Exception("Disabled by config") from lib.opensslVerify import opensslVerify logging.info("OpenSSL loaded, version: %s" % opensslVerify.openssl_version) except Exception, err: diff --git a/src/File/FileRequest.py b/src/File/FileRequest.py index d7b136fa..41234b5f 100644 --- a/src/File/FileRequest.py +++ b/src/File/FileRequest.py @@ -55,8 +55,8 @@ class FileRequest(object): elif cmd == "pex": self.actionPex(params) - elif cmd == "modified": - self.actionModified(params) + elif cmd == "listModified": + self.actionListModified(params) elif cmd == "ping": self.actionPing() else: @@ -163,7 +163,7 @@ class FileRequest(object): # Get modified content.json files since - def actionModified(self, params): + def actionListModified(self, params): site = self.sites.get(params["site"]) if not site or not site.settings["serving"]: # Site unknown or not serving self.response({"error": "Unknown site"}) diff --git a/src/Peer/Peer.py b/src/Peer/Peer.py index 98433fbe..17a82dc5 100644 --- a/src/Peer/Peer.py +++ b/src/Peer/Peer.py @@ -171,6 +171,13 @@ class Peer(object): return added + # List modified files since the date + # Return: {inner_path: modification date,...} + def listModified(self, since): + response = self.request("listModified", {"since": since}) + return response + + # Stop and remove from site def remove(self): self.log("Removing peer...Connection error: %s, Hash failed: %s" % (self.connection_error, self.hash_failed)) diff --git a/src/Ui/media/img/logo.psd b/src/Ui/media/img/logo.psd index 3babd0c08f99a1b91261beb7f633efed197b8f12..1cf6f35f3892c8028770669cf6cc5cdec8e8d2f8 100644 GIT binary patch delta 229 zcmdn;lzGcj<_*crOh%TIQ<+_W)aKR9dzn-WQ&Npm(o$1&EesOPbd8csl65W33{!QD zObm@p%@YmHO)O0(_prGsn;00F7^kJ_T3DtS>KYoRn&?`XngX?%rCOM!BpFy3BqwkF z%9hVcoQdbSOegQ<;R8A2EKiO-h_?0-;$Z2kc>8H{V2A`0ko7Kja$tzY=BZ&Hm_fX0 kK%TVGl5{N%%~N$v z4H6TROe{=|4UAGI_prGs8>FTs86+m_rdn87=o%WPn&?_sq*&@&B$+20S{Rz7nI{=- z{>qlmN}P%3xJ)PS<>3Q4<19~(J&3mU5#nH(DykE)IWR jAWvcQ%BWAuKwj^i&GYNnRDi50S0~S}6WhFh(N})}yf8=)