Morevna Changeset - 5c80ca07f00c

Changeset - 5c80ca07f00c

Parent rev.

Child rev.

[Not reviewed]

default

0 16 0

Laman - 5 years ago 2020-05-23 19:02:49

reformatted whitespace with more respect for PEP-8

4 files changed with 25 insertions and 3 deletions:

src/client.py

src/morevna.py

src/morevna.sh

src/stats.py

0 comments (0 inline, 0 general)

src/client.py

➞

Show inline comments

@@ @@ -48,7 +48,13 @@ class Client(NetNode): @@
 		super().__init__(filename,treeFile)
 	def init(self,action):
 		jsonData={"command":"init", "blockSize":self._tree.BLOCK_SIZE, "blockCount":self._tree.leafCount, "version":conf.version, "action":action}
 		jsonData = {
 			"command": "init",
 			"blockSize": self._tree.BLOCK_SIZE,
 			"blockCount": self._tree.leafCount,
 			"version": conf.version,
 			"action": action
+		}
 		self._outcoming.writeMsg(jsonData)
 		jsonData,binData=self._incoming.readMsg()
 		if jsonData["command"]=="deny":

src/morevna.py

➞

Show inline comments

@@ @@ -29,6 +29,7 @@ def buildTree(args): @@
 	tree=HashTree.fromFile(args.datafile)
 	tree.save(args.treefile)
 def push(args):
 	_checkFile(args.datafile)
 	if args.tree:
@@ @@ -77,6 +78,7 @@ def pull(args): @@
 		print("Server {0}:{1} denied connection.".format(*host))
 		print(e)
 def serve(args):
 	_checkFile(args.datafile)
 	if args.tree:

src/morevna.sh

➞

Show inline comments

@@ @@ -2,6 +2,7 @@ @@
 # setup encrypted container
 #sudo losetup -f ext2.img
 #sudo cryptsetup luksFormat /dev/loop0
 #sudo cryptsetup open --type=luks /dev/loop0 ext2luks
 #sudo mkfs.ext2 /dev/mapper/ext2luks
@@ @@ -11,17 +12,23 @@ @@
 set -e
 DIRNAME=`dirname $0`
 ssh-add
 rsync -av 19x19.cz:letsencrypt.tar.xz.gpg ~/Projekty/
 rsync -av 19x19.cz:/home/laman/projekty/laman/db_backup/ ~/Programy/db_backup/
 rsync -av 19x19.cz:/home/laman/projekty/gkul/db_backup/ ~/Programy/db_backup/
 find ~/Programy/db_backup/ -mtime +30 -type f -delete
 rdiff-backup -v 3 19x19.cz::/home/laman/projekty/laman/static/media ~/Programy/static_backup/laman
 rdiff-backup -v 3 19x19.cz::/home/laman/projekty/gkul/static/media ~/Programy/static_backup/gkul
 rsync -av 19x19.cz:/home/laman/projekty/copobot/logs ~/Programy/static_backup/copobot
 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-regexp '/__pycache__/' ~/Projekty ~/temp/Projekty
+sudo rdiff-backup -v 5 --exclude '**/__pycache__' ~/Projekty ~/temp/Projekty
 sudo rdiff-backup -v 5 ~/Obrázky ~/temp/Obrázky
 sudo umount /dev/mapper/ext2luks

src/stats.py

➞

Show inline comments

@@ @@ -33,7 +33,14 @@ def report(): @@
 	return """received {rf} ({r:,} B)
 sent {sf} ({s:,} B)
 exchanged {nodes:,} hash tree nodes
 transferred {blocks:,} blocks""".format(rf=formatBytes(stats.received), r=stats.received, sf=formatBytes(stats.sent), s=stats.sent, nodes=stats.exchangedNodes, blocks=stats.transferredBlocks)
 transferred {blocks:,} blocks""".format(
 		rf=formatBytes(stats.received),
 		r=stats.received,
 		sf=formatBytes(stats.sent),
 		s=stats.sent,
 		nodes=stats.exchangedNodes,
 		blocks=stats.transferredBlocks
+	)
 def formatBytes(x):

0 comments (0 inline, 0 general)