Consistency

Development

Main.tscn

@@ -1,6 +1,5 @@
 [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"]
 [ext_resource type="Texture2D" uid="uid://cq8jj63iyu2cs" path="res://d7hftxdivxxvm.cloudfront.webp" id="2_wf35v"]
@@ -171,6 +170,11 @@ script = ExtResource("1_ubs1p")
 LoopPressed = ExtResource("2_iolk5")
 LoopNotPressed = ExtResource("5_c2g63")
 
+[node name="OSMediaIntigration" type="Control" parent="."]
+anchors_preset = 0
+offset_right = 40.0
+offset_bottom = 40.0
+
 [node name="WallpaperManager" type="Node2D" parent="." node_paths=PackedStringArray("Daytime", "Evening", "Nighttime")]
 script = ExtResource("4_y372l")
 Daytime = NodePath("../Daytime")
@@ -400,7 +404,7 @@ anchor_bottom = 1.0
 offset_left = -7.0
 offset_top = -5.0
 offset_right = 7.0
-offset_bottom = 46.0
+offset_bottom = 4.0
 grow_horizontal = 2
 grow_vertical = 2
 color = Color(0.14902, 0.14902, 0.14902, 1)
@@ -409,7 +413,7 @@ color = Color(0.14902, 0.14902, 0.14902, 1)
 layout_mode = 1
 offset_right = 229.0
 offset_bottom = 47.0
-placeholder_text = "Youtube link(can be playlist)"
+placeholder_text = "Link to download"
 
 [node name="YTDownload" type="Button" parent="YoutubeMenuHolder/Youtube menu"]
 layout_mode = 1
@@ -444,14 +448,15 @@ anchor_left = 1.0
 anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
-offset_left = -31.83
+offset_left = -38.83
 offset_top = -40.0
-offset_right = 0.170044
-offset_bottom = -8.0
+offset_right = 1.17004
 grow_horizontal = 0
 grow_vertical = 0
+focus_mode = 0
 text = "?"
 script = ExtResource("17_4b8oh")
+Open = "https://notdraimdev.github.io/SimplSite/GettingStarted.html"
 
 [node name="CreatePlaylistsMenu" type="Control" parent="."]
 visible = false
@@ -582,15 +587,6 @@ shortcut = SubResource("Shortcut_8p5o4")
 icon = ExtResource("11_esjel")
 script = ExtResource("12_073mb")
 
-[node name="SettingsPopup" type="Popup" parent="."]
-position = Vector2i(319, 85)
-size = Vector2i(591, 501)
-
-[node name="SettingsMenuChild" parent="SettingsPopup" instance=ExtResource("13_7atry")]
-offset_left = -272.0
-offset_top = 8.0
-offset_bottom = 458.0
-
 [node name="FileDialog" type="FileDialog" parent="."]
 title = "Open a Directory"
 position = Vector2i(28, 115)
@@ -695,12 +691,12 @@ anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 67.0
-offset_top = -120.0
+offset_top = -132.0
 offset_right = -200.0
-offset_bottom = -89.0
+offset_bottom = -95.0
 grow_horizontal = 2
 grow_vertical = 0
-text = "Please select a directory"
+text = "Please make a Playlist "
 label_settings = SubResource("LabelSettings_6prit")
 clip_text = true
 text_overrun_behavior = 2
@@ -712,7 +708,7 @@ anchor_top = 1.0
 anchor_right = 1.0
 anchor_bottom = 1.0
 offset_left = 68.0
-offset_top = -99.0
+offset_top = -106.0
 offset_right = -199.0
 offset_bottom = -68.0
 grow_horizontal = 2
@@ -861,10 +857,40 @@ offset_left = -64.0
 offset_top = -23.0
 grow_horizontal = 0
 grow_vertical = 0
-
-text = "v1.4.2"
+text = "v1.4.3"
 horizontal_alignment = 2
 
+[node name="SettingsPopup" type="Control" parent="."]
+layout_mode = 1
+anchors_preset = 8
+anchor_left = 0.5
+anchor_top = 0.5
+anchor_right = 0.5
+anchor_bottom = 0.5
+offset_left = -295.5
+offset_top = -250.5
+offset_right = 295.5
+offset_bottom = 250.5
+grow_horizontal = 2
+grow_vertical = 2
+
+[node name="ColorRect" type="ColorRect" parent="SettingsPopup"]
+layout_mode = 1
+anchors_preset = 15
+anchor_right = 1.0
+anchor_bottom = 1.0
+grow_horizontal = 2
+grow_vertical = 2
+color = Color(0.14902, 0.14902, 0.14902, 1)
+metadata/_edit_use_anchors_ = true
+
+[node name="SettingsMenuChild" parent="SettingsPopup" instance=ExtResource("13_7atry")]
+layout_mode = 1
+offset_left = -280.0
+offset_top = 8.0
+offset_right = 296.0
+offset_bottom = 501.0
+
 [node name="WavDisclaimer" type="AcceptDialog" parent="."]
 transparent_bg = true
 title = "WAV disclaimer"

addons/discord-rpc-gd/restart_window.tscn

@@ -9,8 +9,7 @@ Button/styles/focus = SubResource("StyleBoxEmpty_1t7mm")
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5vqdt"]
 
-
-[sub_resource type="Image" id="Image_j0vw3"]
+[sub_resource type="Image" id="Image_6qp7c"]
 data = {
 "data": PackedByteArray(255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 168, 224, 224, 224, 233, 224, 224, 224, 236, 224, 224, 224, 170, 231, 231, 231, 31, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 234, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 239, 230, 230, 230, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 168, 224, 224, 224, 255, 224, 224, 224, 186, 224, 224, 224, 32, 224, 224, 224, 33, 224, 224, 224, 187, 224, 224, 224, 255, 225, 225, 225, 167, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 237, 224, 224, 224, 255, 224, 224, 224, 33, 255, 255, 255, 0, 255, 255, 255, 0, 227, 227, 227, 36, 224, 224, 224, 255, 224, 224, 224, 234, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 237, 224, 224, 224, 255, 224, 224, 224, 33, 255, 255, 255, 0, 255, 255, 255, 0, 229, 229, 229, 38, 224, 224, 224, 255, 224, 224, 224, 229, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 164, 224, 224, 224, 255, 224, 224, 224, 187, 225, 225, 225, 34, 227, 227, 227, 36, 224, 224, 224, 192, 224, 224, 224, 255, 224, 224, 224, 162, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 24, 225, 225, 225, 215, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 229, 224, 224, 224, 32, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 24, 224, 224, 224, 216, 224, 224, 224, 255, 224, 224, 224, 210, 224, 224, 224, 161, 224, 224, 224, 232, 224, 224, 224, 231, 225, 225, 225, 159, 230, 230, 230, 30, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 107, 224, 224, 224, 255, 224, 224, 224, 210, 230, 230, 230, 20, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 105, 230, 230, 230, 20, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 221, 224, 224, 224, 130, 255, 255, 255, 1, 255, 255, 255, 1, 225, 225, 225, 134, 224, 224, 224, 224, 225, 225, 225, 223, 224, 224, 224, 132, 255, 255, 255, 1, 255, 255, 255, 6, 224, 224, 224, 137, 224, 224, 224, 231, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 130, 225, 225, 225, 133, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 129, 224, 224, 224, 137, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 65, 224, 224, 224, 255, 224, 224, 224, 220, 225, 225, 225, 223, 224, 224, 224, 255, 226, 226, 226, 61, 224, 224, 224, 65, 224, 224, 224, 255, 224, 224, 224, 222, 224, 224, 224, 231, 224, 224, 224, 255, 227, 227, 227, 62, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 67, 224, 224, 224, 255, 224, 224, 224, 219, 224, 224, 224, 222, 224, 224, 224, 255, 227, 227, 227, 63, 225, 225, 225, 67, 224, 224, 224, 255, 224, 224, 224, 219, 224, 224, 224, 230, 224, 224, 224, 255, 227, 227, 227, 63, 255, 255, 255, 0, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 127, 224, 224, 224, 129, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 225, 225, 225, 126, 225, 225, 225, 135, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 255, 255, 255, 255, 0, 224, 224, 224, 255, 224, 224, 224, 255, 224, 224, 224, 221, 225, 225, 225, 127, 255, 255, 255, 0, 255, 255, 255, 1, 224, 224, 224, 128, 224, 224, 224, 220, 224, 224, 224, 219, 225, 225, 225, 127, 255, 255, 255, 0, 255, 255, 255, 5, 225, 225, 225, 134, 224, 224, 224, 229, 224, 224, 224, 255, 255, 255, 255, 0),
 "format": "RGBA8",
@@ -20,8 +19,7 @@ data = {
 }
 
 [sub_resource type="ImageTexture" id="ImageTexture_gdtpn"]
-
-image = SubResource("Image_j0vw3")
+image = SubResource("Image_6qp7c")
 
 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_7v0rg"]
 

addons/godot-yt-dlp/src/yt_dlp.gd

@@ -100,7 +100,6 @@ class Download extends RefCounted:
 	
 	var _status: Status = Status.READY
 	var _thread: Thread = null
-	var _process_id:int
 	
 	# Fields
 	var _url: String
@@ -159,7 +158,6 @@ class Download extends RefCounted:
 	
 	
 	func _execute_on_thread() -> void:
-		var _process_id:int
 		var executable: String = OS.get_user_data_dir() + \
 				("/yt-dlp.exe" if OS.get_name() == "Windows" else "/yt-dlp")
 		
@@ -188,10 +186,9 @@ class Download extends RefCounted:
 		options_and_arguments.append_array(["--yes-playlist","--embed-metadata","--embed-thumbnail",str("-o" + "%(title)s.%(ext)s")])
 		options_and_arguments.append_array(["--no-continue", "-P", file_path, _url])
 		
-		var output: Array = []
-		_process_id = OS.execute(executable, PackedStringArray(options_and_arguments), output)
-		
 		print(options_and_arguments)
+		var output: Array = []
+		OS.execute(executable, PackedStringArray(options_and_arguments), output)
 		self._thread_finished.call_deferred()
 	
 	

help_button.gd

@@ -1,13 +1,14 @@
 extends Button
 
 
+@export var Open:String
 # 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")
+	OS.shell_open(Open)
 
 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(delta: float) -> void:

main.gd

@@ -21,7 +21,7 @@ extends Control
 @onready var songs_menu: MenuButton = $SongsMenu
 @onready var version: Label = $Version
 @onready var paused_indicator: TextureRect = $PausedIndicator
-@onready var settings_popup: Popup = $SettingsPopup
+@onready var settings_popup: Control = $SettingsPopup
 @onready var settings_menu_child: Settings = $SettingsPopup/SettingsMenuChild
 @onready var artist_name: Label = $ArtistName
 @onready var user_bg: TextureRect = $UserBG
@@ -67,6 +67,7 @@ var PlayAllLists:bool
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
+	get_tree().root.min_size = Vector2(850,459)
 	current_progress.drag_ended.connect(SongDragStopped)
 	current_progress.drag_started.connect(SongDragStarted)
 	loop.pressed.connect(LoopSong)
@@ -414,23 +415,7 @@ func _process(_delta: float) -> void:
 		SaveEverything()
 		print("yoo")
 		@warning_ignore("integer_division")
-		SplashStrings = ["Total listening time: %s!" % str(str(int(TimeSpentListening/60)/60 )
-						 + "h : " + str((int(TimeSpentListening) / 60) % 60) + "m : " + 
-						str(int(TimeSpentListening) % 60) + "s"),
-						"Version: %s" % version.text,"🤷‍♂️","This Changes every ~11 seconds",
-						"hello everybody my name is %s" % DiscordRPC.get_current_user()["username"],
-						"wash your dishes, i know you got some","Running on %s" % OS.get_distribution_name(),
-						"%s is cooking" % DiscordRPC.get_current_user()["username"], "debugging" if OS.has_feature("editor") else "Release build",
-						"this user chose to show you all this info","Playing a Banger",
-						":steamhappy:","This is a sign that crocodiles live in water",
-						"Space? SPACE?! SPAAAAAAAAAAAAACE!!!",
-						"i love gd colonge",
-						"listening with reverb" if settings_menu_child.reverb_check.button_pressed else
-						"not listening with reverb","the cake is edible",
-						"what a great song!","this message is useless",
-						"stop reading these","why are you reading these",
-						"hello from mars", "hello to mars","there is a fly in my room",
-						"yippee!","What, are they allergic to bathtubs or something"]
+		UpdateSplashes()
 		print(DiscordRPC.get_current_user()["username"])
 		print(TimeSpentListening)
 		var LText = SplashStrings.pick_random()
@@ -486,7 +471,30 @@ func _process(_delta: float) -> void:
 		DiscordRPC.refresh()
 
 
-
+func UpdateSplashes():
+	SplashStrings = ["Total listening time: %s!" % str(str(int(TimeSpentListening/60)/60 )
+		 + "h : " + str((int(TimeSpentListening) / 60) % 60) + "m : " + 
+		str(int(TimeSpentListening) % 60) + "s"),
+		"Version: %s" % version.text,"🤷‍♂️","This Changes every ~11 seconds",
+		"hello everybody my name is %s" % DiscordRPC.get_current_user()["username"],
+		"wash your dishes, i know you got some","Running on %s" % OS.get_distribution_name(),
+		"%s is cooking" % DiscordRPC.get_current_user()["username"], "debugging" if OS.has_feature("editor") else "Release build",
+		"this user chose to show you all this info","Playing a Banger",
+		":steamhappy:","This is a sign that crocodiles live in water",
+		"Space? SPACE?! SPAAAAAAAAAAAAACE!!!",
+		"i love gd colonge",
+		"listening with reverb" if settings_menu_child.reverb_check.button_pressed else
+		"not listening with reverb","the cake is edible",
+		"what a great song!","this message is useless",
+		"stop reading these","why are you reading these",
+		"hello from mars", "hello to mars","there is a fly in my room",
+		"yippee!","What, are they allergic to bathtubs or something",
+		"Did you know, a 737 can land with up to 33knots of wind!",
+		"Welcome to todays JahresSchau",
+		"ram is very useful","your cpu is tasty","main course: Nvidia GPU",
+		"SCHOTTLAND FUER IMMER","i eat airborne vehicles","linus trovalds",
+		"™","＼（〇_ｏ）／","Nuh Uh!","Yuh Huh","Breaching.",
+		"I get a narcissistic injury when the wall ignores me","totally not using %s" % version.text] 
 
 
 func SaveEverything():

project.godot

@@ -16,6 +16,7 @@ config/features=PackedStringArray("4.3", "Forward Plus")
 run/low_processor_mode=true
 boot_splash/bg_color=Color(0, 0, 0, 1)
 boot_splash/image="res://BigLogo.png"
+boot_splash/use_filter=false
 config/icon="res://Logo2.png"
 config/windows_native_icon="res://addons/godot-yt-dlp/src/favicon2.ico"
 
@@ -29,7 +30,6 @@ MusicMetadataAutoload="*res://MusicMeta-f98d7384de3e2e658dcba3f5b06fb5b57ac2c73c
 window/size/initial_position_type=3
 window/size/extend_to_title=true
 window/energy_saving/keep_screen_on=false
-window/stretch/mode="viewport"
 window/stretch/aspect="expand"
 
 [dotnet]

settings_button.gd

@@ -1,6 +1,6 @@
 extends Button
 
-@onready var settings_popup: Popup = $"../SettingsPopup"
+@onready var settings_popup: Control = $"../SettingsPopup"
 
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
@@ -13,4 +13,7 @@ func _process(delta: float) -> void:
 
 
 func _on_pressed() -> void:
-	settings_popup.show()
+	if settings_popup.visible:
+		settings_popup.hide()
+	else:
+		settings_popup.show()

yt_tab_button.gd

@@ -8,7 +8,6 @@ extends Button
 
 var currentlyExtending:bool
 var Target:float = 50
-var CurrentDownload:YtDlp.Download
 signal ContinueProcess
 
 @onready var Parent:MainScene = get_tree().root.get_child(2)
@@ -18,10 +17,6 @@ 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:
 	if currentlyExtending:
@@ -45,7 +40,7 @@ func DownloadPlaylistConf():
 	ContinueProcess.emit()
 
 func DownloadSingleSongConf():
-	var idx:int = yt_link.text.find("&list=")
+	var idx:int = yt_link.text.find("list=")
 	yt_link.text = yt_link.text.erase(idx,500)
 	ContinueProcess.emit()
 
@@ -65,10 +60,9 @@ 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)
+	download.convert_to_audio(YtDlp.Audio.MP3) 
 	download.start()
 	yt_download.disabled = true
 	download.completely_finished.connect(DownloadCompleted)
@@ -77,7 +71,6 @@ func DownloadCompleted():
 	yt_download.disabled = false
 	owner.GetSongs(owner.PlaylistsLocation[owner.CurrentPlaylist])
 	loading_img.hide()
-	CurrentDownload = null
 
 
 func _on_toggled(toggled_on: bool) -> void: