Morevna Changeset - 13603ac261f1

Changeset - 13603ac261f1

Parent rev.

Child rev.

[Not reviewed]

default

0 3 0

Laman - 7 years ago 2018-02-19 22:46:08

minor enhancements

3 files changed with 4 insertions and 4 deletions:

protocol.md

src/morevna.sh

src/networkers.py

0 comments (0 inline, 0 general)

protocol.md

➞

Show inline comments

 # Protocol #
+# Protocol v0.1 #
 [Communication protocol proposal. Not yet fully implemented and still expected to change.]
 Nodes communicate by exchanging messages through network sockets. Basic message format is simple:
 		json-length: ABC
@@ @@ -37,13 +37,13 @@ Requests hashes or a data chunk from the @@
 - {hash, data} dataType
 hash
 - [(int) i0, ...] index: list of requested node keys from the HashTree
 data
-- (int) index: requested data block number in the data file. Returns blockSize bytes starting at blockSize * index.
+- [(int) i0, ...] index: list of requested data blocks from the data file. Returns blockSize bytes starting at blockSize * i.
 #### Responses ####
 - [send](#send)
 - [err](#err)

src/morevna.sh

➞

Show inline comments

@@ @@ -13,13 +13,13 @@ DIRNAME=`dirname $0` @@
 sudo losetup -f ~/ext2.img
 sudo cryptsetup open --type=luks /dev/loop0 ext2luks
 sudo mount /dev/mapper/ext2luks ~/temp
 sudo rdiff-backup -v 5 ~/Dokumenty ~/temp/Dokumenty
-sudo rdiff-backup -v 5 --exclude '**/__pycache__/' ~/Projekty ~/temp/Projekty
+sudo rdiff-backup -v 5 --exclude-regexp '/__pycache__/' ~/Projekty ~/temp/Projekty
 sudo rdiff-backup -v 5 ~/Obrázky ~/temp/Obrázky
 sudo umount /dev/mapper/ext2luks
 sudo cryptsetup close ext2luks
 sudo losetup -d /dev/loop0

src/networkers.py

➞

Show inline comments

@@ @@ -38,11 +38,11 @@ class NetworkWriter: @@
 		msg=self.prepMsg(*args)
 		self._stream.write(msg)
 		self._stream.flush()
 		stats.logSent(msg)
 	def prepMsg(self,jsonData,binData=b""):
 		jsonData=bytes(json.dumps(jsonData)+"\n",encoding="utf-8")
+		jsonData=bytes(json.dumps(jsonData,separators=(',',':'))+"\n",encoding="utf-8")
 		jsonLength=bytes("json-length: "+str(len(jsonData))+"\n",encoding="utf-8")
 		binLength=bytes("bin-length: "+str(len(binData))+"\n",encoding="utf-8")
 		return b"".join((jsonLength,binLength,jsonData,binData))

0 comments (0 inline, 0 general)