efs-cli 1.0.7__tar.gz → 1.0.8__tar.gz

{efs_cli-1.0.7 → efs_cli-1.0.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.0.7
+Version: 1.0.8
 Summary: EepyFileServer API CLI written in Python
 Author: maxie
 License-Expression: MIT

efs_cli-1.0.8/src/efs_cli/__init__.py

@@ -0,0 +1,2 @@
+__version__ = "1.0.8"
+

{efs_cli-1.0.7 → efs_cli-1.0.8}/src/efs_cli/cli.py

@@ -10,6 +10,17 @@ CONFIG_PATH = os.path.expanduser("~/.efs-cli_config.json")
 if os.path.exists(os.path.expanduser("~/.config/")):
 	CONFIG_PATH = os.path.expanduser("~/.config/efs-cli.json")
 
+def exception_handler(func):
+	def wrapper(*args, **kwargs):
+		try:
+			func(*args, **kwargs)
+		except Exception as exc:
+			if isinstance(exc.args[1], int):
+				print(f"Error: {exc.args[0]}")
+				sys.exit(1)
+			print(f"Error: {exc.__class__.__name__}: {exc}")
+	return wrapper
+
 def get_conf():
 	conf = None
 
@@ -31,14 +42,18 @@ def init_api():
 	efs = EepyFileServerPublic(base_url, ignore_initialization = True) if password is None else EepyFileServer(base_url, password, ignore_initialization = True)
 	return efs
 
+@exception_handler
 def auth(base_url, password, **__):
 	data = {"base_url": base_url, "password": password}
 	with open(CONFIG_PATH, "w") as file:
 		json.dump(data, file)
 	print("Saved eepyfileserver password and base url in config.json")
 
+@exception_handler
 def download(from_path, to_path, public, **__):
 	api = init_api()
+	if to_path is None:
+		to_path = from_path.split("/")[-1]
 	if public and not isinstance(api, EepyFileServerPublic):
 		api = api.public
 		if from_path.startswith("/public"):
@@ -47,11 +62,13 @@ def download(from_path, to_path, public, **__):
 	file.fetch_file().save(to_path)
 	print(f"Downloaded {from_path} to {to_path}")
 
+@exception_handler
 def read(file_path, **__):
 	api = init_api()
 	file = api.get_file(file_path)
 	print(file.fetch_file().load().decode("utf-8"))
 
+@exception_handler
 def upload(from_path, to_path, **__):
 	api = init_api()
 	if hasattr(api, "upload_file"):
@@ -62,10 +79,12 @@ def upload(from_path, to_path, **__):
 		print("Login using 'efs-cli auth <base url> <password>' to upload files")
 		sys.exit(1)
 
+@exception_handler
 def list_files(**__):
 	api = init_api()
 	print(api.get_filelist())
 
+@exception_handler
 def remove(file_path, **__):
 	api = init_api()
 	if hasattr(api, "delete_file"):
@@ -75,6 +94,7 @@ def remove(file_path, **__):
 		print("Login using 'efs-cli auth <base url> <password>' to delete files")
 		sys.exit(1)
 
+@exception_handler
 def ver(**__):
 	conf = get_conf()
 	print(f"efs-cli: {version}")
@@ -83,6 +103,7 @@ def ver(**__):
 		api = init_api()
 		print(f"EepyFileServer ({conf['base_url']}): {api.get_instance_info()['instance']['version']}")
 
+@exception_handler
 def instance(**__):
 	api = init_api()
 	instance_info = api.get_instance_info()["instance"]
@@ -94,6 +115,7 @@ def instance(**__):
 	print(f"   Used : {disk_usage.human.used} Megabytes")
 	print(f"   Free : {disk_usage.human.free} Megabytes")
 
+@exception_handler
 def url_for(file_path, public, check_if_exists, **__):
 	api = init_api()
 	if public and not isinstance(api, EepyFileServerPublic):
@@ -106,6 +128,7 @@ def url_for(file_path, public, check_if_exists, **__):
 		print(e.args[0])
 		sys.exit(1)
 
+@exception_handler
 def overwrite(from_path, to_path, **__):
 	api = init_api()
 	if hasattr(api, "overwrite_file"):
@@ -116,6 +139,7 @@ def overwrite(from_path, to_path, **__):
 		print("Login using 'efs-cli auth <base url> <password>' to delete files")
 		sys.exit(1)
 
+@exception_handler
 def metadata(path, public, **__):
 	api = init_api()
 	if public and not isinstance(api, EepyFileServerPublic):
@@ -142,7 +166,7 @@ def main():
 
 	download_parser = subparser.add_parser("download", help="download a file", aliases=["get", "d"])
 	download_parser.add_argument("from_path", help="the efs path of the file to download")
-	download_parser.add_argument("to_path", help="the local path to download the file to")
+	download_parser.add_argument("to_path", nargs="?", help="the local path to download the file to")
 	download_parser.add_argument("-p", "--public", action="store_true", help="use a public url if set")
 	download_parser.set_defaults(func=download)
 

{efs_cli-1.0.7 → efs_cli-1.0.8}/src/efs_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.0.7
+Version: 1.0.8
 Summary: EepyFileServer API CLI written in Python
 Author: maxie
 License-Expression: MIT

efs_cli-1.0.7/src/efs_cli/__init__.py

@@ -1,2 +0,0 @@
-__version__ = "1.0.7"
-