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.

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

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

Conversation

lhaeger
Copy link

@lhaeger lhaeger commented Jan 25, 2024

This hopefully may fix #282

Not a python developer myself, yet gave it a shot. Please forgive my ignorance, but I really need this...

Copy link
Contributor

@ThomasWaldmann ThomasWaldmann left a comment

Choose a reason for hiding this comment

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

Thanks for the PR!

See my suggestions for shorter and more compatible code (e.g. if users have old configs without these entries).

Can you please practically try the code after these changes?

src/bepasty/utils/date_funcs.py Show resolved Hide resolved
Comment on lines +15 to 18
value_default = current_app.config['DEFAULT_MAXLIFE_VALUE']
if value_default == None:
value_default = 'MONTHS'
value_default = '1'
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

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.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants