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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.0.6
+Version: 1.0.8
 Summary: EepyFileServer API CLI written in Python
 Author: maxie
 License-Expression: MIT
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.30
-Requires-Dist: efs-wrapper>=1.0.4
+Requires-Dist: efs-wrapper>=1.0.5
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)

{efs_cli-1.0.6 → efs_cli-1.0.8}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 77.0.3", "requests >= 2.30", "efs-wrapper >= 1.0.4"]
+requires = ["setuptools >= 77.0.3", "requests >= 2.30", "efs-wrapper >= 1.0.5"]
 build-backend = "setuptools.build_meta"
 
 [project]
@@ -12,7 +12,7 @@ readme = "README.md"
 requires-python = ">=3.10"
 dependencies = [
 	"requests >= 2.30",
-	"efs-wrapper >= 1.0.4"
+	"efs-wrapper >= 1.0.5"
 ]
 classifiers = [
 	"Programming Language :: Python :: 3",

efs_cli-1.0.8/src/efs_cli/__init__.py

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

{efs_cli-1.0.6 → 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,23 +42,33 @@ 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")
 
-def download(from_path, to_path, **__):
+@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"):
+			from_path = from_path.removeprefix("/public")
 	file = api.get_file(from_path)
 	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"):
@@ -58,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"):
@@ -71,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}")
@@ -79,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"]
@@ -90,9 +115,10 @@ 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:
+	if public and not isinstance(api, EepyFileServerPublic):
 		api = api.public
 		if file_path.startswith("/public"):
 			file_path = file_path.removeprefix("/public")
@@ -102,8 +128,32 @@ def url_for(file_path, public, check_if_exists, **__):
 		print(e.args[0])
 		sys.exit(1)
 
-def metadata(file_path):
-	...
+@exception_handler
+def overwrite(from_path, to_path, **__):
+	api = init_api()
+	if hasattr(api, "overwrite_file"):
+		with open(from_path, "rb") as file:
+			api.overwrite_file(to_path, file)
+		print(f"{to_path} overwritten")
+	else:
+		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):
+		api = api.public
+		if path.startswith("/public"):
+			path = path.removeprefix("/public")
+	if api.is_file(path):
+		print(api.get_file(path).metadata.to_dict())
+		return
+	if api.is_directory(path):
+		print(api.get_tree(path))
+		return
+	print(f"{path} does not exist or is not a file or a directory")
+	sys.exit(1)
 
 def main():
 	parser = ArgumentParser("efs-cli", description="eepyfileserver cli tool for downloading and uploading files")
@@ -116,7 +166,8 @@ 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)
 
 	read_parser = subparser.add_parser("read", help="read a file", aliases=["cat"])
@@ -128,6 +179,16 @@ def main():
 	upload_parser.add_argument("to_path", help="the efs path to upload the file to")
 	upload_parser.set_defaults(func=upload)
 
+	overwrite_parser = subparser.add_parser("overwrite", help="overwrite a file", aliases=["over"])
+	overwrite_parser.add_argument("from_path", help="the local path of the file to use")
+	overwrite_parser.add_argument("to_path", help="the efs file path to overwrite")
+	overwrite_parser.set_defaults(func=overwrite)
+
+	metadata_parser = subparser.add_parser("metadata", help="get metadata for a file or a directory", aliases=["meta"])
+	metadata_parser.add_argument("path", help="the efs path of the file to get metadata for")
+	metadata_parser.add_argument("-p", "--public", action="store_true", help="use a public url if set")
+	metadata_parser.set_defaults(func=metadata)
+
 	list_files_parser = subparser.add_parser("list", help="list current files on efs", aliases=["ls", "files"])
 	list_files_parser.set_defaults(func=list_files)
 
@@ -143,7 +204,7 @@ def main():
 
 	urlfor_parser = subparser.add_parser("url-for", help="get the url for a file", aliases=["url"])
 	urlfor_parser.add_argument("file_path", help="the efs file path to return url for")
-	urlfor_parser.add_argument("-p", "--public", action="store_true", help="return public url if set to true")
+	urlfor_parser.add_argument("-p", "--public", action="store_true", help="return public url if set")
 	urlfor_parser.add_argument("-c", "--check-if-exists", action="store_true", help="check if the file exists before returning the url")
 	urlfor_parser.set_defaults(func=url_for)
 

{efs_cli-1.0.6 → 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.6
+Version: 1.0.8
 Summary: EepyFileServer API CLI written in Python
 Author: maxie
 License-Expression: MIT
@@ -17,7 +17,7 @@ Requires-Python: >=3.10
 Description-Content-Type: text/markdown
 License-File: LICENSE
 Requires-Dist: requests>=2.30
-Requires-Dist: efs-wrapper>=1.0.4
+Requires-Dist: efs-wrapper>=1.0.5
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)

efs_cli-1.0.8/src/efs_cli.egg-info/requires.txt

@@ -0,0 +1,2 @@
+requests>=2.30
+efs-wrapper>=1.0.5

efs_cli-1.0.6/src/efs_cli/__init__.py

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

efs_cli-1.0.6/src/efs_cli.egg-info/requires.txt

@@ -1,2 +0,0 @@
-requests>=2.30
-efs-wrapper>=1.0.4