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

Force refresh upload_id after a submission #303

Merged
merged 2 commits into from
Sep 13, 2024
Merged

Force refresh upload_id after a submission #303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b45473c
Force refresh `upload_id` after a submission
monodera Sep 13, 2024
d3b39af
v3.2.1
monodera Sep 13, 2024
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
2 changes: 1 addition & 1 deletion src/pfs_target_uploader/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "3.2.0"
__version__ = "3.2.1"
1 change: 1 addition & 0 deletions src/pfs_target_uploader/pn_app.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -583,6 +583,7 @@ def cb_submit(event):
],
disabled=True,
)
panel_input.assign_secret_token()
panel_timer.timer(False)

# set callback to the buttons
Expand Down
12 changes: 8 additions & 4 deletions src/pfs_target_uploader/widgets/FileInputWidgets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,11 @@ def reset(self):
self.file_input.mime_type = None
self.file_input.value = None

def assign_secret_token(self, nbytes=8):
st = secrets.token_hex(nbytes)
self.secret_token = st
logger.info(f"Assigning a new secret token as an upload_id: {st}")

def validate(self, date_begin=None, date_end=None, warn_threshold=100000):
t_start = time.time()
if date_begin >= date_end:
Expand All @@ -75,15 +80,14 @@ def validate(self, date_begin=None, date_end=None, warn_threshold=100000):
or (self.file_input.value != self.previous_value)
or (self.file_input.mime_type != self.previous_mime_type)
):
st = secrets.token_hex(8)

self.assign_secret_token()

logger.info("New file detected.")
logger.info(f" Upload ID updated: {st}")
logger.info(f" Upload ID updated: {self.secret_token}")
logger.info(f" Filename: {self.file_input.filename}")
logger.info(f" MIME Type: {self.file_input.mime_type}")

self.secret_token = st

self.previous_filename = self.file_input.filename
self.previous_value = self.file_input.value
self.previous_mime_type = self.file_input.mime_type
Expand Down