efs-cli 1.1.0__tar.gz → 1.1.2__tar.gz

{efs_cli-1.1.0 → efs_cli-1.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.1.0
+Version: 1.1.2
 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.5
+Requires-Dist: efs-wrapper>=1.0.6
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)

{efs_cli-1.1.0 → efs_cli-1.1.2}/pyproject.toml

@@ -1,5 +1,5 @@
 [build-system]
-requires = ["setuptools >= 77.0.3", "requests >= 2.30", "efs-wrapper >= 1.0.5"]
+requires = ["setuptools >= 77.0.3", "requests >= 2.30", "efs-wrapper >= 1.0.6"]
 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.5"
+	"efs-wrapper >= 1.0.6"
 ]
 classifiers = [
 	"Programming Language :: Python :: 3",

efs_cli-1.1.2/src/efs_cli/__init__.py

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

{efs_cli-1.1.0 → efs_cli-1.1.2}/src/efs_cli/cli.py

@@ -42,8 +42,9 @@ def init_api():
 		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
@@ -51,7 +52,7 @@ 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, "editor": "nano"}, file)
+			json.dump({"base_url": None, "password": None, "custom_api_path": "/api/v1", "editor": "nano"}, file)
 		if reset:
 			print("Config reset")
 			sys.exit(0)
@@ -83,9 +84,16 @@ def efs_config(verbose, **__):
 	print("Config saved successfully")
 
 @exception_handler
-def auth(base_url, password, **__):
+def auth(base_url, password, custom_api_path, **__):
 	conf = get_conf()
-	data = {"base_url": base_url, "password": password, "editor": "nano"}
+	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)
@@ -155,9 +163,9 @@ def upload(from_path, to_path, **__):
 		sys.exit(1)
 
 @exception_handler
-def list_files(**__):
+def list_files(path, **__):
 	api = init_api()
-	print(api.get_filelist())
+	print(api.get_filelist(path))
 
 @exception_handler
 def remove(file_path, **__):
@@ -237,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"])
@@ -266,6 +275,7 @@ def main():
 	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.add_argument("path", nargs="?", help="the efs path to list files from", default=None)
 	list_files_parser.set_defaults(func=list_files)
 
 	remove_parser = subparser.add_parser("delete", help="delete a file", aliases=["remove", "rm"])
@@ -284,7 +294,7 @@ 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_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_cli-1.1.0 → efs_cli-1.1.2}/src/efs_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.1.0
+Version: 1.1.2
 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.5
+Requires-Dist: efs-wrapper>=1.0.6
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)

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

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

efs_cli-1.1.0/src/efs_cli/__init__.py

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

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

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