Skip to content

fixes-issue-91 #165

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
valtersg wants to merge 1 commit into
base: 5.2.0
Choose a base branch
from
Open

fixes-issue-91 #165

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 20 additions & 7 deletions psconfig/perfsonar-psconfig/bin/commands/published
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,15 @@ parser = argparse.ArgumentParser(
description='Lists published JSON documents'
)
parser.add_argument('--directory', '-d', dest='dir', action='store', default='/usr/lib/perfsonar/web-psconfig', help='Output directory where file will be published')
subparsers = parser.add_subparsers(title='subcommands', dest='subcommand')
delete_parser = subparsers.add_parser('delete', help='Delete published JSON documents')
delete_parser.add_argument('files', nargs='*', action='store', help='Specific files to delete')
delete_parser.add_argument('--all', action='store_true', help='Delete all published files')
args = parser.parse_args()

if args.subcommand == 'delete' and (not args.all and not args.files):
delete_parser.error("delete requires at least one of --all or a list of files")

#Init CLI utility
cli = CLIUtil()

Expand All @@ -30,10 +37,16 @@ for dir_entry in os.scandir(args.dir):
if not dir_entry.is_file() or not dir_entry.name.endswith(".json"):
continue
empty = False
print("\n[{}]".format(dir_entry.name))
print(" Local File: {}/{}".format(args.dir.rstrip('/'), dir_entry.name))
print(" Web URL: {}/{}".format(base_url, dir_entry.name))
if empty:
cli.print_msg("No files currently published")
else:
cli.print_msg("")
if args.subcommand is None:
print("\n[{}]".format(dir_entry.name))
print(" Local File: {}/{}".format(args.dir.rstrip('/'), dir_entry.name))
print(" Web URL: {}/{}".format(base_url, dir_entry.name))
elif args.subcommand == 'delete':
if args.all or dir_entry.name in args.files:
print("Deleting {}".format(dir_entry.path))
os.remove(dir_entry.path)
if args.subcommand is None:
if empty:
cli.print_msg("No files currently published")
else:
cli.print_msg("")
Loading