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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.1.2
+Version: 1.2.1
 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.6
+Requires-Dist: efs-wrapper>=1.1.0
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)
@@ -27,7 +27,7 @@ command line interface for eepyfileserver written in python
 ## prerequisites
 
 - python 3.10 (3.12+ recommended)
-- [`eepyfileserver`](https://codeberg.org/maxeepy/eepyfileserver) 1.1.0-alpha or later
+- [`eepyfileserver`](https://codeberg.org/maxeepy/eepyfileserver) 1.1.0-alpha (or later for some features, such as users)
 
 ## install
 
@@ -40,7 +40,7 @@ command line interface for eepyfileserver written in python
 ```bash
 #login fully (lets you upload and download files)
 #password is saved in PLAIN TEXT
-efs-cli auth "https://example.com" "password123" 
+efs-cli auth "https://example.com" "password123" --custom-api-path (optional) "/meow/v123"
 
 #login only using the url (lets you download PUBLIC files)
 efs-cli auth  "https://example.com"
@@ -48,6 +48,25 @@ efs-cli auth  "https://example.com"
 efs-cli login ...
 ```
 
+### see and edit your configs
+
+cli config
+
+```bash
+efs-cli config
+efs-cli config --reset # resets your entire config
+
+efs-cli conf
+efs-cli cli-config
+```
+
+efs config
+
+```bash
+efs-cli efs-config
+efs-cli efs-conf
+```
+
 ### view version
 
 ```bash
@@ -70,10 +89,30 @@ efs-cli ls
 efs-cli files
 ```
 
+### view file/directory metadata
+
+```bash
+efs-cli metadata <path> --public (optional) # uses public url
+efs-cli meta ...
+```
+
+### edit a file
+
+```bash
+efs-cli edit <file_path>
+```
+
+### get a url for a file
+
+```bash
+efs-cli url-for <file_path> --public (optional) --check-if-exists (optional) # --public uses public url, --check-if-exists checks if the file exists on efs
+efs-cli url ...
+```
+
 ### download a file
 
 ```bash
-efs-cli download /example.txt /home/maxeepy/Downloads/example.txt
+efs-cli download /example.txt /home/maxeepy/Downloads/example.txt --public (optional) # uses public url
 efs-cli get ...
 efs-cli d ...
 ```
@@ -87,6 +126,13 @@ efs-cli up ...
 efs-cli put ...
 ```
 
+### overwrite a file
+
+```bash
+efs-cli overwrite /home/maxeepy/Downloads/example.txt /example.txt
+efs-cli over ...
+```
+
 ### delete a file
 
 ```bash
@@ -99,5 +145,38 @@ efs-cli rm ...
 
 ```bash
 efs-cli read /example.txt
+efs-cli read /example.txt --no-less # doesn't use less
 efs-cli cat ...
 ```
+
+### list users
+
+```bash
+efs-cli users
+efs-cli listusers
+efs-cli lsu
+```
+
+### add a user
+
+```bash
+efs-cli adduser dir123 "rw" # or "ro"
+efs-cli auser ...
+efs-cli au ...
+```
+
+### change a user
+
+```bash
+efs-cli changeuser efskey_123 dir123 "rw" # or "ro"
+efs-cli chuser ...
+efs-cli chu ...
+```
+
+### remove a user
+
+```bash
+efs-cli removeuser efskey_123 --remove-dir (optional) # removes the user directory if set
+efs-cli rmuser ...
+efs-cli ru ...
+```

efs_cli-1.2.1/README.md

@@ -0,0 +1,160 @@
+# efs-cli (formerly eepyfileserver-cli)
+
+command line interface for eepyfileserver written in python
+
+## prerequisites
+
+- python 3.10 (3.12+ recommended)
+- [`eepyfileserver`](https://codeberg.org/maxeepy/eepyfileserver) 1.1.0-alpha (or later for some features, such as users)
+
+## install
+
+`pip install efs-cli`
+
+## usage
+
+### log in to an instance
+
+```bash
+#login fully (lets you upload and download files)
+#password is saved in PLAIN TEXT
+efs-cli auth "https://example.com" "password123" --custom-api-path (optional) "/meow/v123"
+
+#login only using the url (lets you download PUBLIC files)
+efs-cli auth  "https://example.com"
+
+efs-cli login ...
+```
+
+### see and edit your configs
+
+cli config
+
+```bash
+efs-cli config
+efs-cli config --reset # resets your entire config
+
+efs-cli conf
+efs-cli cli-config
+```
+
+efs config
+
+```bash
+efs-cli efs-config
+efs-cli efs-conf
+```
+
+### view version
+
+```bash
+efs-cli version
+efs-cli ver
+```
+
+### view instance information
+
+```bash
+efs-cli instance
+efs-cli info
+```
+
+### list files
+
+```bash
+efs-cli list
+efs-cli ls
+efs-cli files
+```
+
+### view file/directory metadata
+
+```bash
+efs-cli metadata <path> --public (optional) # uses public url
+efs-cli meta ...
+```
+
+### edit a file
+
+```bash
+efs-cli edit <file_path>
+```
+
+### get a url for a file
+
+```bash
+efs-cli url-for <file_path> --public (optional) --check-if-exists (optional) # --public uses public url, --check-if-exists checks if the file exists on efs
+efs-cli url ...
+```
+
+### download a file
+
+```bash
+efs-cli download /example.txt /home/maxeepy/Downloads/example.txt --public (optional) # uses public url
+efs-cli get ...
+efs-cli d ...
+```
+
+### upload a file
+
+```bash
+efs-cli upload /home/maxeepy/Downloads/example.txt /example.txt
+efs-cli post ...
+efs-cli up ...
+efs-cli put ...
+```
+
+### overwrite a file
+
+```bash
+efs-cli overwrite /home/maxeepy/Downloads/example.txt /example.txt
+efs-cli over ...
+```
+
+### delete a file
+
+```bash
+efs-cli delete /example.txt
+efs-cli remove ...
+efs-cli rm ...
+```
+
+### read a file
+
+```bash
+efs-cli read /example.txt
+efs-cli read /example.txt --no-less # doesn't use less
+efs-cli cat ...
+```
+
+### list users
+
+```bash
+efs-cli users
+efs-cli listusers
+efs-cli lsu
+```
+
+### add a user
+
+```bash
+efs-cli adduser dir123 "rw" # or "ro"
+efs-cli auser ...
+efs-cli au ...
+```
+
+### change a user
+
+```bash
+efs-cli changeuser efskey_123 dir123 "rw" # or "ro"
+efs-cli chuser ...
+efs-cli chu ...
+```
+
+### remove a user
+
+```bash
+efs-cli removeuser efskey_123 --remove-dir (optional) # removes the user directory if set
+efs-cli rmuser ...
+efs-cli ru ...
+```

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

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

efs_cli-1.2.1/src/efs_cli/__init__.py

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

{efs_cli-1.1.2 → efs_cli-1.2.1}/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):
@@ -32,8 +35,17 @@ def get_conf():
 		with open(CONFIG_PATH, "r") as file:
 			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)
+
 	return conf
 
+def format_tree(root, files, dirs,):
+	...
+
 def init_api():
 	conf = get_conf()
 	
@@ -70,7 +82,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:
@@ -229,15 +241,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()
@@ -306,6 +354,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.2 → efs_cli-1.2.1/src/efs_cli.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: efs-cli
-Version: 1.1.2
+Version: 1.2.1
 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.6
+Requires-Dist: efs-wrapper>=1.1.0
 Dynamic: license-file
 
 # efs-cli (formerly eepyfileserver-cli)
@@ -27,7 +27,7 @@ command line interface for eepyfileserver written in python
 ## prerequisites
 
 - python 3.10 (3.12+ recommended)
-- [`eepyfileserver`](https://codeberg.org/maxeepy/eepyfileserver) 1.1.0-alpha or later
+- [`eepyfileserver`](https://codeberg.org/maxeepy/eepyfileserver) 1.1.0-alpha (or later for some features, such as users)
 
 ## install
 
@@ -40,7 +40,7 @@ command line interface for eepyfileserver written in python
 ```bash
 #login fully (lets you upload and download files)
 #password is saved in PLAIN TEXT
-efs-cli auth "https://example.com" "password123" 
+efs-cli auth "https://example.com" "password123" --custom-api-path (optional) "/meow/v123"
 
 #login only using the url (lets you download PUBLIC files)
 efs-cli auth  "https://example.com"
@@ -48,6 +48,25 @@ efs-cli auth  "https://example.com"
 efs-cli login ...
 ```
 
+### see and edit your configs
+
+cli config
+
+```bash
+efs-cli config
+efs-cli config --reset # resets your entire config
+
+efs-cli conf
+efs-cli cli-config
+```
+
+efs config
+
+```bash
+efs-cli efs-config
+efs-cli efs-conf
+```
+
 ### view version
 
 ```bash
@@ -70,10 +89,30 @@ efs-cli ls
 efs-cli files
 ```
 
+### view file/directory metadata
+
+```bash
+efs-cli metadata <path> --public (optional) # uses public url
+efs-cli meta ...
+```
+
+### edit a file
+
+```bash
+efs-cli edit <file_path>
+```
+
+### get a url for a file
+
+```bash
+efs-cli url-for <file_path> --public (optional) --check-if-exists (optional) # --public uses public url, --check-if-exists checks if the file exists on efs
+efs-cli url ...
+```
+
 ### download a file
 
 ```bash
-efs-cli download /example.txt /home/maxeepy/Downloads/example.txt
+efs-cli download /example.txt /home/maxeepy/Downloads/example.txt --public (optional) # uses public url
 efs-cli get ...
 efs-cli d ...
 ```
@@ -87,6 +126,13 @@ efs-cli up ...
 efs-cli put ...
 ```
 
+### overwrite a file
+
+```bash
+efs-cli overwrite /home/maxeepy/Downloads/example.txt /example.txt
+efs-cli over ...
+```
+
 ### delete a file
 
 ```bash
@@ -99,5 +145,38 @@ efs-cli rm ...
 
 ```bash
 efs-cli read /example.txt
+efs-cli read /example.txt --no-less # doesn't use less
 efs-cli cat ...
 ```
+
+### list users
+
+```bash
+efs-cli users
+efs-cli listusers
+efs-cli lsu
+```
+
+### add a user
+
+```bash
+efs-cli adduser dir123 "rw" # or "ro"
+efs-cli auser ...
+efs-cli au ...
+```
+
+### change a user
+
+```bash
+efs-cli changeuser efskey_123 dir123 "rw" # or "ro"
+efs-cli chuser ...
+efs-cli chu ...
+```
+
+### remove a user
+
+```bash
+efs-cli removeuser efskey_123 --remove-dir (optional) # removes the user directory if set
+efs-cli rmuser ...
+efs-cli ru ...
+```

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

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

efs_cli-1.1.2/README.md

@@ -1,81 +0,0 @@
-# efs-cli (formerly eepyfileserver-cli)
-
-command line interface for eepyfileserver written in python
-
-## prerequisites
-
-- python 3.10 (3.12+ recommended)
-- [`eepyfileserver`](https://codeberg.org/maxeepy/eepyfileserver) 1.1.0-alpha or later
-
-## install
-
-`pip install efs-cli`
-
-## usage
-
-### log in to an instance
-
-```bash
-#login fully (lets you upload and download files)
-#password is saved in PLAIN TEXT
-efs-cli auth "https://example.com" "password123" 
-
-#login only using the url (lets you download PUBLIC files)
-efs-cli auth  "https://example.com"
-
-efs-cli login ...
-```
-
-### view version
-
-```bash
-efs-cli version
-efs-cli ver
-```
-
-### view instance information
-
-```bash
-efs-cli instance
-efs-cli info
-```
-
-### list files
-
-```bash
-efs-cli list
-efs-cli ls
-efs-cli files
-```
-
-### download a file
-
-```bash
-efs-cli download /example.txt /home/maxeepy/Downloads/example.txt
-efs-cli get ...
-efs-cli d ...
-```
-
-### upload a file
-
-```bash
-efs-cli upload /home/maxeepy/Downloads/example.txt /example.txt
-efs-cli post ...
-efs-cli up ...
-efs-cli put ...
-```
-
-### delete a file
-
-```bash
-efs-cli delete /example.txt
-efs-cli remove ...
-efs-cli rm ...
-```
-
-### read a file
-
-```bash
-efs-cli read /example.txt
-efs-cli cat ...
-```

efs_cli-1.1.2/src/efs_cli/__init__.py

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

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

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