Skip to content
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

Jump to bottom

Add DEFAULT_MAXLIFE_VALUE and DEFAULT_MAXLIFE_UNIT config params #322

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

Add DEFAULT_MAXLIFE_VALUE and DEFAULT_MAXLIFE_UNIT config params #322

Show file tree
Hide file tree
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
6 changes: 6 additions & 0 deletions src/bepasty/config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,12 @@ class Config:
#: Filesystem storage path
STORAGE_FILESYSTEM_DIRECTORY = '/tmp/'

#: Default lifetime for uploads
#: Supported units:
#: 'MINUTES', 'HOURS', 'DAYS', 'WEEKS', 'MONTHS', 'YEARS', 'FOREVER'
DEFAULT_MAXLIFE_VALUE = 1
DEFAULT_MAXLIFE_UNIT = 'MONTHS'

#: server secret key needed for safe session cookies.
#: you must set a very long, very random, very secret string here,
#: otherwise bepasty will not work (and crash when trying to log in)!
Expand Down
7 changes: 6 additions & 1 deletion src/bepasty/utils/date_funcs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,14 @@

def get_maxlife(data, underscore):
unit_key = 'maxlife_unit' if underscore else 'maxlife-unit'
unit_default = 'MONTHS'
unit_default = current_app.config['DEFAULT_MAXLIFE_UNIT']
if unit_default == None:
unit_default = 'MONTHS'
lhaeger marked this conversation as resolved.
Show resolved Hide resolved
unit = data.get(unit_key, unit_default).upper()
value_key = 'maxlife_value' if underscore else 'maxlife-value'
value_default = current_app.config['DEFAULT_MAXLIFE_VALUE']
if value_default == None:
value_default = 'MONTHS'
value_default = '1'
Comment on lines +15 to 18
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
value_default = current_app.config['DEFAULT_MAXLIFE_VALUE']
if value_default == None:
value_default = 'MONTHS'
value_default = '1'
value_default = current_app.config.get('DEFAULT_MAXLIFE_VALUE', '1')

Copy link
Author

@lhaeger lhaeger Jan 26, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks much nicer - but the values from bepasty.conf do not get picked up in the web UI.

I'm testing with https://hub.docker.com/r/asmaps/bepasty, editing the code in /usr/local/lib/python3.9/site-packages/bepasty/ if that makes a difference.

Does templates/index.html need some modification, maybe? <select class="form-control" name="maxlife-unit" size="1"> seems to always pick the first option, which is "Months"...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, yes, guess it needs to generate different html, making this a bit more complicated...

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

And that's where my experience ends, unfortunately. Hopefully someone else can chime in.

I'll probably edit index.html in a custom docker image for now...

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thinking about whether we could just have a fixed unit (e.g. days) and maybe allow a float value also.

That would be much easier overall, but also require a bigger change in the code and templates. Also, one would need to check the documented api and client code, whether we can do such a change without breaking existing clients.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note:

https://github.com/bepasty/bepasty-client-cli that client uses the existing unit/value web api.

try:
value = int(data.get(value_key, value_default))
Expand Down