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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.0.5
+Version: 1.0.7
 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.5 → efs_cli-1.0.7}/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.7/src/efs_cli/__init__.py

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

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

@@ -37,8 +37,12 @@ def auth(base_url, password, **__):
 		json.dump(data, file)
 	print("Saved eepyfileserver password and base url in config.json")
 
-def download(from_path, to_path, **__):
+def download(from_path, to_path, public, **__):
 	api = init_api()
+	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}")
@@ -69,7 +73,7 @@ def remove(file_path, **__):
 		print(f"Deleted {file_path}")
 	else:
 		print("Login using 'efs-cli auth <base url> <password>' to delete files")
-		return 1
+		sys.exit(1)
 
 def ver(**__):
 	conf = get_conf()
@@ -90,6 +94,43 @@ def instance(**__):
 	print(f"   Used : {disk_usage.human.used} Megabytes")
 	print(f"   Free : {disk_usage.human.free} Megabytes")
 
+def url_for(file_path, public, check_if_exists, **__):
+	api = init_api()
+	if public and not isinstance(api, EepyFileServerPublic):
+		api = api.public
+		if file_path.startswith("/public"):
+			file_path = file_path.removeprefix("/public")
+	try:
+		print(api.url_to_file(file_path, check_if_exists = check_if_exists))
+	except Exception as e:
+		print(e.args[0])
+		sys.exit(1)
+
+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)
+
+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")
 	subparser = parser.add_subparsers()
@@ -102,6 +143,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("-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"])
@@ -111,13 +153,23 @@ def main():
 	upload_parser = subparser.add_parser("upload", help="upload a file", aliases=["post", "up", "put"])
 	upload_parser.add_argument("from_path", help="the local path of the file to upload")
 	upload_parser.add_argument("to_path", help="the efs path to upload the file to")
-	upload_parser.set_defaults(func=upload)	
+	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)
 
 	remove_parser = subparser.add_parser("delete", help="delete a file", aliases=["remove", "rm"])
-	remove_parser.add_argument("file_path")
+	remove_parser.add_argument("file_path", help="the efs file path to delete")
 	remove_parser.set_defaults(func=remove)
 
 	version_parser = subparser.add_parser("version", help="view efs-cli and dependencies versions", aliases=["ver"])
@@ -126,6 +178,12 @@ def main():
 	instance_parser = subparser.add_parser("instance", help="view eepyfileserver instance info", aliases=["info"])
 	instance_parser.set_defaults(func=instance)
 
+	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")
+	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)
+
 	args = parser.parse_args()
 	if args == Namespace():
 		args = parser.parse_args(["-h"])

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.0.5
+Version: 1.0.7
 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.7/src/efs_cli.egg-info/requires.txt

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

efs_cli-1.0.5/src/efs_cli/__init__.py

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

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

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