znote 1.2.7__tar.gz → 1.3.0__tar.gz

{znote-1.2.7/znote.egg-info → znote-1.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: znote
-Version: 1.2.7
+Version: 1.3.0
 Summary: Vault de prise de note
 Author: 
 License: mit

{znote-1.2.7 → znote-1.3.0}/znote/client.py

@@ -93,7 +93,7 @@ class Client():
         # Sauvegarde du IV, de la clé symétrique chiffrée et du fichier chiffré
         message_cipher = iv + sym_key_encrypted + ciphertext
 
-        self.connexion.send(message_cipher)
+        self.connexion.send(message_cipher + b'EOF')
 
 
     #Premier appel avec le serveur
@@ -112,7 +112,7 @@ class Client():
             payload = {'method': 'sendKey', 'content': __main__.settings.PubKey.decode()}
             logs("Envoi de la clé public au serveur", component="client")
 
-        self.connexion.send(encrypt(json.dumps(payload).encode()))
+        self.connexion.send(encrypt(json.dumps(payload).encode()) + b'EOF')
 
         try:
             message_recu = self.receive()
@@ -187,7 +187,12 @@ class Client():
         {'module': 'app.display', 'submodule': ['logs', 'notify']},
     )
     def publish_file(self, file, expanded_path, channel_name):
-        logs(f"Envoi de {os.path.relpath(file, expanded_path)}")
+        if expanded_path:
+            filename = os.path.relpath(file, expanded_path)
+        else:
+            filename = os.path.basename(file)
+
+        logs(f"Envoi de {filename}")
         with open(file, 'rb') as f:
             content = f.read()
             content_hash = hashlib.sha256(content).hexdigest()
@@ -196,7 +201,7 @@ class Client():
                 'method': 'channel',
                 'action': 'publish',
                 'channel_name': channel_name,
-                'name': os.path.relpath(file, expanded_path),
+                'name': filename,
                 'content': content,
                 'hash': content_hash,
                 'token': __main__.settings.token
@@ -220,7 +225,6 @@ class Client():
             self.well_come = True
 
         message = None
-
         #if not __main__.settings.pubserv_set:
         #if not __main__.settings.serverhash:
 
@@ -481,8 +485,16 @@ class Client():
 
                 expanded_path = os.path.expanduser(path)
 
-                files = glob(f"{expanded_path}/**/*", recursive=True)
-                #files = [os.path.relpath(p, expanded_path) for p in results]
+                if not os.path.exists(expanded_path):
+                    logs("La source n'existe pas", "error")
+
+                if os.path.isdir(expanded_path):
+                    files = glob(f"{expanded_path}/**/*", recursive=True)
+                    #files = [os.path.relpath(p, expanded_path) for p in results]
+                else:
+                    files = [expanded_path]
+                    expanded_path = None
+
                 push_file = []
 
                 for file in files:
@@ -649,7 +661,7 @@ class Client():
                         file_path = message['path']
                     else:
                         file_path = "."
-                    print(file_path)
+
                     diff_output = build_diff_tree(file_path, message["tree"])
                     print_tree(diff_output)
             

{znote-1.2.7 → znote-1.3.0}/znote/server.py

@@ -141,6 +141,13 @@ class ThreadClient(threading.Thread):
             if ready_to_read:
                 chunk = self.connexion.recv(2048)
 
+                while not chunk.endswith(b'EOF'):
+                    data += chunk
+
+                return data+chunk[:-3]
+                """
+                if chunk:
+                    print(chunk)
                 if chunk and len(chunk)<2048:
                     return data+chunk
 
@@ -148,6 +155,7 @@ class ThreadClient(threading.Thread):
                     return data
 
                 data += chunk
+                """
 
 
     #Déchiffrement du message du client

{znote-1.2.7 → znote-1.3.0/znote.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: znote
-Version: 1.2.7
+Version: 1.3.0
 Summary: Vault de prise de note
 Author: 
 License: mit