rev100, Revision numbering for sub-versions, Assign connection to peer 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 @@ class UiRequestPlugin(object):
 				("%.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

@@ -4,6 +4,7 @@ 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
@@ -93,7 +94,7 @@ class Config(object):
 
 		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)
+		parser.add_argument('--version', 	action='version', version='ZeroNet %s r%s' % (self.version, self.rev))
 
 		return parser
 

src/Connection/Connection.py

@@ -183,7 +183,8 @@ class Connection:
 			"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 @@ class FileRequest:
 			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,7 +129,11 @@ class FileRequest:
 
 		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)
@@ -134,6 +141,7 @@ class FileRequest:
 		# 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})
 

src/Peer/Peer.py

@@ -26,7 +26,7 @@ class Peer:
 
 
 	# Connect to host
-	def connect(self):
+	def connect(self, connection = None):
 		if not self.log: self.log = logging.getLogger("Peer:%s:%s %s" % (self.ip, self.port, self.site))
 		if self.connection: 
 			self.log.debug("Getting connection (Closing %s)..." % self.connection)
@@ -34,6 +34,9 @@ class Peer:
 		else:
 			self.log.debug("Getting connection...")
 		
+		if connection: # Connection specificed
+			self.connection = connection
+		else: # Try to find from connection pool or create new connection
 			self.connection = None
 
 			try:

src/Site/Site.py

@@ -282,6 +282,7 @@ class Site:
 	# Add or update a peer to site
 	def addPeer(self, ip, port, return_peer = False):
 		if not ip: return False
+		if (ip, port) in self.peer_blacklist: return False # Ignore blacklist (eg. myself)
 		key = "%s:%s" % (ip, port)
 		if key in self.peers: # Already has this ip
 			#self.peers[key].found()
@@ -300,6 +301,7 @@ class Site:
 	def announcePex(self, query_num=2, need_num=5):
 		peers = [peer for peer in self.peers.values() if peer.connection and peer.connection.connected] # Connected peers
 		if len(peers) == 0: # Small number of connected peers for this site, connect to any
+			self.log.debug("Small number of peers detected...query all of peers using pex")
 			peers = self.peers.values()
 			need_num = 10
 
@@ -308,19 +310,20 @@ class Site:
 		added = 0
 		for peer in peers:
 			if peer.connection: # Has connection
-				if "port_opened" in peer.connection.handshake: # This field added recently, so probably has gas peer exchange
+				if "port_opened" in peer.connection.handshake: # This field added recently, so probably has has peer exchange
 					res = peer.pex(need_num=need_num)
 				else:
 					res = False
 			else: # No connection
 				res = peer.pex(need_num=need_num)
-			if res != False:
+			if type(res) == int: # We have result
 				done += 1
 				added += res
-				if added:
+				if res:
 					self.worker_manager.onPeers()
-					self.updateWebsocket(peers_added=added)
+					self.updateWebsocket(peers_added=res)
 			if done == query_num: break
+		self.log.debug("Queried pex from %s peers got %s new peers." % (done, added))
 
 
 	# Add myself and get other peers from tracker
@@ -336,7 +339,6 @@ class Site:
 		else: # Port not opened, report port 0
 			fileserver_port = 0
 
-		fileserver_port = config.fileserver_port
 		s = time.time()
 		announced = 0
 
@@ -385,8 +387,6 @@ class Site:
 			added = 0
 			for peer in peers:
 				if not peer["port"]: continue # Dont add peers with port 0
-				if (peer["addr"], peer["port"]) in self.peer_blacklist: # Ignore blacklist (eg. myself)
-					continue
 				if self.addPeer(peer["addr"], peer["port"]): added += 1
 			if added:
 				self.worker_manager.onPeers()
@@ -399,7 +399,7 @@ class Site:
 		self.saveSettings()
 
 		if len(errors) < len(SiteManager.TRACKERS): # Less errors than total tracker nums
-			self.log.debug("Announced to %s trackers in %.3fs, errors: %s" % (announced, time.time()-s, errors))
+			self.log.debug("Announced port %s to %s trackers in %.3fs, errors: %s" % (fileserver_port, announced, time.time()-s, errors))
 		else:
 			self.log.error("Announced to %s trackers in %.3fs, failed" % (announced, time.time()-s))
 
@@ -412,9 +412,7 @@ class Site:
 
 	# Keep connections to get the updates (required for passive clients)
 	def needConnections(self):
-		need = min(len(self.peers)/2, 10) # Connect to half of total peers, but max 10
+		need = min(len(self.peers), 3) # Need 3 peer, but max total peers
-		need = max(need, 5) # But minimum 5 peers
-		need = min(len(self.peers), need) # Max total peers
 
 		connected = 0
 		for peer in self.peers.values(): # Check current connected number

src/Ui/UiWebsocket.py

@@ -219,6 +219,7 @@ class UiWebsocket(object):
 			"ui_ip": config.ui_ip,
 			"ui_port": config.ui_port,
 			"version": config.version,
+			"rev": config.rev,
 			"debug": config.debug,
 			"plugins": PluginManager.plugin_manager.plugin_names
 		}

src/Ui/media/Sidebar.coffee

@@ -20,13 +20,13 @@ class Sidebar
 		###
 
 		$(".fixbutton-bg").on "mousedown", ->
-			$(".fixbutton-burger").stop().animate({"scale": 0.7, "left": 0}, 300, "easeOutCubic")
+			# $(".fixbutton-burger").stop().animate({"scale": 0.7, "left": 0}, 300, "easeOutCubic")
 			#$("#inner-iframe").toggleClass("back")
 			#$(".wrapper-iframe").stop().animate({"scale": 0.9}, 600, "easeOutCubic")
 			#$("body").addClass("back")
 
 		$(".fixbutton-bg").on "mouseup", ->
-			$(".fixbutton-burger").stop().animate({"scale": 1, "left": 0}, 600, "easeOutElastic")
+			# $(".fixbutton-burger").stop().animate({"scale": 1, "left": 0}, 600, "easeOutElastic")
 		
 
 

src/Ui/media/Wrapper.css

@@ -27,8 +27,9 @@ a { color: black }
 	/*box-shadow: inset 105px 260px 0px -200px rgba(0,0,0,0.1);*/ /* box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); */
 }
 .fixbutton-text { pointer-events: none; position: absolute; z-index: 999; width: 40px; backface-visibility: hidden; perspective: 1000px }
-.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px }
+.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px; font-size: 48px; line-height: 32px }
 .fixbutton-bg:hover { background-color: #AF3BFF }
+.fixbutton-bg:active { background-color: #9E2FEA; top: 1px; transition: none }
 
 
 /* Notification */

src/Ui/media/all.css

@@ -32,8 +32,9 @@ a { color: black }
 	/*box-shadow: inset 105px 260px 0px -200px rgba(0,0,0,0.1);*/ /* -webkit-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -moz-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -o-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); -ms-box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1); box-shadow: inset -75px 183px 0px -200px rgba(0,0,0,0.1) ; */
 }
 .fixbutton-text { pointer-events: none; position: absolute; z-index: 999; width: 40px; backface-visibility: hidden; -webkit-perspective: 1000px ; -moz-perspective: 1000px ; -o-perspective: 1000px ; -ms-perspective: 1000px ; perspective: 1000px  }
-.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px }
+.fixbutton-burger { pointer-events: none; position: absolute; z-index: 999; width: 40px; opacity: 0; left: -20px; font-size: 48px; line-height: 32px }
 .fixbutton-bg:hover { background-color: #AF3BFF }
+.fixbutton-bg:active { background-color: #9E2FEA; top: 1px; -webkit-transition: none ; -moz-transition: none ; -o-transition: none ; -ms-transition: none ; transition: none  }
 
 
 /* Notification */

src/Ui/media/all.js

@@ -724,18 +724,8 @@ jQuery.extend( jQuery.easing,
       /*$(".fixbutton-bg").on "click", ->
       			return false
        */
-      $(".fixbutton-bg").on("mousedown", function() {
+      $(".fixbutton-bg").on("mousedown", function() {});
-        return $(".fixbutton-burger").stop().animate({
+      return $(".fixbutton-bg").on("mouseup", function() {});
-          "scale": 0.7,
-          "left": 0
-        }, 300, "easeOutCubic");
-      });
-      return $(".fixbutton-bg").on("mouseup", function() {
-        return $(".fixbutton-burger").stop().animate({
-          "scale": 1,
-          "left": 0
-        }, 600, "easeOutElastic");
-      });
     };
 
     return Sidebar;
@@ -747,6 +737,7 @@ jQuery.extend( jQuery.easing,
 }).call(this);
 
 
+
 /* ---- src/Ui/media/Wrapper.coffee ---- */
 
 

src/Ui/template/wrapper.html

@@ -18,7 +18,7 @@
 <!-- Fixed button -->
 <div class='fixbutton'>
  <div class='fixbutton-text'>0</div>
- <div class='fixbutton-burger'>&#9776;</div>
+ <div class='fixbutton-burger'>&#x2261;</div>
  <a class='fixbutton-bg' href="/{homepage}"></a>
 </div>
 

src/Worker/WorkerManager.py

@@ -100,8 +100,8 @@ class WorkerManager:
 
 	# Start workers to process tasks
 	def startWorkers(self, peers=None):
-		if len(self.workers) >= MAX_WORKERS and not peers: return False # Workers number already maxed and no starting peers definied
 		if not self.tasks: return False # No task for workers
+		if len(self.workers) >= MAX_WORKERS and not peers: return False # Workers number already maxed and no starting peers definied
 		if not peers: peers = self.site.peers.values() # No peers definied, use any from site
 		random.shuffle(peers)
 		for peer in peers: # One worker for every peer

src/main.py

@@ -67,7 +67,7 @@ PluginManager.plugin_manager.loadPlugins()
 class Actions:
 	# Default action: Start serving UiServer and FileServer
 	def main(self):
-		logging.info("Version: %s, Python %s, Gevent: %s" % (config.version, sys.version, gevent.__version__))
+		logging.info("Version: %s r%s, Python %s, Gevent: %s" % (config.version, config.rev, sys.version, gevent.__version__))
 		global ui_server, file_server
 		from File import FileServer
 		from Ui import UiServer