Skip to content

Add support for ticket validity in configuration #80

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
clemens-it wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support for ticket validity in configuration #80

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
28 changes: 27 additions & 1 deletion client/dl-cli.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,10 +68,17 @@ def progress(download_t, download_d, upload_t, upload_d):

if not filename:
filename = os.path.basename(path)

msg = {}
# add ticket parameters, if present/configured
for p in ['ticket_total', 'ticket_lastdl', 'ticket_maxdl']:
if p in params:
msg[p] = params[p]

c.setopt(c.HTTPPOST, [
("file", (c.FORM_FILE, path.encode(sys.getfilesystemencoding()),
c.FORM_FILENAME, filename.encode('utf8'))),
("msg", json.dumps({}))])
("msg", json.dumps(msg))])

try:
c.perform()
Expand Down Expand Up @@ -212,6 +219,25 @@ def main():
die("fingerprint doesn't look like a valid hex-encoded SHA256 hash")
cfg['fingerprint'] = 'sha256//' + binascii.b2a_base64(binascii.a2b_hex(fp))[:-1]

# Parameters for ticket validity
if 'total_days' in cfg:
try:
cfg['ticket_total'] = v.check('integer(min=0)', cfg['total_days']) * 86400
except validate.ValidateError:
die("Value for \"total_days\" in configuration file is not a positive integer.")

if 'days_after_dl' in cfg:
try:
cfg['ticket_lastdl'] = v.check('integer(min=0)', cfg['days_after_dl']) * 86400
except validate.ValidateError:
die("Value for \"days_after_dl\" in configuration file is not a positive integer.")

if 'downloads' in cfg:
try:
cfg['ticket_maxdl'] = v.check('integer(min=0)', cfg['downloads'])
except validate.ValidateError:
die("Value for \"downloads\" in configuration file is not a positive integer.")

try:
if args.file:
if len(args.file) == 1:
Expand Down