diff options
| author | Micah Lee <micah@micahflee.com> | 2019-09-15 17:56:36 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-15 17:56:36 -0700 |
| commit | e35255861fd17d77096a6b9ef386271d066f1055 (patch) | |
| tree | 93a54c135ba23ccdf234bc5799119f5ec2b8f568 | |
| parent | bb0908d6a3a8e51c938c22e24b5fa62c7cd05483 (diff) | |
| parent | b000ef30990337e887644e3543b5eb9bdbdff94d (diff) | |
| download | onionshare-e35255861fd17d77096a6b9ef386271d066f1055.tar.gz onionshare-e35255861fd17d77096a6b9ef386271d066f1055.zip | |
Merge pull request #1026 from micahflee/992_website_misc
Validate filenames in CLI for website mode
| -rw-r--r-- | onionshare/__init__.py | 13 |
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): |