rev100, Revision numbering for sub-versions, Assign connection to pee…

…r on filerequest/pex, Pex count bugfix, Disable unnecessary topright button click animation, Topright burger utf8 character change to more supported one

plugins/Stats/StatsPlugin.py

@@ -90,7 +90,7 @@ def actionStats(self):
 				("%.0fkB", connection.bytes_recv/1024),
 				("%s", connection.last_cmd),
 				("%s", connection.waiting_requests.keys()),
-				("%s", connection.handshake.get("version")),
+				("%s r%s", (connection.handshake.get("version"), connection.handshake.get("rev", "?")) ),
 				("%s", connection.handshake.get("peer_id")),
 			])
 		yield "</table>"

src/Config.py

@@ -1,157 +1,158 @@
-import argparse, sys, os, time
-import ConfigParser
-
-class Config(object):
-	def __init__(self):
-		self.version = "0.2.9"
-		self.parser = self.createArguments()
-		argv = sys.argv[:] # Copy command line arguments
-		argv = self.parseConfig(argv) # Add arguments from config file
-		self.parseCommandline(argv) # Parse argv
-		self.setAttributes()
-
-
-	def __str__(self):
-		return str(self.arguments).replace("Namespace", "Config") # Using argparse str output
-
-
-	# Create command line arguments
-	def createArguments(self):
-		# Platform specific
-		if sys.platform.startswith("win"):
-			coffeescript = "type %s | tools\\coffee\\coffee.cmd"
-		else:
-			coffeescript = None
-
-		# Create parser
-		parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
-		subparsers = parser.add_subparsers(title="Action to perform", dest="action")
-
-		# Main
-		action = subparsers.add_parser("main", help='Start UiServer and FileServer (default)')
-
-		# SiteCreate
-		action = subparsers.add_parser("siteCreate", help='Create a new site')
-
-		# SiteSign
-		action = subparsers.add_parser("siteSign", help='Update and sign content.json: address [privatekey]')
-		action.add_argument('address', 			help='Site to sign')
-		action.add_argument('privatekey',		help='Private key (default: ask on execute)', nargs='?')
-		action.add_argument('--inner_path',		help='File you want to sign (default: content.json)', default="content.json", metavar="inner_path")
-
-		# SitePublish
-		action = subparsers.add_parser("sitePublish", help='Publish site to other peers: address')
-		action.add_argument('address', 		help='Site to publish')
-		action.add_argument('peer_ip',		help='Peer ip to publish (default: random peers ip from tracker)', default=None, nargs='?')
-		action.add_argument('peer_port',	help='Peer port to publish (default: random peer port from tracker)', default=15441, nargs='?')
-		action.add_argument('--inner_path',	help='Content.json you want to publish (default: content.json)', default="content.json", metavar="inner_path")
-
-		# SiteVerify
-		action = subparsers.add_parser("siteVerify", help='Verify site files using sha512: address')
-		action.add_argument('address', 		help='Site to verify')
-
-		#dbRebuild
-		action = subparsers.add_parser("dbRebuild", help='Rebuild site database cache')
-		action.add_argument('address', 		help='Site to rebuild')
-
-		#dbQuery
-		action = subparsers.add_parser("dbQuery", help='Query site sql cache')
-		action.add_argument('address', 		help='Site to query')
-		action.add_argument('query', 		help='Sql query')
-
-		# PeerPing
-		action = subparsers.add_parser("peerPing", help='Send Ping command to peer')
-		action.add_argument('peer_ip', 			help='Peer ip')
-		action.add_argument('peer_port', 		help='Peer port')
-
-		# PeerGetFile
-		action = subparsers.add_parser("peerGetFile", help='Request and print a file content from peer')
-		action.add_argument('peer_ip', 			help='Peer ip')
-		action.add_argument('peer_port', 		help='Peer port')
-		action.add_argument('site', 			help='Site address')
-		action.add_argument('filename', 		help='File name to request')
-
-
-
-		# Config parameters
-		parser.add_argument('--debug', 			help='Debug mode', action='store_true')
-		parser.add_argument('--debug_socket', 	help='Debug socket connections', action='store_true')
-
-		parser.add_argument('--ui_ip', 			help='Web interface bind address', default="127.0.0.1", metavar='ip')
-		parser.add_argument('--ui_port', 		help='Web interface bind port', default=43110, type=int, metavar='port')
-		parser.add_argument('--ui_restrict',	help='Restrict web access', default=False, metavar='ip')
-		parser.add_argument('--open_browser',	help='Open homepage in web browser automatically', nargs='?', const="default_browser", metavar='browser_name')
-		parser.add_argument('--homepage',		help='Web interface Homepage', default='1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr', metavar='address')
-		parser.add_argument('--size_limit',		help='Default site size limit in MB', default=10, metavar='size_limit')
-
-		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('--proxy',			help='Socks proxy address', metavar='ip:port')
-		parser.add_argument('--disable_udp',	help='Disable UDP connections', action='store_true')
-		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')
-
-		parser.add_argument('--version', 	action='version', version='ZeroNet %s' % self.version)
-
-		return parser
-
-
-	# Find arguments specificed for current action
-	def getActionArguments(self):
-		back = {}
-		arguments = self.parser._subparsers._group_actions[0].choices[self.action]._actions[1:] # First is --version
-		for argument in arguments:
-			back[argument.dest] = getattr(self, argument.dest)
-		return back
-
-
-
-	# Try to find action from sys.argv
-	def getAction(self, argv):
-		actions = [action.choices.keys() for action in self.parser._actions if action.dest == "action"][0] # Valid actions
-		found_action = False
-		for action in actions: # See if any in sys.argv
-			if action in argv:
-				found_action = action
-				break
-		return found_action
-
-
-	# Parse command line arguments
-	def parseCommandline(self, argv):
-		# Find out if action is specificed on start
-		action = self.getAction(argv)
-		if len(argv) == 1 or not action: # If no action specificed set the main action
-			argv.append("main")
-		if "zeronet.py" in argv[0]:
-			self.arguments = self.parser.parse_args(argv[1:])
-		else: # Silent errors if not started with zeronet.py
-			self.arguments = self.parser.parse_args(argv[1:])
-
-
-	# Parse config file
-	def parseConfig(self, argv):
-		if os.path.isfile("zeronet.conf"):
-			config = ConfigParser.ConfigParser(allow_no_value=True)
-			config.read('zeronet.conf')
-			for section in config.sections():
-				for key, val in config.items(section):
-					if section != "global": # If not global prefix key with section
-						key = section+"_"+key
-					if val: argv.insert(1, val)
-					argv.insert(1, "--%s" % key)
-		return argv
-
-
-
-	# Expose arguments as class attributes
-	def setAttributes(self):
-		# Set attributes from arguments
-		args = vars(self.arguments)
-		for key, val in args.items():
-			setattr(self, key, val)
-
-
-config = Config()
+import argparse, sys, os, time
+import ConfigParser
+
+class Config(object):
+	def __init__(self):
+		self.version = "0.2.9"
+		self.rev = 100
+		self.parser = self.createArguments()
+		argv = sys.argv[:] # Copy command line arguments
+		argv = self.parseConfig(argv) # Add arguments from config file
+		self.parseCommandline(argv) # Parse argv
+		self.setAttributes()
+
+
+	def __str__(self):
+		return str(self.arguments).replace("Namespace", "Config") # Using argparse str output
+
+
+	# Create command line arguments
+	def createArguments(self):
+		# Platform specific
+		if sys.platform.startswith("win"):
+			coffeescript = "type %s | tools\\coffee\\coffee.cmd"
+		else:
+			coffeescript = None
+
+		# Create parser
+		parser = argparse.ArgumentParser(formatter_class=argparse.ArgumentDefaultsHelpFormatter)
+		subparsers = parser.add_subparsers(title="Action to perform", dest="action")
+
+		# Main
+		action = subparsers.add_parser("main", help='Start UiServer and FileServer (default)')
+
+		# SiteCreate
+		action = subparsers.add_parser("siteCreate", help='Create a new site')
+
+		# SiteSign
+		action = subparsers.add_parser("siteSign", help='Update and sign content.json: address [privatekey]')
+		action.add_argument('address', 			help='Site to sign')
+		action.add_argument('privatekey',		help='Private key (default: ask on execute)', nargs='?')
+		action.add_argument('--inner_path',		help='File you want to sign (default: content.json)', default="content.json", metavar="inner_path")
+
+		# SitePublish
+		action = subparsers.add_parser("sitePublish", help='Publish site to other peers: address')
+		action.add_argument('address', 		help='Site to publish')
+		action.add_argument('peer_ip',		help='Peer ip to publish (default: random peers ip from tracker)', default=None, nargs='?')
+		action.add_argument('peer_port',	help='Peer port to publish (default: random peer port from tracker)', default=15441, nargs='?')
+		action.add_argument('--inner_path',	help='Content.json you want to publish (default: content.json)', default="content.json", metavar="inner_path")
+
+		# SiteVerify
+		action = subparsers.add_parser("siteVerify", help='Verify site files using sha512: address')
+		action.add_argument('address', 		help='Site to verify')
+
+		#dbRebuild
+		action = subparsers.add_parser("dbRebuild", help='Rebuild site database cache')
+		action.add_argument('address', 		help='Site to rebuild')
+
+		#dbQuery
+		action = subparsers.add_parser("dbQuery", help='Query site sql cache')
+		action.add_argument('address', 		help='Site to query')
+		action.add_argument('query', 		help='Sql query')
+
+		# PeerPing
+		action = subparsers.add_parser("peerPing", help='Send Ping command to peer')
+		action.add_argument('peer_ip', 			help='Peer ip')
+		action.add_argument('peer_port', 		help='Peer port')
+
+		# PeerGetFile
+		action = subparsers.add_parser("peerGetFile", help='Request and print a file content from peer')
+		action.add_argument('peer_ip', 			help='Peer ip')
+		action.add_argument('peer_port', 		help='Peer port')
+		action.add_argument('site', 			help='Site address')
+		action.add_argument('filename', 		help='File name to request')
+
+
+
+		# Config parameters
+		parser.add_argument('--debug', 			help='Debug mode', action='store_true')
+		parser.add_argument('--debug_socket', 	help='Debug socket connections', action='store_true')
+
+		parser.add_argument('--ui_ip', 			help='Web interface bind address', default="127.0.0.1", metavar='ip')
+		parser.add_argument('--ui_port', 		help='Web interface bind port', default=43110, type=int, metavar='port')
+		parser.add_argument('--ui_restrict',	help='Restrict web access', default=False, metavar='ip')
+		parser.add_argument('--open_browser',	help='Open homepage in web browser automatically', nargs='?', const="default_browser", metavar='browser_name')
+		parser.add_argument('--homepage',		help='Web interface Homepage', default='1EU1tbG9oC1A8jz2ouVwGZyQ5asrNsE4Vr', metavar='address')
+		parser.add_argument('--size_limit',		help='Default site size limit in MB', default=10, metavar='size_limit')
+
+		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('--proxy',			help='Socks proxy address', metavar='ip:port')
+		parser.add_argument('--disable_udp',	help='Disable UDP connections', action='store_true')
+		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')
+
+		parser.add_argument('--version', 	action='version', version='ZeroNet %s r%s' % (self.version, self.rev))
+
+		return parser
+
+
+	# Find arguments specificed for current action
+	def getActionArguments(self):
+		back = {}
+		arguments = self.parser._subparsers._group_actions[0].choices[self.action]._actions[1:] # First is --version
+		for argument in arguments:
+			back[argument.dest] = getattr(self, argument.dest)
+		return back
+
+
+
+	# Try to find action from sys.argv
+	def getAction(self, argv):
+		actions = [action.choices.keys() for action in self.parser._actions if action.dest == "action"][0] # Valid actions
+		found_action = False
+		for action in actions: # See if any in sys.argv
+			if action in argv:
+				found_action = action
+				break
+		return found_action
+
+
+	# Parse command line arguments
+	def parseCommandline(self, argv):
+		# Find out if action is specificed on start
+		action = self.getAction(argv)
+		if len(argv) == 1 or not action: # If no action specificed set the main action
+			argv.append("main")
+		if "zeronet.py" in argv[0]:
+			self.arguments = self.parser.parse_args(argv[1:])
+		else: # Silent errors if not started with zeronet.py
+			self.arguments = self.parser.parse_args(argv[1:])
+
+
+	# Parse config file
+	def parseConfig(self, argv):
+		if os.path.isfile("zeronet.conf"):
+			config = ConfigParser.ConfigParser(allow_no_value=True)
+			config.read('zeronet.conf')
+			for section in config.sections():
+				for key, val in config.items(section):
+					if section != "global": # If not global prefix key with section
+						key = section+"_"+key
+					if val: argv.insert(1, val)
+					argv.insert(1, "--%s" % key)
+		return argv
+
+
+
+	# Expose arguments as class attributes
+	def setAttributes(self):
+		# Set attributes from arguments
+		args = vars(self.arguments)
+		for key, val in args.items():
+			setattr(self, key, val)
+
+
+config = Config()

src/Connection/Connection.py

@@ -183,7 +183,8 @@ def handshakeInfo(self):
 			"protocol": "v2", 
 			"peer_id": self.server.peer_id,
 			"fileserver_port": config.fileserver_port,
-			"port_opened": self.server.port_opened
+			"port_opened": self.server.port_opened,
+			"rev": config.rev
 		}
 
 

src/File/FileRequest.py

@@ -110,7 +110,10 @@ def actionGetFile(self, params):
 			if config.debug_socket: self.log.debug("File %s sent" % file_path)
 
 			# Add peer to site if not added before
-			site.addPeer(self.connection.ip, self.connection.port)
+			connected_peer = site.addPeer(self.connection.ip, self.connection.port)
+			if connected_peer: # Just added
+				connected_peer.connect(self.connection) # Assign current connection to peer
+
 		except Exception, err:
 			self.log.debug("GetFile read error: %s" % Debug.formatException(err))
 			self.response({"error": "File read error: %s" % Debug.formatException(err)})
@@ -126,14 +129,19 @@ def actionPex(self, params):
 
 		got_peer_keys = []
 		added = 0
-		site.addPeer(self.connection.ip, self.connection.port) # Add requester peer to site
+		connected_peer = site.addPeer(self.connection.ip, self.connection.port) # Add requester peer to site
+		if connected_peer: # Just added
+			added +=1
+			connected_peer.connect(self.connection) # Assign current connection to peer
+
 		for peer in params["peers"]: # Add sent peers to site
 			address = self.unpackAddress(peer)
 			got_peer_keys.append("%s:%s" % address)
 			if (site.addPeer(*address)): added += 1
 		# Send back peers that is not in the sent list and connectable (not port 0)
 		packed_peers = [peer.packAddress() for peer in site.getConnectablePeers(params["need"], got_peer_keys)]
 		if added:
+			site.worker_manager.onPeers()
 			self.log.debug("Added %s peers to %s using pex, sending back %s" % (added, site, len(packed_peers)))
 		self.response({"peers": packed_peers})