From ba54b7b1958b75376e9ab969f4fb8c9cf983588a Mon Sep 17 00:00:00 2001 From: Bucket Of Chicken <122376377+notdraimdev@users.noreply.github.com> Date: Tue, 1 Oct 2024 19:18:30 +0200 Subject: [PATCH] Better downloader (#10) * Better downloader * new version --- Download.png | Bin 0 -> 769 bytes ...ube_logo.png.import => Download.png.import | 8 +-- Main.tscn | 68 +++++++++++------- Youtube_logo.png | Bin 9626 -> 0 bytes addons/discord-rpc-gd/restart_window.tscn | 6 +- addons/godot-yt-dlp/src/yt_dlp.gd | 4 +- help_button.gd | 14 ++++ yt_tab_button.gd | 10 ++- 8 files changed, 77 insertions(+), 33 deletions(-) create mode 100644 Download.png rename Youtube_logo.png.import => Download.png.import (68%) delete mode 100644 Youtube_logo.png create mode 100644 help_button.gd diff --git a/Download.png b/Download.png new file mode 100644 index 0000000000000000000000000000000000000000..c2d7b0621ae0853b8ce3fa541522d118234529c8 GIT binary patch literal 769 zcmeAS@N?(olHy`uVBq!ia0vp^4j|0I1|(Ny7T#lEU~J8Fb`J1#c2+1T%1_J8No8Qr zm{>c}*5h!1NUQ&4ucaX(ZxtR*SZHZ(hf@u1Vns^P@Kpmb_3>y*FJX>PW@Ik9OyFKmTyAw&B7WqpLh;7+0l9zI2H> z^ECYE18t`di42T9UT3aMo_SQq=Jo4&RV&{m*___}{`{+8E;Z&FrH?X~dAlo`E7C4s zvV1S>9uXPTalTWXXP3f9E4!cSrKLKn&Qt5tTIKfB z>0D~-XR-9HQR#21KZ&<--|}jEy~S0f*+6JCgMtle3hJ^%3+ z#uJy;Ov`U*c23yia`Uy^`*&~W-QI8e_UB&)3-_Y_rOod?1LK7)$=lrpNdIT}ox5cT zD5f|IJR*x381$4un6YB1eHl=Yy~NYkmHh=5qW}*}v0=(PppayVYeb22er|4RUI~M9 zQEFmIYKlU6W=V#EyQgnJcq5-UP|*!f7srr_TW@bg^BpqaVZF$<@xN}nsKdgIbCu@* zT=z-Bwe!{M#|#a}dQP2uHs^DRWAc=BFE9RO5pZB&L?^a9mNdPvyy*H=qwp^k(f$X_ zw;q`KK3rnA+0HF5>a7{|9GN(F=q}XsIqE7gSEluNz)T^dq|H-g^qif-(q@RcxOtu6 z@d=)MgM;&CW?_}cUZsUfTKXp+t@l{*N?0S??T4#V>SUMSd=oF7)cXH9U;Dw_7TMYC v3?#Lqj$&ZQIKeHX>ft%())rx)9~nGd{an^LB{Ts5J)uQT literal 0 HcmV?d00001 diff --git a/Youtube_logo.png.import b/Download.png.import similarity index 68% rename from Youtube_logo.png.import rename to Download.png.import index f380244..a773d81 100644 --- a/Youtube_logo.png.import +++ b/Download.png.import @@ -2,16 +2,16 @@ importer="texture" type="CompressedTexture2D" -uid="uid://bdpat2sfflaxq" -path="res://.godot/imported/Youtube_logo.png-22e44a6c4c4bd7a2da4492032ea62686.ctex" +uid="uid://bmbxyma4ra46p" +path="res://.godot/imported/Download.png-3a4ebaeb081d510c32ff24ab28484d7b.ctex" metadata={ "vram_texture": false } [deps] -source_file="res://Youtube_logo.png" -dest_files=["res://.godot/imported/Youtube_logo.png-22e44a6c4c4bd7a2da4492032ea62686.ctex"] +source_file="res://Download.png" +dest_files=["res://.godot/imported/Download.png-3a4ebaeb081d510c32ff24ab28484d7b.ctex"] [params] diff --git a/Main.tscn b/Main.tscn index 108b86b..88ee217 100644 --- a/Main.tscn +++ b/Main.tscn @@ -1,4 +1,5 @@ -[gd_scene load_steps=66 format=3 uid="uid://b2sygl55s6fng"] +[gd_scene load_steps=67 format=3 uid="uid://b2sygl55s6fng"] + [ext_resource type="Script" path="res://main.gd" id="1_ubs1p"] [ext_resource type="Texture2D" uid="uid://b8on1case224h" path="res://LoopPressed.png" id="2_iolk5"] @@ -18,7 +19,6 @@ [ext_resource type="Script" path="res://cover.gd" id="12_3v50a"] [ext_resource type="Script" path="res://playlists_panel.gd" id="12_8ie8y"] [ext_resource type="Script" path="res://settings_button.gd" id="12_073mb"] -[ext_resource type="Texture2D" uid="uid://bdpat2sfflaxq" path="res://Youtube_logo.png" id="12_bc5ym"] [ext_resource type="Texture2D" uid="uid://myq6n4bshduj" path="res://search.png" id="12_cv2gm"] [ext_resource type="Script" path="res://search_bar.gd" id="12_mr42x"] [ext_resource type="Script" path="res://select_playlist.gd" id="12_of5fe"] @@ -30,6 +30,8 @@ [ext_resource type="Texture2D" uid="uid://1rstn6r2wisy" path="res://X.png" id="14_mioc4"] [ext_resource type="Script" path="res://Spinning.gd" id="14_rhw4k"] [ext_resource type="Script" path="res://yt_tab_button.gd" id="16_2t15p"] +[ext_resource type="Script" path="res://help_button.gd" id="17_4b8oh"] +[ext_resource type="Texture2D" uid="uid://bmbxyma4ra46p" path="res://Download.png" id="29_v44vi"] [ext_resource type="Script" path="res://update_checker.gd" id="30_byc5i"] [ext_resource type="Script" path="res://patch_notes_button.gd" id="31_hjsj1"] [ext_resource type="Script" path="res://CustomButtonColor.gd" id="32_pwgec"] @@ -271,7 +273,7 @@ script = ExtResource("12_3v50a") layout_mode = 0 offset_left = 20.0 offset_top = 24.0 -offset_right = 257.0 +offset_right = 256.0 offset_bottom = 80.0 focus_mode = 0 toggle_mode = true @@ -355,6 +357,24 @@ layout_mode = 2 size_flags_vertical = 4 alignment = 1 +[node name="YtTabButton" type="Button" parent="."] +texture_filter = 1 +layout_mode = 1 +anchors_preset = -1 +anchor_left = 1.0 +anchor_right = 1.0 +offset_left = -77.0 +offset_top = 131.0 +offset_right = -5.0 +offset_bottom = 203.0 +grow_horizontal = 0 +grow_vertical = 2 +scale = Vector2(0.79, 0.79) +focus_mode = 0 +toggle_mode = true +icon = ExtResource("29_v44vi") +script = ExtResource("16_2t15p") + [node name="YoutubeMenuHolder" type="Control" parent="."] layout_mode = 1 anchors_preset = 1 @@ -380,7 +400,7 @@ anchor_bottom = 1.0 offset_left = -7.0 offset_top = -5.0 offset_right = 7.0 -offset_bottom = 5.0 +offset_bottom = 46.0 grow_horizontal = 2 grow_vertical = 2 color = Color(0.14902, 0.14902, 0.14902, 1) @@ -416,6 +436,23 @@ offset_bottom = 72.0 text = "NOTE: speeds depend on your internet" label_settings = SubResource("LabelSettings_fiiw4") +[node name="HelpButton" type="Button" parent="YoutubeMenuHolder/Youtube menu"] +custom_minimum_size = Vector2(32, 32) +layout_mode = 1 +anchors_preset = 3 +anchor_left = 1.0 +anchor_top = 1.0 +anchor_right = 1.0 +anchor_bottom = 1.0 +offset_left = -31.83 +offset_top = -40.0 +offset_right = 0.170044 +offset_bottom = -8.0 +grow_horizontal = 0 +grow_vertical = 0 +text = "?" +script = ExtResource("17_4b8oh") + [node name="CreatePlaylistsMenu" type="Control" parent="."] visible = false layout_mode = 1 @@ -813,24 +850,6 @@ offset_top = 174.0 offset_right = 1082.0 offset_bottom = 214.0 -[node name="YtTabButton" type="Button" parent="."] -layout_mode = 1 -anchors_preset = -1 -anchor_left = 1.0 -anchor_right = 1.0 -offset_left = -97.0 -offset_top = 109.0 -offset_right = 551.0 -offset_bottom = 560.0 -grow_horizontal = 0 -grow_vertical = 2 -scale = Vector2(0.105, 0.105) -focus_mode = 0 -toggle_mode = true -icon = ExtResource("12_bc5ym") -flat = true -script = ExtResource("16_2t15p") - [node name="Version" type="Label" parent="."] layout_mode = 1 anchors_preset = 3 @@ -842,7 +861,8 @@ offset_left = -64.0 offset_top = -23.0 grow_horizontal = 0 grow_vertical = 0 -text = "v1.4.1" + +text = "v1.4.2" horizontal_alignment = 2 [node name="WavDisclaimer" type="AcceptDialog" parent="."] @@ -1058,6 +1078,7 @@ horizontal_alignment = 1 [connection signal="toggled" from="SelectPlaylist" to="SelectPlaylist" method="_on_toggled"] [connection signal="pressed" from="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/CreatePlaylist" to="PlaylistsPanel" method="_on_create_playlist_pressed"] [connection signal="toggled" from="PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll" to="PlaylistsPanel" method="_on_play_all_toggled"] +[connection signal="toggled" from="YtTabButton" to="YtTabButton" method="_on_toggled"] [connection signal="dir_selected" from="CreatePlaylistsMenu/FileDialog" to="CreatePlaylistsMenu" method="_on_file_dialog_dir_selected"] [connection signal="text_changed" from="CreatePlaylistsMenu/ScrollContainer/VBoxContainer/PlaylistName" to="CreatePlaylistsMenu" method="_on_playlist_name_text_changed"] [connection signal="pressed" from="CreatePlaylistsMenu/ScrollContainer/VBoxContainer/SelectDirButton" to="CreatePlaylistsMenu" method="_on_select_dir_button_pressed"] @@ -1068,7 +1089,6 @@ horizontal_alignment = 1 [connection signal="text_submitted" from="SearchBar" to="SearchBar" method="_on_text_submitted"] [connection signal="index_pressed" from="SearchResults" to="SearchBar" method="_on_search_results_index_pressed"] [connection signal="toggled" from="VolumeButton" to="VolumeButton" method="_on_toggled"] -[connection signal="toggled" from="YtTabButton" to="YtTabButton" method="_on_toggled"] [connection signal="request_completed" from="UpdateChecker/HTTPRequest" to="UpdateChecker" method="_on_http_request_completed"] [connection signal="request_completed" from="UpdateChecker/DownloadRequest" to="UpdateChecker" method="_on_download_request_completed"] [connection signal="pressed" from="UpdateChecker/ColorRect/LinkButton" to="UpdateChecker" method="_on_link_button_pressed"] diff --git a/Youtube_logo.png b/Youtube_logo.png deleted file mode 100644 index a37389d4f4261ad8da0805ccdb50f9ec4b7eede8..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 9626 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 void: + var _process_id:int var executable: String = OS.get_user_data_dir() + \ ("/yt-dlp.exe" if OS.get_name() == "Windows" else "/yt-dlp") @@ -187,7 +189,7 @@ class Download extends RefCounted: options_and_arguments.append_array(["--no-continue", "-P", file_path, _url]) var output: Array = [] - OS.execute(executable, PackedStringArray(options_and_arguments), output) + _process_id = OS.execute(executable, PackedStringArray(options_and_arguments), output) print(options_and_arguments) self._thread_finished.call_deferred() diff --git a/help_button.gd b/help_button.gd new file mode 100644 index 0000000..73c599e --- /dev/null +++ b/help_button.gd @@ -0,0 +1,14 @@ +extends Button + + +# Called when the node enters the scene tree for the first time. +func _ready() -> void: + pass # Replace with function body. + + +func _pressed() -> void: + OS.shell_open("https://github.com/yt-dlp/yt-dlp/blob/master/supportedsites.md") + +# Called every frame. 'delta' is the elapsed time since the previous frame. +func _process(delta: float) -> void: + pass diff --git a/yt_tab_button.gd b/yt_tab_button.gd index 099a7e9..9346cb2 100644 --- a/yt_tab_button.gd +++ b/yt_tab_button.gd @@ -5,9 +5,10 @@ extends Button @onready var yt_link: LineEdit = $"../YoutubeMenuHolder/Youtube menu/YTLink" @onready var yt_download: Button = $"../YoutubeMenuHolder/Youtube menu/YTDownload" @onready var loading_img: Sprite2D = $"../YoutubeMenuHolder/Youtube menu/LoadingIMG" + var currentlyExtending:bool var Target:float = 50 - +var CurrentDownload:YtDlp.Download signal ContinueProcess @onready var Parent:MainScene = get_tree().root.get_child(2) @@ -17,6 +18,9 @@ func _ready() -> void: YtDlp.setup_completed.connect(YTSetupCompleted) yt_download.pressed.connect(DownloadYTVidFromLink) +func CancelDownload(): + if CurrentDownload != null: + print("! PROCCES ID: " + str(CurrentDownload._process_id)) # Called every frame. 'delta' is the elapsed time since the previous frame. func _process(delta: float) -> void: @@ -49,7 +53,7 @@ func DownloadYTVidFromLink(): if yt_link.text.is_empty(): OS.alert("please gimme a link") return - if "&list=" in yt_link.text: + if "list=" in yt_link.text: Parent.playlist_or_song.show() Parent.playlist_or_song.confirmed.connect(DownloadPlaylistConf) Parent.playlist_or_song.canceled.connect(DownloadSingleSongConf) @@ -61,6 +65,7 @@ func DownloadYTVidFromLink(): return loading_img.show() yt_link.clear() + CurrentDownload = download download.set_destination(owner.PlaylistsLocation[owner.CurrentPlaylist]) print(owner.PlaylistsLocation[owner.CurrentPlaylist]) download.convert_to_audio(YtDlp.Audio.MP3) @@ -72,6 +77,7 @@ func DownloadCompleted(): yt_download.disabled = false owner.GetSongs(owner.PlaylistsLocation[owner.CurrentPlaylist]) loading_img.hide() + CurrentDownload = null func _on_toggled(toggled_on: bool) -> void: