znote 1.2.6__tar.gz → 1.2.8__tar.gz

{znote-1.2.6/znote.egg-info → znote-1.2.8}/PKG-INFO

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

{znote-1.2.6 → znote-1.2.8}/znote/client.py

@@ -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
@@ -481,8 +486,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:

{znote-1.2.6 → znote-1.2.8}/znote/core/client/settings.py

@@ -133,10 +133,10 @@ class Settings():
         if host:
             self.config.set('client.host', host)
 
-        if port and isinstance(port, int):
+        if port and port.isdigit():
             self.config.set('client.port', int(port))
 
-        if key_size and isinstance(key_size, int): 
+        if key_size and key_size.isdigit(): 
             self.config.set('client.key_size', int(key_size))
         
         if key_otp:

{znote-1.2.6 → znote-1.2.8/znote.egg-info}/PKG-INFO

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