summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMicah Lee <micah@micahflee.com>2019-09-15 17:06:03 -0700
committerMicah Lee <micah@micahflee.com>2019-09-15 17:06:03 -0700
commitb000ef30990337e887644e3543b5eb9bdbdff94d (patch)
tree93a54c135ba23ccdf234bc5799119f5ec2b8f568
parentbb0908d6a3a8e51c938c22e24b5fa62c7cd05483 (diff)
downloadonionshare-b000ef30990337e887644e3543b5eb9bdbdff94d.tar.gz
onionshare-b000ef30990337e887644e3543b5eb9bdbdff94d.zip
Validate filenames, and require filenames be passed in, in website mode as well as share mode
-rw-r--r--onionshare/__init__.py13
1 files changed, 7 insertions, 6 deletions
diff --git a/onionshare/__init__.py b/onionshare/__init__.py
index 7e7798f8..65e605f6 100644
--- a/onionshare/__init__.py
+++ b/onionshare/__init__.py
@@ -88,13 +88,14 @@ def main(cwd=None):
else:
mode = 'share'
- # Make sure filenames given if not using receiver mode
- if mode == 'share' and len(filenames) == 0:
- parser.print_help()
- sys.exit()
+ # In share an website mode, you must supply a list of filenames
+ if mode == 'share' or mode == 'website':
+ # Make sure filenames given if not using receiver mode
+ if len(filenames) == 0:
+ parser.print_help()
+ sys.exit()
- # Validate filenames
- if mode == 'share':
+ # Validate filenames
valid = True
for filename in filenames:
if not os.path.isfile(filename) and not os.path.isdir(filename):