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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.1.1
+Version: 1.2.0
 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.1.0
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)

{efs_cli-1.1.1 → efs_cli-1.2.0}/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.1.0"]
 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.1.0"
 ]
 classifiers = [
 	"Programming Language :: Python :: 3",

efs_cli-1.2.0/src/efs_cli/__init__.py

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

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

@@ -16,6 +16,9 @@ def exception_handler(func):
 	def wrapper(*args, **kwargs):
 		try:
 			func(*args, **kwargs)
+		except KeyError:
+			print("Error: no such file or directory")
+			sys.exit(1)
 		except Exception as exc:
 			if len(exc.args) == 2:
 				if isinstance(exc.args[1], int):
@@ -70,7 +73,7 @@ def efs_config(verbose, **__):
 	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")
+		print("Login using 'efs-cli auth <base url> <root_password>' to get and change the config")
 		sys.exit(1)
 	data = api.get_config()
 	with NamedTemporaryFile(suffix = ".json", mode="w+") as tmp:
@@ -163,9 +166,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, **__):
@@ -229,15 +232,51 @@ def metadata(path, public, **__):
 		api = api.public
 		if path.startswith("/public"):
 			path = path.removeprefix("/public")
-	if api.is_file(path):
+	if api.is_file(path, check_if_exists = True):
 		print(api.get_file(path).metadata.to_dict())
-		return
-	if api.is_directory(path):
+		sys.exit(0)
+	if api.is_directory(path, check_if_exists = True):
 		print(api.get_tree(path))
-		return
+		sys.exit(0)
 	print(f"{path} does not exist or is not a file or a directory")
 	sys.exit(1)
 
+def list_users(**__):
+	api = init_api()
+	if not hasattr(api, "get_users"):
+		print("Login using efs-cli auth <base url> <password> to list users")
+		sys.exit(1)
+	for password, values in api.get_users().items():
+		dir, perms = values["directory"], values["permissions"]
+		print(f"[{dir}] {password}:")
+		print(f"  Directory: {dir}")
+		print(f"  Permissions: {perms}")
+
+def add_user(directory, permissions, **__):
+	api = init_api()
+	if not hasattr(api, "add_user"):
+		print("Login using efs-cli auth <base url> <root_password> to add users")
+		sys.exit(1)
+	out = api.add_user(directory, permissions)
+	print(f"Added user with directory of '{directory}' and permissions '{permissions}'")
+	print(f"User password: {out['password']}")
+
+def change_user(password, directory, permissions, **__):
+	api = init_api()
+	if not hasattr(api, "change_user"):
+		print("Login using efs-cli auth <base url> <root_password> to change users")
+		sys.exit(1)
+	api.change_user(password, directory, permissions)
+	print("Changed user directory or/and permissions")
+
+def remove_user(password, remove_dir, **__):
+	api = init_api()
+	if not hasattr(api, "remove_user"):
+		print("Login using efs-cli auth <base url> <root_password> to remove users")
+		sys.exit(1)
+	api.remove_user(password, remove_dir)
+	print("User deleted")
+
 def main():
 	parser = ArgumentParser("efs-cli", description="eepyfileserver cli tool for downloading and uploading files")
 	subparser = parser.add_subparsers()
@@ -275,6 +314,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"])
@@ -305,6 +345,25 @@ def main():
 	edit_parser.add_argument("file_path", help="the efs file path to edit")
 	edit_parser.set_defaults(func=edit)
 
+	list_users_parser = subparser.add_parser("users", help="view current users on your eepyfileserver instance", aliases=["listusers", "lsu"])
+	list_users_parser.set_defaults(func=list_users)
+
+	add_user_parser = subparser.add_parser("adduser", help="add a user to your eepyfileserver instance", aliases=["auser", "au"])
+	add_user_parser.add_argument("directory", help="the name of their directory on eepyfileserver")
+	add_user_parser.add_argument("permissions", help="permissions they will have on their directory" , choices=["rw", "ro"])
+	add_user_parser.set_defaults(func=add_user)
+
+	change_user_parser = subparser.add_parser("changeuser", help="change a user directory or permissions on your eepyfileserver instance", aliases=["chuser", "chu"])
+	change_user_parser.add_argument("password", help="a password of a user on eepyfileserver")
+	change_user_parser.add_argument("directory", help="the name of their directory on eepyfileserver")
+	change_user_parser.add_argument("permissions", help="permissions they will have on their directory" , choices=["rw", "ro"])
+	change_user_parser.set_defaults(func=change_user)
+
+	remove_user_parser = subparser.add_parser("removeuser", help="remove a user from your eepyfileserver instance", aliases=["ru", "rmuser"])
+	remove_user_parser.add_argument("password", help="a password of a user on eepyfileserver")
+	remove_user_parser.add_argument("-r", "--remove-dir", action="store_true", help="deletes the user directory entirely if set")
+	remove_user_parser.set_defaults(func=remove_user)
+
 	args = parser.parse_args()
 	if args == Namespace():
 		args = parser.parse_args(["-h"])

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.1.1
+Version: 1.2.0
 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.1.0
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)

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

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

efs_cli-1.1.1/src/efs_cli/__init__.py

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

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

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