ninjajiraiya
/
devine
forked from DRMTalks/devine
1
0
Fork 0
Code Pull Requests Activity

Replace console.log calls with padded console.prints 

While console.log is currently removing the need for `Padding(..., (0, 5))` as it is overwritten to do it automatically, but in terms of purpose the `console.print` function is more logical.

I hope to find a way to automate the padding within console.print in the future, but for now this will work.
This commit is contained in:
rlaphoenix 2023-02-26 23:35:40 +00:00
parent eb3f268d64
commit 7560ee96c9
1 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
devine/commands/dl.py
View File

@ -296,7 +296,10 @@ class dl:
(1, 2) (1, 2)
)) ))
console.log(titles.tree(verbose=list_titles)) console.print(Padding(
titles.tree(verbose=list_titles),
(0, 5)
))
if list_titles: if list_titles:
return return
@ -340,7 +343,10 @@ class dl:
if list_: if list_:
available_tracks, _ = title.tracks.tree() available_tracks, _ = title.tracks.tree()
console.log(Panel(available_tracks, title="Available Tracks")) console.print(Padding(
Panel(available_tracks, title="Available Tracks"),
(0, 5)
))
continue continue
with console.status("Selecting tracks...", spinner="dots"): with console.status("Selecting tracks...", spinner="dots"):
@ -555,7 +561,10 @@ class dl:
downloaded_table = Table.grid(expand=True) downloaded_table = Table.grid(expand=True)
downloaded_table.add_row("Download Finished! :tada:") downloaded_table.add_row("Download Finished! :tada:")
downloaded_table.add_row(Text(str(final_path), overflow="fold")) downloaded_table.add_row(Text(str(final_path), overflow="fold"))
console.log(Padding(downloaded_table, (0, 0, 1, 0))) console.print(Padding(
downloaded_table,
(0, 5, 1, 5)
))
# update cookies # update cookies
cookie_file = config.directories.cookies / service.__class__.__name__ / f"{self.profile}.txt" cookie_file = config.directories.cookies / service.__class__.__name__ / f"{self.profile}.txt"
@ -570,9 +579,9 @@ class dl:
hours, minutes = divmod(minutes, 60) hours, minutes = divmod(minutes, 60)
time_string = (f"{hours:d}h" if hours else "") + f"{minutes:d}m{seconds:d}s" time_string = (f"{hours:d}h" if hours else "") + f"{minutes:d}m{seconds:d}s"
console.log(Padding( console.print(Padding(
f"Processed all titles in [progress.elapsed]{time_string}", f"Processed all titles in [progress.elapsed]{time_string}",
(0, 0, 1, 0) (0, 5, 1, 5)
)) ))
def prepare_drm( def prepare_drm(