efs-cli 1.2.1__tar.gz → 1.2.3__tar.gz

{efs_cli-1.2.1/src/efs_cli.egg-info → efs_cli-1.2.3}/PKG-INFO

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

efs_cli-1.2.3/src/efs_cli/__init__.py

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

{efs_cli-1.2.1 → efs_cli-1.2.3}/src/efs_cli/cli.py

@@ -2,6 +2,7 @@ from . import __version__ as version
 from efs_wrapper import __version__ as wrapper_version
 from efs_wrapper.v1 import EepyFileServer, EepyFileServerPublic, DiskUsageObject
 from argparse import ArgumentParser, Namespace
+from shutil import which
 import os
 import pathlib
 from tempfile import NamedTemporaryFile
@@ -12,6 +13,8 @@ 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")
 
+DEFAULT_EDITOR = "nano"
+
 def exception_handler(func):
 	def wrapper(*args, **kwargs):
 		try:
@@ -36,10 +39,14 @@ def get_conf():
 			conf = json.load(file)
 
 	if conf:
-		editor = conf.get("editor", "nano")
-		if "sudo" in editor or "rm" in editor or "rm -rf" in editor:
-			print("there cannot be 'sudo', 'rm' or 'rm -rf' in the editor command")
-			sys.exit(1)
+		editor = conf.get("editor", DEFAULT_EDITOR)
+		editor = editor.split(" ")[0]
+		if which(editor):
+			conf.update({"editor": editor})
+		else:
+			print("editor path does not exist")
+			print(f"using default editor, {DEFAULT_EDITOR}")
+			conf.update({"editor": DEFAULT_EDITOR})
 
 	return conf
 
@@ -64,23 +71,23 @@ 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)
+			json.dump({"base_url": None, "password": None, "custom_api_path": "/api/v1", "editor": DEFAULT_EDITOR}, file)
 		if reset:
 			print("Config reset")
 			sys.exit(0)
-	editor = conf.get("editor", "nano")
+	editor = conf.get("editor", DEFAULT_EDITOR)
 
 	status = os.system(f"{editor} {CONFIG_PATH}")
 	if status:
-		print("using default editor: nano")
-		os.system(f"nano {CONFIG_PATH}")
+		print(f"using default editor: {DEFAULT_EDITOR}")
+		os.system(f"{DEFAULT_EDITOR} {CONFIG_PATH}")
 	print("Config saved successfully")
 
 @exception_handler
 def efs_config(verbose, **__):
 	conf = get_conf()
 	api = init_api()
-	editor = conf.get("editor", "nano")
+	editor = conf.get("editor", DEFAULT_EDITOR)
 	if not hasattr(api, "get_config"):
 		print("Login using 'efs-cli auth <base url> <root_password>' to get and change the config")
 		sys.exit(1)
@@ -90,8 +97,8 @@ def efs_config(verbose, **__):
 		tmp.seek(0)
 		status = os.system(f"{editor} {tmp.name}")
 		if status:
-			print("using default editor: nano")
-			os.system(f"nano {tmp.name}")
+			print(f"using default editor: {DEFAULT_EDITOR}")
+			os.system(f"{DEFAULT_EDITOR} {tmp.name}")
 		api.update_config(json.load(tmp), _print_warnings = verbose)
 	print("Config saved successfully")
 
@@ -105,7 +112,7 @@ def auth(base_url, password, custom_api_path, **__):
 	if base_url.endswith("/"):
 		base_url = base_url[:-1]
 
-	data = {"base_url": base_url, "password": password, "custom_api_path": custom_api_path, "editor": "nano"}
+	data = {"base_url": base_url, "password": password, "custom_api_path": custom_api_path, "editor": DEFAULT_EDITOR}
 	
 	if conf is not None:
 		conf.update(data)
@@ -147,7 +154,7 @@ def read(file_path, no_less, **__):
 def edit(file_path, **__):
 	api = init_api()
 	conf = get_conf()
-	editor = conf.get("editor", "nano")
+	editor = conf.get("editor", DEFAULT_EDITOR)
 	if not hasattr(api, "overwrite_file"):	
 		print("Login using 'efs-cli auth <base url> <password>' to overwrite files")
 		sys.exit(1)
@@ -158,8 +165,8 @@ def edit(file_path, **__):
 		tmp.seek(0)
 		status = os.system(f"{editor} {tmp.name}")
 		if status:
-			print("using default editor: nano")
-			os.system(f"nano {tmp.name}")
+			print(f"using default editor: {DEFAULT_EDITOR}")
+			os.system(f"{DEFAULT_EDITOR} {tmp.name}")
 		api.overwrite_file(file_path, tmp)
 		print(f"{file_path} overwritten")
 

{efs_cli-1.2.1 → efs_cli-1.2.3/src/efs_cli.egg-info}/PKG-INFO

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

efs_cli-1.2.1/src/efs_cli/__init__.py

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