efs-cli 1.0.9__tar.gz → 1.1.1__tar.gz

{efs_cli-1.0.9 → efs_cli-1.1.1}/PKG-INFO

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

efs_cli-1.1.1/src/efs_cli/__init__.py

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

{efs_cli-1.0.9 → efs_cli-1.1.1}/src/efs_cli/cli.py

@@ -3,6 +3,7 @@ from efs_wrapper import __version__ as wrapper_version
 from efs_wrapper.v1 import EepyFileServer, EepyFileServerPublic, DiskUsageObject
 from argparse import ArgumentParser, Namespace
 import os
+import pathlib
 from tempfile import NamedTemporaryFile
 import json
 import sys
@@ -36,20 +37,72 @@ def get_conf():
 def init_api():
 	conf = get_conf()
 	
-	if conf is None:
-		print("Please authorize with 'efs-cli auth <base_url> <password>'")
+	if conf is None or conf.get("base_url", None) is None:
+		print("Please authorize with 'efs-cli auth <base_url> <password> (password is optional but you will be able only to read and download public files)'")
 		sys.exit(1)
 
 	base_url = conf.get("base_url")
+	custom_api_path = conf.get("custom_api_path", "/api/v1")
 	password = conf.get("password", None)
-	efs = EepyFileServerPublic(base_url, ignore_initialization = True) if password is None else EepyFileServer(base_url, password, ignore_initialization = True)
+	efs = EepyFileServerPublic(base_url, custom_api_path, ignore_initialization = True) if password is None else EepyFileServer(base_url, password, custom_api_path, 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)
+def config(reset, **__):
+	conf = get_conf()
+	if conf is None or reset:
+		with open(CONFIG_PATH, "w") as file:
+			json.dump({"base_url": None, "password": None, "custom_api_path": "/api/v1", "editor": "nano"}, file)
+		if reset:
+			print("Config reset")
+			sys.exit(0)
+	editor = conf.get("editor", "nano")
+
+	status = os.system(f"{editor} {CONFIG_PATH}")
+	if status:
+		print("using default editor: nano")
+		os.system(f"nano {CONFIG_PATH}")
+	print("Config saved successfully")
+
+@exception_handler
+def efs_config(verbose, **__):
+	conf = get_conf()
+	api = init_api()
+	editor = conf.get("editor", "nano")
+	if not hasattr(api, "get_config"):
+		print("Login using 'efs-cli auth <base url> <password>' to get the config")
+		sys.exit(1)
+	data = api.get_config()
+	with NamedTemporaryFile(suffix = ".json", mode="w+") as tmp:
+		json.dump(data, tmp)
+		tmp.seek(0)
+		status = os.system(f"{editor} {tmp.name}")
+		if status:
+			print("using default editor: nano")
+			os.system(f"nano {tmp.name}")
+		api.update_config(json.load(tmp), _print_warnings = verbose)
+	print("Config saved successfully")
+
+@exception_handler
+def auth(base_url, password, custom_api_path, **__):
+	conf = get_conf()
+	if custom_api_path is None:
+		custom_api_path = "/api/v1"
+	if custom_api_path.endswith("/"):
+		custom_api_path = custom_api_path[:-1]
+	if base_url.endswith("/"):
+		base_url = base_url[:-1]
+
+	data = {"base_url": base_url, "password": password, "custom_api_path": custom_api_path, "editor": "nano"}
+	
+	if conf is not None:
+		conf.update(data)
+		with open(CONFIG_PATH, "w") as file:
+			json.dump(conf, file)
+
+	else: 
+		with open(CONFIG_PATH, "w") as file:
+			json.dump(data, file)
 	print("Saved eepyfileserver password and base url in config.json")
 
 @exception_handler
@@ -66,11 +119,11 @@ def download(from_path, to_path, public, **__):
 	print(f"Downloaded {from_path} to {to_path}")
 
 @exception_handler
-def read(file_path, **__):
+def read(file_path, no_less, **__):
 	api = init_api()
 	file = api.get_file(file_path)
 	_file = file.fetch_file()
-	if sys.platform in ["linux", "darwin"]:
+	if sys.platform in ["linux", "darwin"] and not no_less:
 		with NamedTemporaryFile() as tmp:
 			tmp.write(_file.load())
 			tmp.seek(0)
@@ -78,6 +131,26 @@ def read(file_path, **__):
 	else:
 		print(_file.load().decode("utf-8"))
 
+@exception_handler
+def edit(file_path, **__):
+	api = init_api()
+	conf = get_conf()
+	editor = conf.get("editor", "nano")
+	if not hasattr(api, "overwrite_file"):	
+		print("Login using 'efs-cli auth <base url> <password>' to overwrite files")
+		sys.exit(1)
+	file = api.get_file(file_path)
+	_file = file.fetch_file()
+	with NamedTemporaryFile(suffix = "".join(pathlib.Path(file_path).suffixes)) as tmp:
+		tmp.write(_file.load())
+		tmp.seek(0)
+		status = os.system(f"{editor} {tmp.name}")
+		if status:
+			print("using default editor: nano")
+			os.system(f"nano {tmp.name}")
+		api.overwrite_file(file_path, tmp)
+		print(f"{file_path} overwritten")
+
 @exception_handler
 def upload(from_path, to_path, **__):
 	api = init_api()
@@ -172,6 +245,7 @@ def main():
 	auth_parser = subparser.add_parser("auth", help="authorize to eepyfileserver", aliases=["login"])
 	auth_parser.add_argument("base_url", help="the base url of your eepyfileserver instance")
 	auth_parser.add_argument("password", nargs="?", help="password to login in your eepyfileserver instance", default=None)
+	auth_parser.add_argument("-c", "--custom-api-path", nargs="?", help="custom api path, default is /api/v1", default=None)
 	auth_parser.set_defaults(func=auth)
 
 	download_parser = subparser.add_parser("download", help="download a file", aliases=["get", "d"])
@@ -182,6 +256,7 @@ def main():
 
 	read_parser = subparser.add_parser("read", help="read a file", aliases=["cat"])
 	read_parser.add_argument("file_path", help="the efs path of the file to read")
+	read_parser.add_argument("-n", "--no-less", action="store_true", help="just print out the file contents if set")
 	read_parser.set_defaults(func=read)
 
 	upload_parser = subparser.add_parser("upload", help="upload a file", aliases=["post", "up", "put"])
@@ -218,6 +293,18 @@ def main():
 	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)
 
+	config_parser = subparser.add_parser("cli-config", help="view or change your cli config", aliases=["conf", "config"])
+	config_parser.add_argument("--reset", action="store_true", help="if set, resets your ENTIRE config")
+	config_parser.set_defaults(func=config)
+
+	efs_config_parser = subparser.add_parser("efs-config", help="view or change your eepyfileserver config", aliases=["efs-conf"])
+	efs_config_parser.add_argument("-v", "--verbose", action="store_true", help="prints info out if a key is not changed")
+	efs_config_parser.set_defaults(func=efs_config)
+
+	edit_parser = subparser.add_parser("edit", help="edit your files on efs remotely")
+	edit_parser.add_argument("file_path", help="the efs file path to edit")
+	edit_parser.set_defaults(func=edit)
+
 	args = parser.parse_args()
 	if args == Namespace():
 		args = parser.parse_args(["-h"])

{efs_cli-1.0.9 → efs_cli-1.1.1}/src/efs_cli.egg-info/PKG-INFO

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

efs_cli-1.0.9/src/efs_cli/__init__.py

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