# HG changeset patch
# User Laman
# Date 2020-06-07 13:28:55
# Node ID b0515ceb502d23836ec0933a2e41cd06a4ac43f0
# Parent  870c5c6c334f2744e0fa0618e2a02eb16b09f31c

actually flushing the files

diff --git a/src/client.py b/src/client.py
--- a/src/client.py
+++ b/src/client.py
@@ -167,6 +167,7 @@ class Client(NetNode):
 
 					t = datetime.now().timestamp()
 					if t-last_flushed >= 60:
+						data_file.flush()
 						if self._tree_file:
 							self._update_tree()
 						self._refresh_lock()
diff --git a/src/config.py b/src/config.py
--- a/src/config.py
+++ b/src/config.py
@@ -31,5 +31,5 @@ port = conf.get("port", 9901)
 
 bSize = conf.get("batch_size", dict())
 class batch_size:
-	hash = bSize.get("hash", 256)
+	hash = bSize.get("hash", 16384)
 	data = bSize.get("data", 64)
diff --git a/src/datafile.py b/src/datafile.py
--- a/src/datafile.py
+++ b/src/datafile.py
@@ -25,5 +25,8 @@ class DataFile:
 		self._last_index = i
 		return self._f.read(byte_count)
 
+	def flush(self):
+		self._f.flush()
+
 	def close(self):
 		self._f.close()
diff --git a/src/morevna.sh b/src/morevna.sh
deleted file mode 100644
--- a/src/morevna.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-# 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
-
-# generate certificate
-# openssl req -x509 -newkey rsa:4096 -keyout key.pem -out cert.pem -days 365 -nodes -subj "/CN=name"
-
-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 '**/__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
-
-echo
-
-python $DIRNAME/morevna.py build ~/ext2.bin ~/ext2.img
-python $DIRNAME/morevna.py push --tree ~/ext2.bin ~/ext2.img
diff --git a/src/server.py b/src/server.py
--- a/src/server.py
+++ b/src/server.py
@@ -94,7 +94,9 @@ class Server(NetNode):
 			if json_data["action"]=="pull" and self.is_locked():
 				self._outcoming.write_msg({"command": "deny", "status": status.locked})
 			if json_data["action"]=="push" and not self.is_locked():
-				self._lock()
+				try: self._lock()
+				except Exception:
+					pass
 
 			self._last_flushed = datetime.now().timestamp()
 			self._outcoming.write_msg({"command": "init", "version": conf.version})
@@ -151,6 +153,7 @@ class Server(NetNode):
 
 		t = datetime.now().timestamp()
 		if t-self._last_flushed>=60:
+			self._data_file.flush()
 			if self._tree_file:
 				self._update_tree()
 			self._refresh_lock()