Skip to content

Make URLs clickable [in "Tasks" view] #115

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

Merged
merged 2 commits into from
Jan 31, 2024
Merged

Make URLs clickable [in "Tasks" view] #115

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
875111c
Make video URLs clickable
deldesir Jan 31, 2024
d0078e7
Readd comment
deldesir Jan 31, 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
14 changes: 8 additions & 6 deletions cps/tasks/download.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ def __init__(self, task_message, media_url, original_url, current_user_name, she
super(TaskDownload, self).__init__(task_message)
self.message = task_message
self.media_url = media_url
self.media_url_link = f'<a href="{media_url}" target="_blank">{media_url}</a>'
self.original_url = original_url
self.current_user_name = current_user_name
self.shelf_id = shelf_id
Expand Down Expand Up @@ -60,7 +61,7 @@ def run(self, worker_thread):
elif re.search(pattern_progress, line):
percentage = int(re.search(r'\d+', line).group())
if percentage < 100:
self.message = f"Downloading {self.media_url}..."
self.message = f"Downloading {self.media_url_link}..."
self.progress = min(0.99, (complete_progress_cycle + (percentage / 100)) / 4)
if percentage == 100:
complete_progress_cycle += 1
Expand All @@ -86,7 +87,7 @@ def run(self, worker_thread):
return
except sqlite3.Error as db_error:
log.error("An error occurred while trying to connect to the database: %s", db_error)
self.message = f"{self.media_url} failed to download: {db_error}"
self.message = f"{self.media_url_link} failed to download: {db_error}"

conn.close()

Expand All @@ -95,15 +96,16 @@ def run(self, worker_thread):
if response.status_code == 200:
log.info("Successfully sent the requested file to %s", self.original_url)
file_downloaded = response.json()["file_downloaded"]
self.message = f"Successfully downloaded {self.media_url} to {file_downloaded}"
self.message = f"Successfully downloaded {self.media_url_link} to <br><br>{file_downloaded}"

self.progress = 1.0
else:
log.error("Failed to send the requested file to %s", self.original_url)
self.message = f"{self.media_url} failed to download: {response.status_code} {response.reason}"
self.message = f"{self.media_url_link} failed to download: {response.status_code} {response.reason}"

except Exception as e:
log.error("An error occurred during the subprocess execution: %s", e)
self.message = f"{self.media_url} failed to download: {e}"
self.message = f"{self.media_url_link} failed to download: {e}"

finally:
if p.returncode == 0 or self.progress == 1.0:
Expand All @@ -119,7 +121,7 @@ def name(self):
return N_("Download")

def __str__(self):
return f"Download task for {self.media_url}"
return f"Download task for {self.media_url_link}"

@property
def is_cancellable(self):
Expand Down