mirrors/ArchiveBox
1
0
Fork 0
mirror of https://github.com/ArchiveBox/ArchiveBox.git synced 2025-05-15 07:34:27 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

better archivebox schedule CLI UX

Browse source
This commit is contained in:
Nick Sweeting 2020-08-18 04:39:58 -04:00
parent ec5609a09a
commit f8eb245519
1 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

20
archivebox/main.py
View file

@ -940,6 +940,11 @@ def schedule(add: bool=False,
cron = CronTab(user=True) cron = CronTab(user=True)
cron = dedupe_cron_jobs(cron) cron = dedupe_cron_jobs(cron)
if clear:
print(cron.remove_all(comment=CRON_COMMENT))
cron.write()
raise SystemExit(0)
existing_jobs = list(cron.find_comment(CRON_COMMENT)) existing_jobs = list(cron.find_comment(CRON_COMMENT))
if every or add: if every or add:
@ -951,9 +956,9 @@ def schedule(add: bool=False,
'&&', '&&',
quoted(ARCHIVEBOX_BINARY), quoted(ARCHIVEBOX_BINARY),
*(['add', f'--depth={depth}', f'"{import_path}"'] if import_path else ['update']), *(['add', f'--depth={depth}', f'"{import_path}"'] if import_path else ['update']),
'2>&1',
'>', '>',
quoted(os.path.join(LOGS_DIR, 'archivebox.log')), quoted(os.path.join(LOGS_DIR, 'archivebox.log')),
'2>&1',
] ]
new_job = cron.new(command=' '.join(cmd), comment=CRON_COMMENT) new_job = cron.new(command=' '.join(cmd), comment=CRON_COMMENT)
@ -997,11 +1002,6 @@ def schedule(add: bool=False,
stderr(' archivebox schedule --every=[timeperiod] https://example.com/some/rss/feed.xml') stderr(' archivebox schedule --every=[timeperiod] https://example.com/some/rss/feed.xml')
raise SystemExit(0) raise SystemExit(0)
elif clear:
print(cron.remove_all(comment=CRON_COMMENT))
cron.write()
raise SystemExit(0)
cron = CronTab(user=True) cron = CronTab(user=True)
cron = dedupe_cron_jobs(cron) cron = dedupe_cron_jobs(cron)
existing_jobs = list(cron.find_comment(CRON_COMMENT)) existing_jobs = list(cron.find_comment(CRON_COMMENT))
@ -1016,10 +1016,11 @@ def schedule(add: bool=False,
if run_all: if run_all:
try: try:
for job in existing_jobs: for job in existing_jobs:
sys.stdout.write(f' > {job.command}') sys.stdout.write(f' > {job.command.split("/archivebox ")[0].split(" && ")[0]}\n')
sys.stdout.write(f' > {job.command.split("/archivebox ")[-1].split(" > ")[0]}')
sys.stdout.flush() sys.stdout.flush()
job.run() job.run()
sys.stdout.write(f'\r √ {job.command}\n') sys.stdout.write(f'\r √ {job.command.split("/archivebox ")[-1]}\n')
except KeyboardInterrupt: except KeyboardInterrupt:
print('\n{green}[√] Stopped.{reset}'.format(**ANSI)) print('\n{green}[√] Stopped.{reset}'.format(**ANSI))
raise SystemExit(1) raise SystemExit(1)
@ -1027,8 +1028,7 @@ def schedule(add: bool=False,
if foreground: if foreground:
try: try:
for job in existing_jobs: for job in existing_jobs:
sys.stdout.write(f' > {job.command}') print(f' > {job.command.split("/archivebox ")[-1].split(" > ")[0]}')
sys.stdout.flush()
for result in cron.run_scheduler(): for result in cron.run_scheduler():
print(result) print(result)
except KeyboardInterrupt: except KeyboardInterrupt: