Version checker

Merge pull request #4 from notdraimdev/development
2024-09-25 20:33:03 +02:00 · 2024-09-25 18:00:19 +02:00 · 2024-09-16 16:45:12 +02:00 · 2024-09-12 22:09:11 +02:00
113 changed files with 536 additions and 1820 deletions
@@ -1,31 +0,0 @@
---
-name: Bug report
-about: Create a report to help us improve
-title: ''
-labels: ''
-assignees: ''
-
---
-
-**Describe the bug**
-A clear and concise description of what the bug is.
-
-**To Reproduce**
-Steps to reproduce the behavior:
-1. Go to '...'
-2. Click on '....'
-3. Scroll down to '....'
-4. See error
-
-**Expected behavior**
-A clear and concise description of what you expected to happen.
-
-**Screenshots**
-If applicable, add screenshots to help explain your problem.
-
-**Desktop (please complete the following information):**
- - OS: [e.g. iOS]
- - Version [e.g. 22]
-
-**Additional context**
-Add any other context about the problem here.
@@ -1,20 +0,0 @@
-shader_type canvas_item;
-
-void vertex() {
-	// Called for every vertex the material is visible on.
-}
-
-void fragment() {
-	vec2 animatedUV;
-	animatedUV.x = (sin(UV.x + (TIME))/2.0)+0.5;
-	animatedUV.y = (sin(UV.y + (TIME+(PI/2.0)))/2.0)+0.5;
-	float color1 = 1.0 *animatedUV.x;
-	float color2 = 1.0 *animatedUV.y;
-	
-	COLOR = vec4((color1*0.7)+(color2*0.3),(color1*0.5)+(color2*0.5),(color1*0.3)+(color2*0.7),1);
-}
-
-//void light() {
-	// Called for every pixel for every light affecting the CanvasItem.
-	// Uncomment to replace the default light processing function with this one.
-//}
@@ -1 +0,0 @@
-uid://dgwslfj43mu1y
@@ -2,16 +2,16 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://bmbxyma4ra46p"
-path="res://.godot/imported/Download.png-3a4ebaeb081d510c32ff24ab28484d7b.ctex"
+uid="uid://drj8iwoxqu7kk"
+path="res://.godot/imported/Cat_August_2010-4.jpg-ee22e0b2d7c21625ade8bb157ecd9ac0.ctex"
 metadata={
 "vram_texture": false
 }

 [deps]

-source_file="res://Download.png"
-dest_files=["res://.godot/imported/Download.png-3a4ebaeb081d510c32ff24ab28484d7b.ctex"]
+source_file="res://Cat_August_2010-4.jpg"
+dest_files=["res://.godot/imported/Cat_August_2010-4.jpg-ee22e0b2d7c21625ade8bb157ecd9ac0.ctex"]

 [params]

@@ -1 +0,0 @@
-uid://cv5aoaprqfuhx
@@ -1,14 +0,0 @@
-extends ColorRect
-@onready var StandardColor = color
-
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	if get_parent().is_hovered():
-		color = StandardColor.lightened(0.3)
-	else:
-		color = StandardColor
@@ -1 +0,0 @@
-uid://cf1rsngucr7e2
@@ -1,24 +0,0 @@
-[remap]
-
-importer="wav"
-type="AudioStreamWAV"
-uid="uid://n8g3v41u2u48"
-path="res://.godot/imported/Error.wav-f6422fca2f257bd634183d1c1c7a43ba.sample"
-
-[deps]
-
-source_file="res://Error.wav"
-dest_files=["res://.godot/imported/Error.wav-f6422fca2f257bd634183d1c1c7a43ba.sample"]
-
-[params]
-
-force/8_bit=false
-force/mono=false
-force/max_rate=false
-force/max_rate_hz=44100
-edit/trim=false
-edit/normalize=false
-edit/loop_mode=0
-edit/loop_begin=0
-edit/loop_end=-1
-compress/mode=0
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://cmr1ij4s7xa27"
-path="res://.godot/imported/IMG_20241015_162213_033(1).jpg-9929b05aea172bc5afc1063f329c9b14.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://IMG_20241015_162213_033(1).jpg"
-dest_files=["res://.godot/imported/IMG_20241015_162213_033(1).jpg-9929b05aea172bc5afc1063f329c9b14.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1
@@ -1,34 +0,0 @@
-[remap]
-
-importer="texture"
-type="CompressedTexture2D"
-uid="uid://2vacx4h6vn46"
-path="res://.godot/imported/IMG_20241015_175925_722(1).jpg-b4169e075837dc19cf9c8f3902aa4f18.ctex"
-metadata={
-"vram_texture": false
-}
-
-[deps]
-
-source_file="res://IMG_20241015_175925_722(1).jpg"
-dest_files=["res://.godot/imported/IMG_20241015_175925_722(1).jpg-b4169e075837dc19cf9c8f3902aa4f18.ctex"]
-
-[params]
-
-compress/mode=0
-compress/high_quality=false
-compress/lossy_quality=0.7
-compress/hdr_compression=1
-compress/normal_map=0
-compress/channel_pack=0
-mipmaps/generate=false
-mipmaps/limit=-1
-roughness/mode=0
-roughness/src_normal=""
-process/fix_alpha_border=true
-process/premult_alpha=false
-process/normal_map_invert_y=false
-process/hdr_as_srgb=false
-process/hdr_clamp_exposure=false
-process/size_limit=0
-detect_3d/compress_to=1
@@ -1 +0,0 @@
-uid://b8g2xx06g626m
@@ -1 +0,0 @@
-uid://rnxfmtoo2yn4
@@ -1 +0,0 @@
-uid://cdigfnlqg2r8l
@@ -1 +0,0 @@
-uid://bs5vnv3baji7f
@@ -1,4 +1,4 @@
-[gd_scene load_steps=10 format=3 uid="uid://dqg674t6kun4e"]
+[gd_scene load_steps=9 format=3 uid="uid://dqg674t6kun4e"]

 [ext_resource type="Script" path="res://settings.gd" id="1_uaa7d"]
 [ext_resource type="Script" path="res://eq_settings.gd" id="2_1n4m6"]
@@ -17,9 +17,6 @@ font_size = 11
 [sub_resource type="LabelSettings" id="LabelSettings_cwn10"]
 font_size = 15

-[sub_resource type="LabelSettings" id="LabelSettings_i51gs"]
-font_size = 50
-
 [node name="SettingsMenuChild" type="Control"]
 custom_minimum_size = Vector2(576, 493)
 layout_mode = 3
@@ -151,7 +148,7 @@ transient = false
 ok_button_text = "Open"
 file_mode = 0
 access = 2
-filters = PackedStringArray("*.png", "*.jpg ", "*.jpeg", "*.gif", "*")
+filters = PackedStringArray("*.png", "*.jpg", "*.jpeg", "*")
 show_hidden_files = true
 use_native_dialog = true

@@ -506,72 +503,6 @@ autowrap_mode = 2
 custom_minimum_size = Vector2(0, 16.07)
 layout_mode = 2

-[node name="MISC" type="Label" parent="ScrollContainer/VBoxContainer"]
-custom_minimum_size = Vector2(400, 26.975)
-layout_mode = 2
-size_flags_horizontal = 4
-size_flags_vertical = 3
-text = "MISC"
-label_settings = SubResource("LabelSettings_2bhor")
-horizontal_alignment = 1
-vertical_alignment = 1
-autowrap_mode = 2
-
-[node name="NowPlayingWindowButton" type="CheckBox" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-focus_mode = 0
-text = "Now playing window"
-
-[node name="NowPlayingInfo" type="Label" parent="ScrollContainer/VBoxContainer"]
-custom_minimum_size = Vector2(229.895, 0)
-layout_mode = 2
-size_flags_horizontal = 0
-text = "This setting enables a dedicated window for displaying the currently playing song.  this can be useful when streaming "
-label_settings = SubResource("LabelSettings_p55k3")
-vertical_alignment = 1
-autowrap_mode = 2
-
-[node name="Credits" type="VBoxContainer" parent="ScrollContainer/VBoxContainer"]
-layout_mode = 2
-
-[node name="Label" type="Label" parent="ScrollContainer/VBoxContainer/Credits"]
-layout_mode = 2
-size_flags_horizontal = 4
-text = "CREDITS"
-label_settings = SubResource("LabelSettings_i51gs")
-
-[node name="Label5" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"]
-layout_mode = 2
-size_flags_horizontal = 4
-text = "Godot"
-underline = 1
-uri = "https://godotengine.org"
-
-[node name="Label2" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"]
-layout_mode = 2
-size_flags_horizontal = 4
-text = "Godot YT-DL by Noé Le Cam"
-underline = 1
-uri = "https://github.com/Nolkaloid/godot-yt-dlp"
-
-[node name="Label3" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"]
-layout_mode = 2
-size_flags_horizontal = 4
-text = "Discord RPC by vaporee"
-underline = 1
-uri = "https://github.com/vaporvee/discord-rpc-godot"
-
-[node name="Label4" type="LinkButton" parent="ScrollContainer/VBoxContainer/Credits"]
-layout_mode = 2
-size_flags_horizontal = 4
-text = "Godot GIF by b0tlanner"
-underline = 1
-uri = "https://github.com/BOTLANNER/godot-gif"
-
-[node name="Seperator7" type="Control" parent="ScrollContainer/VBoxContainer"]
-custom_minimum_size = Vector2(0, 16.07)
-layout_mode = 2
-
 [node name="TimeListening" type="Label" parent="ScrollContainer/VBoxContainer"]
 layout_mode = 2
 size_flags_horizontal = 4
@@ -597,7 +528,6 @@ size_flags_vertical = 0
 focus_mode = 0
 icon = ExtResource("2_iuivb")
 flat = true
-expand_icon = true

 [connection signal="toggled" from="ScrollContainer/VBoxContainer/DiscordRichPresenceButton" to="." method="_on_discord_rich_presence_button_toggled"]
 [connection signal="pressed" from="ScrollContainer/VBoxContainer/VBoxContainer/HBoxContainer/SelectBG" to="." method="_on_select_bg_pressed"]
@@ -613,7 +543,6 @@ expand_icon = true
 [connection signal="drag_ended" from="ScrollContainer/VBoxContainer/CompressionContainer/ThresholdSettings/ThresholdSlider" to="." method="_on_threshold_slider_drag_ended"]
 [connection signal="drag_ended" from="ScrollContainer/VBoxContainer/CompressionContainer/RatioSettings/RatioSlider" to="." method="_on_ratio_slider_drag_ended"]
 [connection signal="drag_ended" from="ScrollContainer/VBoxContainer/CompressionContainer/GainSettings/GainSlider" to="." method="_on_gain_slider_drag_ended"]
-[connection signal="toggled" from="ScrollContainer/VBoxContainer/NowPlayingWindowButton" to="." method="_on_now_playing_window_button_toggled"]
 [connection signal="pressed" from="ScrollContainer/VBoxContainer/Reset" to="." method="_on_reset_pressed"]
 [connection signal="pressed" from="ScrollContainer/VBoxContainer/Reset" to="ScrollContainer/VBoxContainer/EQSettings" method="_on_reset_pressed"]
 [connection signal="pressed" from="Exit" to="." method="_on_exit_pressed"]
@@ -1 +0,0 @@
-uid://bx75h6xic1hi7
@@ -2,16 +2,16 @@

 importer="texture"
 type="CompressedTexture2D"
-uid="uid://cm5ps3a716wr0"
-path="res://.godot/imported/XSmall.png-2fa29ed3d6c0476862944f7e0885c6ed.ctex"
+uid="uid://bdpat2sfflaxq"
+path="res://.godot/imported/Youtube_logo.png-22e44a6c4c4bd7a2da4492032ea62686.ctex"
 metadata={
 "vram_texture": false
 }

 [deps]

-source_file="res://XSmall.png"
-dest_files=["res://.godot/imported/XSmall.png-2fa29ed3d6c0476862944f7e0885c6ed.ctex"]
+source_file="res://Youtube_logo.png"
+dest_files=["res://.godot/imported/Youtube_logo.png-22e44a6c4c4bd7a2da4492032ea62686.ctex"]

 [params]

@@ -1 +0,0 @@
-uid://0jnn2i3r56m3
@@ -1 +0,0 @@
-uid://cu21wq8hdk6mq
@@ -1 +0,0 @@
-uid://bupnp7dee8k3a
@@ -1 +0,0 @@
-uid://bb81mf7sks0g4
@@ -1 +0,0 @@
-uid://ec3hjq1x03oq
@@ -9,7 +9,7 @@ Button/styles/focus = SubResource("StyleBoxEmpty_1t7mm")

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_5vqdt"]

-[sub_resource type="Image" id="Image_qsij4"]
+[sub_resource type="Image" id="Image_xrdhk"]
 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",
@@ -19,7 +19,7 @@ data = {
 }

 [sub_resource type="ImageTexture" id="ImageTexture_gdtpn"]
-image = SubResource("Image_qsij4")
+image = SubResource("Image_xrdhk")

 [sub_resource type="StyleBoxEmpty" id="StyleBoxEmpty_7v0rg"]

@@ -1 +0,0 @@
-uid://bkptv02am6p88
@@ -1 +0,0 @@
-uid://rxllqh6yapvt
@@ -1 +0,0 @@
-uid://osytjsx5x5lb
@@ -36,22 +36,13 @@ func download(url: String) -> Download:
 func FilesMissing() -> bool:
 	var executable_name: String = "yt-dlp.exe" if OS.get_name() == "Windows" else "yt-dlp"
 	
-	if OS.get_name() == "Windows":
-		if not FileAccess.file_exists("user://%s" % executable_name):
-			return true
-		if not FileAccess.file_exists("user://ffmpeg.exe"):
-			return true
-		if not FileAccess.file_exists("user://ffprobe.exe"):
-			return true
-	elif OS.get_name() == "Linux":
-		var stuff = OS.execute("bash",PackedStringArray(["-c","ffprobe"]))
-		print(stuff)
-		if stuff != 1:
-			return true
-		var stuff2 = OS.execute("bash",PackedStringArray(["-c","ffmpeg"]))
-		print(stuff2)
-		if stuff2 != 1:
-			return true
+	if not FileAccess.file_exists("user://%s" % executable_name):
+		return true
+	if not FileAccess.file_exists("user://ffmpeg.exe"):
+		return true
+	if not FileAccess.file_exists("user://ffprobe.exe"):
+		return true
+	
 	return false

 func setup() -> void:
@@ -68,8 +59,9 @@ func setup() -> void:
 		await (Engine.get_main_loop() as SceneTree).process_frame 
 		_thread.wait_to_finish()
 	
-	await _setup_ffmpeg()
-	if OS.get_name() == "Linux":
+	if OS.get_name() == "Windows":
+		await _setup_ffmpeg()
+	else:
 		OS.execute("chmod", PackedStringArray(["+x", OS.get_user_data_dir() + "/yt-dlp"]))
 	
 	_is_setup = true
@@ -78,33 +70,12 @@ func setup() -> void:

 func _setup_ffmpeg() -> void:
 	if not FileAccess.file_exists("user://ffmpeg.exe"):
-		if OS.get_name() == "Windows":
-			_downloader.download(ffmpeg_sources["ffmpeg"], "user://ffmpeg.exe")
-			await _downloader.download_completed
-			print(OS.get_distribution_name())
-		elif OS.get_distribution_name() in ["Ubuntu","Linux Mint","Debian"]:
-			var stuff = OS.execute("bash",PackedStringArray(["-c","ffmpeg"]))
-			print(stuff)
-			if stuff !=1:
-				push_error("FFMPEG NOT INSTALLED")
-			print(OS.get_distribution_name())
-		else:
-			print(OS.get_distribution_name())
+		_downloader.download(ffmpeg_sources["ffmpeg"], "user://ffmpeg.exe")
+		await _downloader.download_completed
 	
 	if not FileAccess.file_exists("user://ffprobe.exe"):
-		if OS.get_name() == "Windows":
-			_downloader.download(ffmpeg_sources["ffprobe"], "user://ffprobe.exe")
-			print(OS.get_distribution_name())
-			await _downloader.download_completed
-		elif OS.get_name() == "Linux":
-			var stuff = OS.execute("bash",PackedStringArray(["-c","ffprobe"]))
-			print(stuff)
-			if stuff != 1:
-				push_error("FFPROBE NOT INSTALLED")
-			print(OS.get_distribution_name())
-		else:
-			print(OS.get_distribution_name())
-	
+		_downloader.download(ffmpeg_sources["ffprobe"], "user://ffprobe.exe")
+		await _downloader.download_completed


 func _update_yt_dlp(filename: String) -> void:
@@ -138,7 +109,7 @@ class Download extends RefCounted:
 	var _renameAudioToDiffName:bool = false
 	var _video_format: Video = Video.WEBM
 	var _audio_format: Audio = Audio.MP3
-	var _download_playlist:bool
+	
 	
 	func _init(url: String):
 		_url = url
@@ -212,17 +183,13 @@ class Download extends RefCounted:
 					"destination": _destination
 				})
 		
-		options_and_arguments.append_array(["--embed-metadata","--embed-thumbnail",str("-o" + "%(title)s.%(ext)s")])
+		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])
 		
-		if _download_playlist:
-			options_and_arguments.append("--yes-playlist")
-		else:
-			options_and_arguments.append("--no-playlist")
-		
-		print(options_and_arguments)
 		var output: Array = []
 		OS.execute(executable, PackedStringArray(options_and_arguments), output)
+		
+		print(options_and_arguments)
 		self._thread_finished.call_deferred()
 	
 	
@@ -1 +0,0 @@
-uid://c0dklnw4cfoe3
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2023 B0TLANNER Games
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
@@ -1,139 +0,0 @@
-# Godot GIF
-<br>
-
-<p align="center">
-  <img src="./docs-images/logo.gif" alt="Logo" width="128" height="128" />
-</p>
-
-<p align="center">
-	<a href="https://github.com/BOTLANNER/godot-gif/actions/workflows/build_releases.yml"><img alt="GitHub Build" src="https://github.com/BOTLANNER/godot-gif/actions/workflows/build_releases.yml/badge.svg" height="20"/></a>
-	<a href="https://github.com/BOTLANNER/godot-gif/blob/develop/LICENSE.txt"><img alt="MIT License" src="https://img.shields.io/github/license/BOTLANNER/godot-gif" height="20"/></a>
-</p>
-
-
-## Description
-GDExtension for Godot 4+ to load GIF files as [AnimatedTexture](https://docs.godotengine.org/en/stable/classes/class_animatedtexture.html) and/or [SpriteFrames](https://docs.godotengine.org/en/stable/classes/class_spriteframes.html).
-
-NOTE: ~~**AnimatedTexture**~~ has been marked as deprecated according to development docs and could be removed in a future version of Godot.
-
-
-## Usage
-
-### Editor
-
-Gif files can be imported at edit time as one of the supported types via Import options.
-
-<details open>
-  <summary>Editor Imports Options</summary>
-  
-![Editor Imports Options](./docs-images/EditorImportSettings.gif)
-</details>
-
-See the [Editor Imports](./demo/editor_imports_example.tscn) example scene.
-<details open>
-  <summary>Editor Imports Example</summary>
-  
-![Editor Imports](./docs-images/EditorImports.gif)
-</details>
-
-<hr/>
-
-### Runtime
-
-Gif files can be loaded at runtime as one of the supported types via the `GifManager` singleton.
-
-`GifManager` exposes the following methods for loading gifs either from file or from bytes directly:
-![GifManager Methods](./docs-images/methods.png)
-
-e.g. to load from file
-```py
-get_node("AnimFromRuntimeFile").texture = GifManager.animated_texture_from_file("res://examples/file/optic.gif")
-
-get_node("AnimatedSprite2RuntimeFile").sprite_frames = GifManager.sprite_frames_from_file("res://examples/file/optic.gif")
-```
-
-See the [Runtime Imports](./demo/main.tscn) example scene.
-<details open>
-  <summary>Runtime Imports Example</summary>
-  
-![Runtime Imports](./docs-images/RuntimeImports.gif)
-</details>
-
-
-## Installation
-
-Download the `gdextension` artifact from the [latest successful build](https://github.com/BOTLANNER/godot-gif/actions/workflows/build_releases.yml). (It should be right at the bottom of the **Summary**)
-![image](https://github.com/BOTLANNER/godot-gif/assets/16349308/f28867c6-f669-45f2-9309-dbb17cec2031)
-
-Extract the contents to your Godot project directory.
-
-You should have an `addons` directory at the root with the following structure:
-```bash
-└───addons
-    └───godotgif
-        │   godotgif.gdextension
-        │   LICENSE.txt
-        │   README.md
-        │
-        └───bin
-            │   godotgif.windows.template_debug.x86_32.dll
-            │   godotgif.windows.template_debug.x86_64.dll
-            │   godotgif.windows.template_release.x86_32.dll
-            │   godotgif.windows.template_release.x86_64.dll
-            │   libgodotgif.android.template_debug.arm64.so
-            │   libgodotgif.android.template_release.arm64.so
-            │   libgodotgif.linux.template_debug.x86_32.so
-            │   libgodotgif.linux.template_debug.x86_64.so
-            │   libgodotgif.linux.template_release.x86_32.so
-            │   libgodotgif.linux.template_release.x86_64.so
-            │
-            ├───godotgif.macos.template_debug.framework
-            │       libgodotgif.macos.template_debug
-            │
-            └───godotgif.macos.template_release.framework
-                    libgodotgif.macos.template_release
-```
-
-Open your project. Any exisitng gifs should auto-import. New gifs in the project directory will automatically import as `SpriteFrames`. To convert them into `AnimatedTexture`, update the [import settings](#editor).
-
-The `GifManager` class should also now be available for access within GDScript.
-
-## Contributing
-
-### Setup
-
-Ensure **SCons** is setup. Refer to [Introduction to the buildsystem](https://docs.godotengine.org/en/stable/contributing/development/compiling/introduction_to_the_buildsystem.html)
-
-* If using a different version of Godot, be sure to dump the bindings e.g. 
-    ```sh
-        godot --dump-extension-api extension_api.json
-    ```
-*  Compile with 
-    ```sh
-        scons platform=<platform> custom_api_file=extension_api.json
-    ```
-
-### Debugging
-
-This repository is configured for use with [VSCode](https://code.visualstudio.com/)
-
-[Launch configurations](./.vscode/launch.json) have been setup for both debugging in editor and in runtime provided certain **VSCode** extensions are present and environment variables are defined.
-
-The following environment variables are required:
-
-1. `GODOT_PATH` - The directory in which Godot is installed
-1. `GODOT_EXECUTABLE` - The executable name of the Godot installation
-
-### More Details
-Refer to [GDExtension C++ example](https://docs.godotengine.org/en/stable/tutorials/scripting/gdextension/gdextension_cpp_example.html)
-
-
-## License
-
-Unless otherwise specified, the extension is released under the
-[MIT license](LICENSE.txt).
-
-See the full list of third-party libraries with their licenses used by this
-extension at [src/thirdparty/README.md](src/thirdparty/README.md).
-
-This implementation heavily borrowed inspiration from the [gif module](https://github.com/goostengine/goost/tree/gd3/modules/gif) for [Goost](https://github.com/goostengine/goost) that is currently only based on Godot 3
@@ -1,23 +0,0 @@
-[configuration]
-
-entry_symbol = "godot_gif_library_init"
-compatibility_minimum = "4.1"
-
-[libraries]
-
-macos.debug = "bin/godotgif.macos.template_debug.framework/libgodotgif.macos.template_debug"
-macos.release = "bin/godotgif.macos.template_release.framework/libgodotgif.macos.template_release"
-windows.debug.x86_32 = "bin/godotgif.windows.template_debug.x86_32.dll"
-windows.release.x86_32 = "bin/godotgif.windows.template_release.x86_32.dll"
-windows.debug.x86_64 = "bin/godotgif.windows.template_debug.x86_64.dll"
-windows.release.x86_64 = "bin/godotgif.windows.template_release.x86_64.dll"
-linux.debug.x86_64 = "bin/libgodotgif.linux.template_debug.x86_64.so"
-linux.release.x86_64 = "bin/libgodotgif.linux.template_release.x86_64.so"
-linux.debug.arm64 = "bin/libgodotgif.linux.template_debug.arm64.so"
-linux.release.arm64 = "bin/libgodotgif.linux.template_release.arm64.so"
-linux.debug.rv64 = "bin/libgodotgif.linux.template_debug.rv64.so"
-linux.release.rv64 = "bin/libgodotgif.linux.template_release.rv64.so"
-android.debug.x86_64 = "bin/libgodotgif.android.template_debug.x86_64.so"
-android.release.x86_64 = "bin/libgodotgif.android.template_release.x86_64.so"
-android.debug.arm64 = "bin/libgodotgif.android.template_debug.arm64.so"
-android.release.arm64 = "bin/libgodotgif.android.template_release.arm64.so"
@@ -1 +0,0 @@
-uid://b5mou30wr43g
@@ -1,35 +0,0 @@
-extends Control
-
-@onready var birthday_particles: GPUParticles2D = $BirthdayParticles
-@onready var audio_stream_player: AudioStreamPlayer = $AudioStreamPlayer
-@onready var birthday_happy: Label = $"../BirthdayHappy"
-
-var awaitingJumpscare:bool
-var IsFocused:bool
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	birthday_happy.hide()
-	print("user: ",DiscordRPC.get_current_user().get("username"))
-	var bday:bool
-	if owner.DiscordUsername == "woostudiosjohn":
-		if Time.get_datetime_dict_from_system().day == 5:
-			if Time.get_datetime_dict_from_system().month == 11:
-				await get_tree().create_timer(0.2).timeout
-				awaitingJumpscare = true
-				bday = true
-
-func _notification(what):
-	if what == get_tree().NOTIFICATION_APPLICATION_FOCUS_IN:
-		IsFocused = true
-	if what == get_tree().NOTIFICATION_APPLICATION_FOCUS_OUT:
-		IsFocused = false
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	if awaitingJumpscare && IsFocused:
-			birthday_happy.show()
-			awaitingJumpscare = false
-			birthday_particles.emitting = true
-			audio_stream_player.play()
-	if !awaitingJumpscare:
-		birthday_happy.modulate.a -= delta/5
@@ -1 +0,0 @@
-uid://n3koklp0funr
@@ -1 +0,0 @@
-uid://dg68hvw773xu6
@@ -4,7 +4,7 @@ extends Control
@onready var file_dialog: FileDialog = $FileDialog
@onready var current_directory: Label = $ScrollContainer/VBoxContainer/CurrentDirectory
@onready var playlist_name: LineEdit = $ScrollContainer/VBoxContainer/PlaylistName
-@onready var playlists_holder: VBoxContainer = $"../PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/PlaylistsHolder"
+@onready var playlists_holder: VBoxContainer = $"../PlaylistsPanel/PlaylistsContainer/VBoxContainer/PlaylistsHolder"

 const PLAYLIST_DISPLAY = preload("res://PlaylistDisplay.tscn")

@@ -1 +0,0 @@
-uid://bsnt1irskti8d
@@ -1 +0,0 @@
-uid://dl37gwyodonea
@@ -5,7 +5,8 @@ var HzDec = {0:"32 Hz",
 			2:"320 Hz",
 			3:"1000 Hz",
 			4:"3200 Hz",
-			5:"10000 Hz"}
+			5:"3200 Hz",
+			6:"10000 Hz"}

 var gainValueLabels:Array = []
 var gainValueSlider:Array = []
@@ -1 +0,0 @@
-uid://kt7n1epi3ng8
@@ -9,11 +9,9 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../SimplaudioExports/Windows/Simplaudio.exe"
-patches=PackedStringArray()
+export_path="../MusicPlayerExports/MusicPlayer.exe"
 encryption_include_filters=""
 encryption_exclude_filters=""
-seed=0
 encrypt_pck=false
 encrypt_directory=false
 script_export_mode=2
@@ -70,8 +68,8 @@ dotnet/embed_build_outputs=false

 [preset.1]

-name="Linux"
-platform="Linux"
+name="macOS"
+platform="macOS"
 runnable=true
 advanced_options=false
 dedicated_server=false
@@ -79,36 +77,244 @@ custom_features=""
 export_filter="all_resources"
 include_filter=""
 exclude_filter=""
-export_path="../SimplaudioExports/Linux/Simplaudio.x86_64"
-patches=PackedStringArray()
+export_path="../MusicPlayerMACExports/MusicPlayer.zip"
 encryption_include_filters=""
 encryption_exclude_filters=""
-seed=0
 encrypt_pck=false
 encrypt_directory=false
 script_export_mode=2

 [preset.1.options]

+export/distribution_type=1
+binary_format/architecture="universal"
 custom_template/debug=""
 custom_template/release=""
-debug/export_console_wrapper=1
-binary_format/embed_pck=false
-texture_format/s3tc_bptc=true
-texture_format/etc2_astc=false
-binary_format/architecture="x86_64"
+debug/export_console_wrapper=2
+application/icon=""
+application/icon_interpolation=4
+application/bundle_identifier="com.bucket.simplaudio"
+application/signature=""
+application/app_category="Music"
+application/short_version=""
+application/version=""
+application/copyright=""
+application/copyright_localized={}
+application/min_macos_version="10.12"
+application/export_angle=0
+display/high_res=true
+application/additional_plist_content=""
+xcode/platform_build="14C18"
+xcode/sdk_version="13.1"
+xcode/sdk_build="22C55"
+xcode/sdk_name="macosx13.1"
+xcode/xcode_version="1420"
+xcode/xcode_build="14C18"
+codesign/codesign=1
+codesign/installer_identity=""
+codesign/apple_team_id=""
+codesign/identity=""
+codesign/entitlements/custom_file=""
+codesign/entitlements/allow_jit_code_execution=false
+codesign/entitlements/allow_unsigned_executable_memory=false
+codesign/entitlements/allow_dyld_environment_variables=false
+codesign/entitlements/disable_library_validation=false
+codesign/entitlements/audio_input=false
+codesign/entitlements/camera=false
+codesign/entitlements/location=false
+codesign/entitlements/address_book=false
+codesign/entitlements/calendars=false
+codesign/entitlements/photos_library=false
+codesign/entitlements/apple_events=false
+codesign/entitlements/debugging=false
+codesign/entitlements/app_sandbox/enabled=false
+codesign/entitlements/app_sandbox/network_server=false
+codesign/entitlements/app_sandbox/network_client=false
+codesign/entitlements/app_sandbox/device_usb=false
+codesign/entitlements/app_sandbox/device_bluetooth=false
+codesign/entitlements/app_sandbox/files_downloads=0
+codesign/entitlements/app_sandbox/files_pictures=0
+codesign/entitlements/app_sandbox/files_music=0
+codesign/entitlements/app_sandbox/files_movies=0
+codesign/entitlements/app_sandbox/files_user_selected=0
+codesign/entitlements/app_sandbox/helper_executables=[]
+codesign/custom_options=PackedStringArray()
+notarization/notarization=0
+privacy/microphone_usage_description=""
+privacy/microphone_usage_description_localized={}
+privacy/camera_usage_description=""
+privacy/camera_usage_description_localized={}
+privacy/location_usage_description=""
+privacy/location_usage_description_localized={}
+privacy/address_book_usage_description=""
+privacy/address_book_usage_description_localized={}
+privacy/calendar_usage_description=""
+privacy/calendar_usage_description_localized={}
+privacy/photos_library_usage_description=""
+privacy/photos_library_usage_description_localized={}
+privacy/desktop_folder_usage_description=""
+privacy/desktop_folder_usage_description_localized={}
+privacy/documents_folder_usage_description=""
+privacy/documents_folder_usage_description_localized={}
+privacy/downloads_folder_usage_description=""
+privacy/downloads_folder_usage_description_localized={}
+privacy/network_volumes_usage_description=""
+privacy/network_volumes_usage_description_localized={}
+privacy/removable_volumes_usage_description=""
+privacy/removable_volumes_usage_description_localized={}
+privacy/tracking_enabled=false
+privacy/tracking_domains=PackedStringArray()
+privacy/collected_data/name/collected=false
+privacy/collected_data/name/linked_to_user=false
+privacy/collected_data/name/used_for_tracking=false
+privacy/collected_data/name/collection_purposes=0
+privacy/collected_data/email_address/collected=false
+privacy/collected_data/email_address/linked_to_user=false
+privacy/collected_data/email_address/used_for_tracking=false
+privacy/collected_data/email_address/collection_purposes=0
+privacy/collected_data/phone_number/collected=false
+privacy/collected_data/phone_number/linked_to_user=false
+privacy/collected_data/phone_number/used_for_tracking=false
+privacy/collected_data/phone_number/collection_purposes=0
+privacy/collected_data/physical_address/collected=false
+privacy/collected_data/physical_address/linked_to_user=false
+privacy/collected_data/physical_address/used_for_tracking=false
+privacy/collected_data/physical_address/collection_purposes=0
+privacy/collected_data/other_contact_info/collected=false
+privacy/collected_data/other_contact_info/linked_to_user=false
+privacy/collected_data/other_contact_info/used_for_tracking=false
+privacy/collected_data/other_contact_info/collection_purposes=0
+privacy/collected_data/health/collected=false
+privacy/collected_data/health/linked_to_user=false
+privacy/collected_data/health/used_for_tracking=false
+privacy/collected_data/health/collection_purposes=0
+privacy/collected_data/fitness/collected=false
+privacy/collected_data/fitness/linked_to_user=false
+privacy/collected_data/fitness/used_for_tracking=false
+privacy/collected_data/fitness/collection_purposes=0
+privacy/collected_data/payment_info/collected=false
+privacy/collected_data/payment_info/linked_to_user=false
+privacy/collected_data/payment_info/used_for_tracking=false
+privacy/collected_data/payment_info/collection_purposes=0
+privacy/collected_data/credit_info/collected=false
+privacy/collected_data/credit_info/linked_to_user=false
+privacy/collected_data/credit_info/used_for_tracking=false
+privacy/collected_data/credit_info/collection_purposes=0
+privacy/collected_data/other_financial_info/collected=false
+privacy/collected_data/other_financial_info/linked_to_user=false
+privacy/collected_data/other_financial_info/used_for_tracking=false
+privacy/collected_data/other_financial_info/collection_purposes=0
+privacy/collected_data/precise_location/collected=false
+privacy/collected_data/precise_location/linked_to_user=false
+privacy/collected_data/precise_location/used_for_tracking=false
+privacy/collected_data/precise_location/collection_purposes=0
+privacy/collected_data/coarse_location/collected=false
+privacy/collected_data/coarse_location/linked_to_user=false
+privacy/collected_data/coarse_location/used_for_tracking=false
+privacy/collected_data/coarse_location/collection_purposes=0
+privacy/collected_data/sensitive_info/collected=false
+privacy/collected_data/sensitive_info/linked_to_user=false
+privacy/collected_data/sensitive_info/used_for_tracking=false
+privacy/collected_data/sensitive_info/collection_purposes=0
+privacy/collected_data/contacts/collected=false
+privacy/collected_data/contacts/linked_to_user=false
+privacy/collected_data/contacts/used_for_tracking=false
+privacy/collected_data/contacts/collection_purposes=0
+privacy/collected_data/emails_or_text_messages/collected=false
+privacy/collected_data/emails_or_text_messages/linked_to_user=false
+privacy/collected_data/emails_or_text_messages/used_for_tracking=false
+privacy/collected_data/emails_or_text_messages/collection_purposes=0
+privacy/collected_data/photos_or_videos/collected=false
+privacy/collected_data/photos_or_videos/linked_to_user=false
+privacy/collected_data/photos_or_videos/used_for_tracking=false
+privacy/collected_data/photos_or_videos/collection_purposes=0
+privacy/collected_data/audio_data/collected=false
+privacy/collected_data/audio_data/linked_to_user=false
+privacy/collected_data/audio_data/used_for_tracking=false
+privacy/collected_data/audio_data/collection_purposes=0
+privacy/collected_data/gameplay_content/collected=false
+privacy/collected_data/gameplay_content/linked_to_user=false
+privacy/collected_data/gameplay_content/used_for_tracking=false
+privacy/collected_data/gameplay_content/collection_purposes=0
+privacy/collected_data/customer_support/collected=false
+privacy/collected_data/customer_support/linked_to_user=false
+privacy/collected_data/customer_support/used_for_tracking=false
+privacy/collected_data/customer_support/collection_purposes=0
+privacy/collected_data/other_user_content/collected=false
+privacy/collected_data/other_user_content/linked_to_user=false
+privacy/collected_data/other_user_content/used_for_tracking=false
+privacy/collected_data/other_user_content/collection_purposes=0
+privacy/collected_data/browsing_history/collected=false
+privacy/collected_data/browsing_history/linked_to_user=false
+privacy/collected_data/browsing_history/used_for_tracking=false
+privacy/collected_data/browsing_history/collection_purposes=0
+privacy/collected_data/search_hhistory/collected=false
+privacy/collected_data/search_hhistory/linked_to_user=false
+privacy/collected_data/search_hhistory/used_for_tracking=false
+privacy/collected_data/search_hhistory/collection_purposes=0
+privacy/collected_data/user_id/collected=false
+privacy/collected_data/user_id/linked_to_user=false
+privacy/collected_data/user_id/used_for_tracking=false
+privacy/collected_data/user_id/collection_purposes=0
+privacy/collected_data/device_id/collected=false
+privacy/collected_data/device_id/linked_to_user=false
+privacy/collected_data/device_id/used_for_tracking=false
+privacy/collected_data/device_id/collection_purposes=0
+privacy/collected_data/purchase_history/collected=false
+privacy/collected_data/purchase_history/linked_to_user=false
+privacy/collected_data/purchase_history/used_for_tracking=false
+privacy/collected_data/purchase_history/collection_purposes=0
+privacy/collected_data/product_interaction/collected=false
+privacy/collected_data/product_interaction/linked_to_user=false
+privacy/collected_data/product_interaction/used_for_tracking=false
+privacy/collected_data/product_interaction/collection_purposes=0
+privacy/collected_data/advertising_data/collected=false
+privacy/collected_data/advertising_data/linked_to_user=false
+privacy/collected_data/advertising_data/used_for_tracking=false
+privacy/collected_data/advertising_data/collection_purposes=0
+privacy/collected_data/other_usage_data/collected=false
+privacy/collected_data/other_usage_data/linked_to_user=false
+privacy/collected_data/other_usage_data/used_for_tracking=false
+privacy/collected_data/other_usage_data/collection_purposes=0
+privacy/collected_data/crash_data/collected=false
+privacy/collected_data/crash_data/linked_to_user=false
+privacy/collected_data/crash_data/used_for_tracking=false
+privacy/collected_data/crash_data/collection_purposes=0
+privacy/collected_data/performance_data/collected=false
+privacy/collected_data/performance_data/linked_to_user=false
+privacy/collected_data/performance_data/used_for_tracking=false
+privacy/collected_data/performance_data/collection_purposes=0
+privacy/collected_data/other_diagnostic_data/collected=false
+privacy/collected_data/other_diagnostic_data/linked_to_user=false
+privacy/collected_data/other_diagnostic_data/used_for_tracking=false
+privacy/collected_data/other_diagnostic_data/collection_purposes=0
+privacy/collected_data/environment_scanning/collected=false
+privacy/collected_data/environment_scanning/linked_to_user=false
+privacy/collected_data/environment_scanning/used_for_tracking=false
+privacy/collected_data/environment_scanning/collection_purposes=0
+privacy/collected_data/hands/collected=false
+privacy/collected_data/hands/linked_to_user=false
+privacy/collected_data/hands/used_for_tracking=false
+privacy/collected_data/hands/collection_purposes=0
+privacy/collected_data/head/collected=false
+privacy/collected_data/head/linked_to_user=false
+privacy/collected_data/head/used_for_tracking=false
+privacy/collected_data/head/collection_purposes=0
+privacy/collected_data/other_data_types/collected=false
+privacy/collected_data/other_data_types/linked_to_user=false
+privacy/collected_data/other_data_types/used_for_tracking=false
+privacy/collected_data/other_data_types/collection_purposes=0
 ssh_remote_deploy/enabled=false
 ssh_remote_deploy/host="user@host_ip"
 ssh_remote_deploy/port="22"
 ssh_remote_deploy/extra_args_ssh=""
 ssh_remote_deploy/extra_args_scp=""
 ssh_remote_deploy/run_script="#!/usr/bin/env bash
-export DISPLAY=:0
 unzip -o -q \"{temp_dir}/{archive_name}\" -d \"{temp_dir}\"
-\"{temp_dir}/{exe_name}\" {cmd_args}"
+open \"{temp_dir}/{exe_name}.app\" --args {cmd_args}"
 ssh_remote_deploy/cleanup_script="#!/usr/bin/env bash
-kill $(pgrep -x -f \"{temp_dir}/{exe_name} {cmd_args}\")
+kill $(pgrep -x -f \"{temp_dir}/{exe_name}.app/Contents/MacOS/{exe_name} {cmd_args}\")
 rm -rf \"{temp_dir}\""
 dotnet/include_scripts_content=false
-dotnet/include_debug_symbols=true
+dotnet/include_debug_symbols=false
 dotnet/embed_build_outputs=false
@@ -1,15 +0,0 @@
-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(Open)
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	pass
@@ -1 +0,0 @@
-uid://bn0iqqmor3b2b
@@ -1,29 +0,0 @@
-extends Control
-
-@onready var continue_anyways: Button = $VBoxContainer/HBoxContainer/ContinueAnyways
-@onready var contact: Button = $VBoxContainer/HBoxContainer/Contact
-@onready var failed_audio_cue: AudioStreamPlayer = $FailedAudioCue
-@onready var confirmation_dialog: ConfirmationDialog = $ConfirmationDialog
-
-func Show():
-	failed_audio_cue.play()
-	show()
-	continue_anyways.pressed.connect(confirmation_dialog.show)
-	confirmation_dialog.confirmed.connect(Confiremed)
-	contact.pressed.connect(Contact)
-
-func Confiremed():
-	owner.LoadingSaveFailed = false
-	hide()
-
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	hide()
-
-func Contact():
-	print("Contact pressed")
-	OS.shell_open("https://notdraimdev.github.io/SimplSite/Contact.html")
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	pass
@@ -1 +0,0 @@
-uid://cbdcs7oie12g5
@@ -18,22 +18,20 @@ extends Control
@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"
-@onready var songs_menu: Button = $SongsMenu
+@onready var songs_menu: MenuButton = $SongsMenu
@onready var version: Label = $Version
@onready var paused_indicator: TextureRect = $PausedIndicator
-@onready var settings_menu_child: Settings = $SettingsHolder/SettingsPopup/SettingsMenuChild
+@onready var settings_popup: Popup = $SettingsPopup
+@onready var settings_menu_child: Settings = $SettingsPopup/SettingsMenuChild
@onready var artist_name: Label = $ArtistName
@onready var user_bg: TextureRect = $UserBG
-@onready var playlists_holder: VBoxContainer = $PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/PlaylistsHolder
-@onready var play_all: Button = $PlaylistPanelHolder/PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll
+@onready var playlists_panel: Control = $PlaylistsPanel
+@onready var playlists_holder: VBoxContainer = $PlaylistsPanel/PlaylistsContainer/VBoxContainer/PlaylistsHolder
+@onready var play_all: Button = $PlaylistsPanel/PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll
@onready var album_name: Label = $Album
@onready var playlist_or_song: ConfirmationDialog = $PlaylistOrSong
-@onready var search_results: SearchResults = $SearchResults
-@onready var delete_confirm: ConfirmationDialog = $deleteConfirm
-@onready var search_bar: LineEdit = $SearchBar
-@onready var playing_now: Window = $PlayingNow

-var DiscordUsername:String
+

 const PLAYLIST_DISPLAY = preload("res://PlaylistDisplay.tscn")
 const PAUSE = preload("res://Pause.png")
@@ -63,26 +61,12 @@ var PlaylistsLocation:Dictionary
 var BackroundSetup:bool
 var CurrentPlaylist:String
 var PlayAllLists:bool
-var UsingPlayingNow:bool

@export var LoopPressed:Texture2D
@export var LoopNotPressed:Texture2D

-signal ContinueDelete
-var deleteSong:bool
-
-signal SongChanged
-var currentSongName:String
-var currentArtistName:String
-var currentAlbumName:String
-
-var LoadingSaveFailed:bool = true
-@onready var loading_failed_screen: Control = $LoadingFailedScreen
-
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	playing_now.visible = false
-	get_tree().root.min_size = Vector2(850,492)
 	current_progress.drag_ended.connect(SongDragStopped)
 	current_progress.drag_started.connect(SongDragStarted)
 	loop.pressed.connect(LoopSong)
@@ -92,17 +76,15 @@ func _ready() -> void:
 	volume_slider.value_changed.connect(SetVolume)
 	skip.pressed.connect(Skip)
 	go_back.pressed.connect(GoBack)
-	search_results.index_pressed.connect(SetSong)
-	search_results.song_deleted.connect(deletesong)
+	songs_menu.get_popup().index_pressed.connect(SetSong)
 	var Strin:String
 	for Arg in OS.get_cmdline_args():
 		if Arg.to_lower().ends_with(".mp3") or Arg.to_lower().ends_with(".wav"):
 			OS.alert("opening files like this\nis no longer supported")
 	var data:Dictionary
-	var save = loadUserdata()
-	if save != {}:
-		data = save
 	loadPlaylists()
+	if loadUserdata() != null:
+		data = loadUserdata()
 	if Strin.is_empty():
 		if !Playlists.is_empty():
 			PlaylistSelected(Playlists.keys()[0],PlaylistsLocation[Playlists.keys()[0]])
@@ -138,13 +120,6 @@ func _ready() -> void:
 			if data.has("DiscordRichPresenceEnabled"):
 				settings_menu_child.discord_rich_presence_button.set_pressed_no_signal(data["DiscordRichPresenceEnabled"])
 				DiscordRichPresenceEnabled = data["DiscordRichPresenceEnabled"]
-				if data["DiscordRichPresenceEnabled"]:
-					setUpDiscord()
-			if data.has("DiscordUsername"):
-				if data["DiscordUsername"]:
-					if DiscordRichPresenceEnabled:
-						DiscordUsername = data["DiscordUsername"]
-						print("stiff ",data)
 			if data.has("ReverbEnabled") :
 				settings_menu_child.reverb_check.button_pressed = data["ReverbEnabled"]
 			if data.has("ReverbRoomSize") :
@@ -168,8 +143,6 @@ func _ready() -> void:
 				PlayAllLists = data["PlayAllLists"]
 				if PlayAllLists:
 					play_all.button_pressed = true
-			if data.has("UsingPlayingNow"):
-				UsingPlayingNow = data["UsingPlayingNow"]
 	else:
 		if data != null:
 			print(data["Volume"])
@@ -192,34 +165,9 @@ func _ready() -> void:
 		DirectorySelected(Strin)
 		PlaySongs()
 		#PlaySongs()
-	
-	for child in get_children(true):
-		if child is Control:
-			child.focus_mode = child is LineEdit
-	if LoadingSaveFailed:
-		var file2 = FileAccess.open("user://playlists.dat", FileAccess.READ)
-		if (file2.get_error() != ERR_FILE_NOT_FOUND) or (file2.get_error() != ERR_FILE_BAD_PATH):
-			loading_failed_screen.Show()
-			ERR_PRINTER_ON_FIRE
-
-func setUpDiscord():
 	DiscordRPC.app_id = 1276916292170809426
-	DiscordRPC.refresh()
-	print("stiff chicks  ",DiscordRPC.get_current_user())
-	SplashStrings = ["the party just started!"]
-	var LText = SplashStrings.pick_random()
-	print(LText)
-	DiscordRPC.large_image_text = LText
-	if DiscordUsername == "vrenthusiest":
-		if randi_range(1,4) == 1:
-			DiscordRPC.large_image = "nullbody"
-			DiscordRPC.large_image_text = "I am racist against nullbodys - Vr"
-		else:
-			DiscordRPC.large_image = "logo"
-	else:
-		DiscordRPC.large_image = "logo"
-	DiscordUsername = DiscordRPC.get_current_user().get("username")
-	DiscordRPC.refresh()
+	
+	DiscordRPC.refresh() 
 	# this is boolean if everything worked
 	print("Discord working: " + str(DiscordRPC.get_is_discord_working()))
 	# Set the first custom text row of the activity here
@@ -229,7 +177,12 @@ func setUpDiscord():
 	# Set the second custom text row of the activity here
 	DiscordRPC.state = ""
 	# Image key for small image from "Art Assets" from the Discord Developer website
+	DiscordRPC.large_image = "logo"
 	# Tooltip text for the large image
+	SplashStrings = ["the party just started!"]
+	var LText = SplashStrings.pick_random()
+	print(LText)
+	DiscordRPC.large_image_text = LText
 	# Image key for large image from "Art Assets" from the Discord Developer website
 	DiscordRPC.small_image = ""
 	# Tooltip text for the small image
@@ -238,43 +191,12 @@ func setUpDiscord():
 	# Always refresh after changing the values!
 	DiscordRPC.refresh() 

-func deletesong(idx:int):
-	var currentDir:String= CurrentDir
-	currentDir += "/" + textSongs[idx]
-	delete_confirm.show()
-	delete_confirm.dialog_text = "are you sure you want to delete \n" + textSongs[idx] +"?"
-	delete_confirm.confirmed.connect(deleteConfirmed)
-	delete_confirm.canceled.connect(deleteCancelled)
-	await ContinueDelete
-	delete_confirm.canceled.disconnect(deleteCancelled)
-	delete_confirm.confirmed.disconnect(deleteConfirmed)
-	if deleteSong:
-		print("deleted + " + currentDir)
-		deleteSong = false
-		var dir = DirAccess.remove_absolute(currentDir)
-		print("error code " +str(dir) + " (zero is good)")
-		if dir == 0:
-			textSongs.remove_at(idx)
-		if search_bar.visible:
-			search_bar.updateResults()
-		else:
-			songs_menu._pressed()
-		Playlists[CurrentPlaylist].erase(textSongs[idx])
-
-func deleteCancelled():
-	deleteSong = false
-	ContinueDelete.emit()
-
-func deleteConfirmed():
-	deleteSong = true
-	ContinueDelete.emit()

 func SongDragStopped(Changed:bool):
 	if Changed:
 		music_player.play(current_progress.value * CurrentSongLenth / current_progress.max_value)
 		if Paused:
 			pausePlay()
-		
 		UpdateProgressSlider = true
 		DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
 		DiscordRPC.refresh()
@@ -299,8 +221,7 @@ func SetSong(IDX:int):
 	CurrentIDX = IDX -1
 	PlaySongs()
 	music_player.stop()
-	if !LoadingSaveFailed:
-		SaveEverything()
+	SaveEverything()
 	print("SetSong")

 func pausePlay():
@@ -328,15 +249,16 @@ func SetVolume(Volume:float):
 	
 	var volume = (-50 + (Volume/2))
 	if Volume >= 2:
-		AudioServer.set_bus_volume_db(1,volume)
+		AudioServer.set_bus_volume_db(0,volume)
 	else:
-		AudioServer.set_bus_volume_db(1,-1000)
+		AudioServer.set_bus_volume_db(0,-1000)
+	print("Chnaged Volume")
+	SaveEverything()
 	volume_slider.value = Volume

 func SelectPlaylistDir():
 	file_dialog.show()
-	if !LoadingSaveFailed:
-		SaveEverything()
+	SaveEverything()
 	print("Select Playtlist dir")

 func DirectorySelected(dir:String):
@@ -349,15 +271,17 @@ func PlaySongs():
 	
 	if music_player.playing:
 		Paused = true
+		DiscordRPC.state = "Paused"
 		music_player.stream_paused = true
 		play_list.icon = PLAY
-		DiscordRPC.state = "Paused"
 		print(DiscordRPC.get_current_user())
 	else:
 		DiscordRPC.start_timestamp = int(Time.get_unix_time_from_system() - (current_progress.value * CurrentSongLenth / current_progress.max_value))
 		print(DiscordRPC.get_current_user())
-		
-		DiscordRPC.state = "Listening To Music"
+		if DiscordRPC.get_current_user().get("username") == "_bucketofchicken":
+			DiscordRPC.state = "i made the music player btw"
+		else:
+			DiscordRPC.state = "Listening To Music"
 		Paused = false
 		music_player.stream_paused = false
 		play_list.icon = PAUSE
@@ -366,7 +290,7 @@ func PlaySongs():
 		if LoopingSong:
 			music_player.play()
 		elif textSongs.size() != 0:
-			var index:int
+			var index
 			if OpenedSong.is_empty():
 				if PlayAllLists:
 					if CurrentIDX >= (textSongs.size()):
@@ -385,7 +309,6 @@ func PlaySongs():
 					GetSongs(PlaylistsLocation[CurrentPlaylist])
 			var CurrentSongDir:String = PlaylistsLocation[CurrentPlaylist] + "/" + textSongs[index]
 			DiscordRPC.details = textSongs[index].replace(".mp3","")
-			currentSongName = textSongs[index].replace(".mp3","")
 			print(CurrentSongDir)
 			var sonnname:String = textSongs[index]
 			sonnname = sonnname.replace(".mp3", "")
@@ -402,21 +325,17 @@ func PlaySongs():
 				if MusicMetadataAutoload.get_mp3_metadata(song).title != "":
 					song_name.text = MusicMetadataAutoload.get_mp3_metadata(song).title
 				if MusicMetadataAutoload.get_mp3_metadata(song).artist != "":
-					currentArtistName = MusicMetadataAutoload.get_mp3_metadata(song).artist
-				else: currentArtistName = ""
-				artist_name.text = currentArtistName
+					artist_name.text = MusicMetadataAutoload.get_mp3_metadata(song).artist
+				else: artist_name.text = ""
 				if MusicMetadataAutoload.get_mp3_metadata(song).album != "":
-					currentAlbumName = MusicMetadataAutoload.get_mp3_metadata(song).album
-				else: currentAlbumName = ""
-				album_name.text = currentAlbumName
+					album_name.text = MusicMetadataAutoload.get_mp3_metadata(song).album
+				else: album_name.text = ""
 			if song != null:
 				CurrentSongLenth = song.get_length()
 				music_player.stream = song
 				music_player.play()
-				if !LoadingSaveFailed:
-					SaveEverything()
+				SaveEverything()
 				print("set stream")
-		SongChanged.emit()


 func GetSongs(dir:String):
@@ -439,11 +358,11 @@ func GetSongs(dir:String):
 				wav_disclaimer.show()
 				SeenWAVDisclaimer = true
 		#print(songs)
-		search_results.clear()
+		songs_menu.get_popup().clear(true)
 		textSongs = songs
 		for song in textSongs:
-			var nam = song
-			search_results.add_item(nam)
+			var nam = song.replace(".mp3", "")
+			songs_menu.get_popup().add_item(nam)

 func Randomize():
 	if textSongs.size() != 0:
@@ -462,10 +381,10 @@ func Randomize():
 		
 		
 		Randomized = true
-		search_results.clear()
+		songs_menu.get_popup().clear(true)
 		for song in textSongs:
-			var nam = song
-			search_results.add_item(nam)
+			var nam = song.replace(".mp3", "")
+			songs_menu.get_popup().add_item(nam)
 		#print(textSongs)

 func PlaylistSelected(Playlist:String,PlaylistLocation:String):
@@ -485,7 +404,6 @@ func PlaylistSelected(Playlist:String,PlaylistLocation:String):

 # Called every frame. 'delta' is the elapsed time since the previous frame.
 func _process(_delta: float) -> void:
-	playing_now.visible = UsingPlayingNow
 	currentSaveTime -= _delta
 	if !BackroundSetup:
 		if CurrentCustomBackroundImageDirectory != null and CurrentCustomBackroundImageDirectory != "":
@@ -493,32 +411,43 @@ func _process(_delta: float) -> void:
 			BackroundSetup = true
 	if currentSaveTime < 0:
 		currentSaveTime = SaveInterval
-		if DiscordRichPresenceEnabled:
-			DiscordUsername = DiscordRPC.get_current_user().get("username")
-		if !LoadingSaveFailed:
-			SaveEverything()
+		SaveEverything()
+		print("yoo")
 		@warning_ignore("integer_division")
-		if DiscordRichPresenceEnabled:
-			if DiscordRPC.large_image != "nullbody":
-				UpdateSplashes()
-			if DiscordRPC.get_is_discord_working():
-				print(DiscordRPC.get_current_user()["username"])
-			print(TimeSpentListening)
-			var LText = SplashStrings.pick_random()
-			if DiscordRPC.large_image != "nullbody":
-				DiscordRPC.large_image_text = LText
-			if DiscordRPC.get_is_discord_working():
-				DiscordRPC.refresh()
+		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"]
+		print(DiscordRPC.get_current_user()["username"])
+		print(TimeSpentListening)
+		var LText = SplashStrings.pick_random()
+		DiscordRPC.large_image_text = LText
+		DiscordRPC.refresh()
 	# "59:59 remaining" timestamp for the activity
 	if music_player.playing:
 		TimeSpentListening += _delta
+		if DiscordRPC.get_current_user().get("username") == "_bucketofchicken":
+			DiscordRPC.state = "i made the music player btw"
+		else:
+			DiscordRPC.state = "Listening To Music"
 		CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,0.0,0.1)
-		DiscordRPC.state = "Listening To Music"
 	else:
 		DiscordRPC.start_timestamp = int(0)
 		DiscordRPC.state = "Paused"
-		if DiscordRPC.get_is_discord_working():
-			DiscordRPC.refresh()
+		DiscordRPC.refresh()
 		CurrentPausedIndicatorShaderIntensity = lerp(CurrentPausedIndicatorShaderIntensity,1.0,0.1)
 	if DiscordRichPresenceEnabled:
 		DiscordRPC.run_callbacks()
@@ -557,31 +486,7 @@ func _process(_delta: float) -> void:
 		DiscordRPC.refresh()


-func UpdateSplashes():
-	if DiscordRPC.get_is_discord_working():
-		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():
@@ -604,71 +509,43 @@ func SaveEverything():
 		"CompressionRatio" : settings_menu_child.ratio_slider.value ,
 		"CompressionGain" : settings_menu_child.gain_slider.value,
 		"CurrentCustomBackroundImageDirectory" : CurrentCustomBackroundImageDirectory,
-		"PlayAllLists" : PlayAllLists,
-		"DiscordUsername" : DiscordRPC.get_current_user().get("username"),
-		"UsingPlayingNow" : UsingPlayingNow
+		"PlayAllLists" : PlayAllLists
 	}
-	print("saving")
 	saveUserdata(Data)
 	savePlaylists()

-var saveRetrys:int =0
-
 func savePlaylists():
 	var json = JSON.new()
 	var file = FileAccess.open("user://playlists.dat", FileAccess.WRITE)
 	var file2 = FileAccess.open("user://playlistsLocation.dat", FileAccess.WRITE)
 	@warning_ignore("static_called_on_instance")
-	if !(Playlists == null) or !(Playlists == {}):
+	if !Playlists == null or !Playlists == {}:
 		file.store_string(str(json.stringify(Playlists)))
-	if !(PlaylistsLocation == null) or !(PlaylistsLocation == {}):
+	if !PlaylistsLocation == null or !PlaylistsLocation == {}:
 		file2.store_string(str(json.stringify(PlaylistsLocation)))
-	if loadUserdata() == {}:
-		if saveRetrys < 3:
-			savePlaylists()
-		else:
-			printerr("saving failed")


 func saveUserdata(content):
 	var json = JSON.new()
 	var file = FileAccess.open("user://data.dat", FileAccess.WRITE)
 	@warning_ignore("static_called_on_instance")
-	file.store_string(json.stringify(content))
-	file.close()
+	file.store_string(Marshalls.utf8_to_base64(json.stringify(content)))

-var saveLoadTries:int
-
-func loadUserdata() -> Dictionary:
+func loadUserdata():
 	var json = JSON.new()
 	var file = FileAccess.open("user://data.dat", FileAccess.READ)
 	var filetext = file.get_as_text() if file != null else null
 	if file != null:
-		var content:Dictionary = {}
+		var content
 		if json.parse_string(file.get_as_text()) != null:
 			content = json.parse_string(filetext)
 		else:
 			@warning_ignore("static_called_on_instance")
 			content = json.parse_string(Marshalls.base64_to_utf8(file.get_as_text()))
-		file.close()
-		if content != null:
-			LoadingSaveFailed = false
-			return content
-		else:
-			LoadingSaveFailed = true
-			return {}
+		return content
 	else: 
-		file.close()
-		printerr("loading save failed")
-		if saveLoadTries < 3:
-			print("retrying")
-			saveLoadTries +=1
-			return loadUserdata()
-		LoadingSaveFailed = true
-		return {}
+		return null

-
-var playlistLoadTries:int
 func loadPlaylists():
 	var json = JSON.new()
 	var file = FileAccess.open("user://playlistsLocation.dat", FileAccess.READ)
@@ -678,19 +555,8 @@ func loadPlaylists():
 	print(filetext)
 	#print("shit " + json.parse_string(filetext))
 	if file.get_as_text() != "" and file2.get_as_text() != "":
-		var PlaylistsLocationTemp
-		var PlaylistsTemp
-		PlaylistsLocationTemp = json.parse_string(file.get_as_text())
-		PlaylistsTemp = json.parse_string(file2.get_as_text())
-		if (PlaylistsTemp == null) or (PlaylistsLocationTemp == null):
-			printerr("Loading playlists failed")
-			LoadingSaveFailed = true
-		else:
-			LoadingSaveFailed = false
-			Playlists = PlaylistsTemp
-			PlaylistsLocation = PlaylistsLocationTemp
+		PlaylistsLocation = json.parse_string(file.get_as_text())
+		Playlists = {} if json.parse_string(file2.get_as_text()) == null else json.parse_string(file2.get_as_text())
 		print(PlaylistsLocation)
 		print(Playlists.keys())
 		print("Playlists")
-	file.close()
-	file2.close() 
@@ -1 +0,0 @@
-uid://cvqefw0g6ala7
@@ -1,4 +0,0 @@
-extends Button
-
-func _pressed() -> void:
-	OS.shell_open("https://notdraimdev.github.io/SimplSite/notes.html")
@@ -1 +0,0 @@
-uid://bh3btjt2hkbs
@@ -1,21 +0,0 @@
-extends Control
-
-@export var ParentScene:MainScene
-@onready var desctibtor: Label = $Desctibtor
-@onready var ParentWindow:Window = $".."
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	ParentScene.SongChanged.connect(SongChanged)
-	
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	ParentWindow.size = size 
-
-func SongChanged():
-	print("SongChanged: ", ParentScene.currentSongName)
-	desctibtor.text = 'Now Playing: "'  + ParentScene.currentSongName + '"'
-	if ParentScene.currentArtistName:
-		desctibtor.text += " uploaded by " + ParentScene.currentArtistName
-	#ParentWindow.size = size * 2
@@ -1 +0,0 @@
-uid://q2gdlr10ncnb
@@ -1,11 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://n7cnapaftfse"]
-
-[ext_resource type="Script" path="res://playing_now_window.gd" id="1_f0rac"]
-
-[node name="PlayingNowWindow" type="AspectRatioContainer"]
-offset_right = 160.0
-offset_bottom = 23.0
-script = ExtResource("1_f0rac")
-
-[node name="Desctibtor" type="Label" parent="."]
-layout_mode = 2
@@ -6,7 +6,7 @@ extends Control
@onready var options_dropdown: MenuButton = $HSplitContainer/HBoxContainer/OptionsDropdown
@onready var confirmation: ConfirmationDialog = $ConfirmationDialog

-@onready var Parent:MainScene = get_tree().root.get_child(3)
+@onready var Parent:MainScene = get_tree().root.get_child(2)

@export var Current:bool
 var PlaylistLocation:String = ""
@@ -1 +0,0 @@
-uid://cs12qambyvou8
@@ -1,6 +1,6 @@
 extends Control
@onready var create_playlist: Button = $PlaylistsContainer/VBoxContainer/HBoxContainer/CreatePlaylist
-@onready var create_playlists_menu: Control = $"../../CreatePlaylistsMenu"
+@onready var create_playlists_menu: Control = $"../CreatePlaylistsMenu"
@onready var play_all: Button = $PlaylistsContainer/VBoxContainer/HBoxContainer/PlayAll


@@ -1 +0,0 @@
-uid://bxc2fqwlm5ea5
@@ -16,7 +16,6 @@ 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"

@@ -24,15 +23,14 @@ config/windows_native_icon="res://addons/godot-yt-dlp/src/favicon2.ico"

 YtDlp="*res://addons/godot-yt-dlp/src/yt_dlp.gd"
 MusicMetadataAutoload="*res://MusicMeta-f98d7384de3e2e658dcba3f5b06fb5b57ac2c73c/MusicMeta.gd"
-DiscordRPCLoader="*res://addons/discord-rpc-gd/nodes/discord_autoload.gd"

 [display]

 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"
-window/per_pixel_transparency/allowed=true

 [dotnet]

@@ -49,9 +47,10 @@ enabled=PackedStringArray("res://addons/discord-rpc-gd/plugin.cfg", "res://addon

 [rendering]

-textures/canvas_textures/default_texture_filter=2
 renderer/rendering_method="gl_compatibility"
 renderer/rendering_method.mobile="gl_compatibility"
 textures/vram_compression/import_etc2_astc=true
-textures/default_filters/texture_mipmap_bias=2.0
 environment/defaults/default_clear_color=Color(0.147672, 0.147672, 0.147672, 1)
+anti_aliasing/quality/msaa_2d=2
+2d/snap/snap_2d_vertices_to_pixel=true
+2d/sdf/scale=0
@@ -1,19 +0,0 @@
-[remap]
-
-importer="mp3"
-type="AudioStreamMP3"
-uid="uid://bwfw3l3iyv67o"
-path="res://.godot/imported/roblox win sound effect.mp3-39d0ba8b033f858214671048098e2f18.mp3str"
-
-[deps]
-
-source_file="res://roblox win sound effect.mp3"
-dest_files=["res://.godot/imported/roblox win sound effect.mp3-39d0ba8b033f858214671048098e2f18.mp3str"]
-
-[params]
-
-loop=false
-loop_offset=0
-bpm=0
-beat_count=0
-bar_beats=4
@@ -1,5 +1,5 @@
 extends LineEdit
-@onready var search_results: SearchResults = $"../SearchResults"
+@onready var search_results: PopupMenu = $"../SearchResults"

 var values:Dictionary = {}
 var ErrorMargin:float = 0.9
@@ -8,7 +8,8 @@ var currentTime:float
 var TextChanged:bool
 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	pass
+	search_results.popup_window = false
+	search_results.unfocusable = true


 # Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -16,43 +17,46 @@ func _process(delta: float) -> void:
 	currentTime -= delta
 	if TextChanged:
 		if currentTime < 0:
-			updateResults()
-
-func updateResults():
-	release_focus()
-	TextChanged = false
-	search_results.clear()
-	values.clear()
-	currentTime = updatetime
-	var _i:int = 0
-	var _s:int = 0
-	for song:String in owner.textSongs:
-		var margin:float
-		var fragments:Array
-		#print(int((text.length() / 2.0) + 0.5))
-		for num in range(int((text.length() / 2.0) + 0.5)):
-			if text.to_lower().substr(int(num*2),2):
-				fragments.append(text.to_lower().substr(int(num*2),2))
-			elif text.to_lower().substr(int(num*2),1):
-				fragments.append(text.to_lower().substr(int(num*2),1))
-		var amountOfFrags:int
-		for fragment:String in fragments:
-			
-			if song.to_lower().containsn(fragment):
-				amountOfFrags +=1
-		
-		margin = float(amountOfFrags) / fragments.size()
-		if margin > ErrorMargin:
-			search_results.add_item(song)
-			values[_i] = _s
-			_i += 1
-		_s += 1
+			release_focus()
+			TextChanged = false
+			search_results.clear(true)
+			values.clear()
+			currentTime = updatetime
+			var _i:int = 0
+			var _s:int = 0
+			for song:String in owner.textSongs:
+				var margin:float
+				var fragments:Array
+				#print(int((text.length() / 2.0) + 0.5))
+				for num in range(int((text.length() / 2.0) + 0.5)):
+					if text.to_lower().substr(int(num*2),2):
+						fragments.append(text.to_lower().substr(int(num*2),2))
+					elif text.to_lower().substr(int(num*2),1):
+						fragments.append(text.to_lower().substr(int(num*2),1))
+				var amountOfFrags:int
+				for fragment:String in fragments:
+					
+					if song.to_lower().containsn(fragment):
+						amountOfFrags +=1
+				
+				margin = float(amountOfFrags) / fragments.size()
+				if margin > ErrorMargin:
+					search_results.add_item(song.replace(".mp3","") )
+					values[_i] = _s
+					_i += 1
+				_s += 1

 func _on_search_results_index_pressed(index: int) -> void:
 	print("index " + str(index))
 	owner.SetSong(values[index])
 	

+func _input(event):
+	if (event is InputEventMouseButton) and event.pressed:
+		var evLocal = make_input_local(event)
+		if !Rect2(Vector2(0,0),Vector2(search_results.size.y+ size.y,size.x)).has_point(evLocal.position):
+			search_results.hide()
+
 func _on_text_submitted(new_text: String) -> void:
 	TextChanged = true
 	if !search_results.visible:
@@ -1 +0,0 @@
-uid://cchutywgopaq4
@@ -1,33 +0,0 @@
-extends Control
-
-var SongName:String
-var CurrentlyPlaying:bool
-var songidx:int
-@onready var songname: Button = $HBoxContainer/Songname
-@onready var dropdown: Button = $HBoxContainer/Dropdown
-@onready var popup_menu: PopupMenu = $PopupMenu
-
-
-signal PlayPressed
-signal DeletePressed
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	songname.text = SongName
-	popup_menu.index_pressed.connect(popupPressed)
-
-func popupPressed(idx:int):
-	if idx == 0:
-		DeletePressed.emit(songidx)
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	dropdown.visible = songname.is_hovered() or dropdown.is_hovered()
-
-
-func _on_songname_pressed() -> void:
-	PlayPressed.emit(songidx)
-
-
-func _on_dropdown_pressed() -> void:
-	popup_menu.show()
-	popup_menu.position = get_global_mouse_position()
@@ -1 +0,0 @@
-uid://c3aaxhp0oim08
@@ -1,53 +0,0 @@
-[gd_scene load_steps=3 format=3 uid="uid://ctqcbjrmxaqsk"]
-
-[ext_resource type="Script" path="res://search_item.gd" id="1_j4126"]
-[ext_resource type="Texture2D" uid="uid://dwvy6crqhardn" path="res://Dropdown.png" id="2_hicj1"]
-
-[node name="SearchItem" type="Control"]
-custom_minimum_size = Vector2(0, 30)
-layout_mode = 3
-anchors_preset = 14
-anchor_top = 0.5
-anchor_right = 1.0
-anchor_bottom = 0.5
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 3
-size_flags_vertical = 4
-script = ExtResource("1_j4126")
-
-[node name="HBoxContainer" type="HBoxContainer" parent="."]
-custom_minimum_size = Vector2(700, 32)
-layout_mode = 1
-anchors_preset = 4
-anchor_top = 0.5
-anchor_bottom = 0.5
-offset_top = -16.0
-offset_right = 700.0
-offset_bottom = 16.0
-grow_vertical = 2
-alignment = 1
-
-[node name="Dropdown" type="Button" parent="HBoxContainer"]
-custom_minimum_size = Vector2(20, 0)
-layout_mode = 2
-tooltip_text = "delete song from hard-drive"
-focus_mode = 0
-icon = ExtResource("2_hicj1")
-flat = true
-icon_alignment = 1
-expand_icon = true
-
-[node name="Songname" type="Button" parent="HBoxContainer"]
-layout_mode = 2
-size_flags_horizontal = 3
-focus_mode = 0
-flat = true
-alignment = 0
-
-[node name="PopupMenu" type="PopupMenu" parent="."]
-item_count = 1
-item_0/text = "delete"
-
-[connection signal="pressed" from="HBoxContainer/Dropdown" to="." method="_on_dropdown_pressed"]
-[connection signal="pressed" from="HBoxContainer/Songname" to="." method="_on_songname_pressed"]
@@ -1,48 +0,0 @@
-class_name SearchResults
-extends Control
-
-signal index_pressed
-signal song_deleted
-
-const SEARCH_ITEM = preload("res://search_item.tscn")
-
-@onready var item_container: VBoxContainer = $Control/ItemContainer
-
-var SongsAmount:int
-
-@onready var parent:MainScene = owner
-
-# Called when the node enters the scene tree for the first time.
-func _ready() -> void:
-	pass # Replace with function body.
-
-
-# Called every frame. 'delta' is the elapsed time since the previous frame.
-func _process(delta: float) -> void:
-	pass
-
-func add_item(text:String):
-	var child = SEARCH_ITEM.instantiate()
-	child.SongName = text.replace(".mp3", "")
-	child.songidx = parent.textSongs.find(text)
-	SongsAmount+=1
-	child.PlayPressed.connect(songSelected)
-	child.DeletePressed.connect(deletePressed)
-	item_container.add_child(child)
-
-func clear():
-	SongsAmount = 0
-	for child in item_container.get_children():
-		child.queue_free()
-
-func songSelected(idx:int):
-	index_pressed.emit(idx)
-
-func _input(event):
-	if (event is InputEventMouseButton) and event.pressed:
-		var evLocal = make_input_local(event)
-		if !Rect2(Vector2(0,0),Vector2(size.x,size.y)).has_point(evLocal.position):
-			hide()
-
-func deletePressed(idx:int):
-	song_deleted.emit(idx)
@@ -1 +0,0 @@
-uid://d0hvudugo3d37
@@ -1,42 +0,0 @@
-[gd_scene load_steps=2 format=3 uid="uid://bel6i6wdbexw4"]
-
-[ext_resource type="Script" path="res://search_results.gd" id="1_mcn1o"]
-
-[node name="SearchResults" type="Control"]
-layout_mode = 3
-anchors_preset = 5
-anchor_left = 0.5
-anchor_right = 0.5
-offset_left = -311.5
-offset_right = 311.5
-offset_bottom = 300.0
-grow_horizontal = 2
-script = ExtResource("1_mcn1o")
-
-[node name="ColorRect" type="ColorRect" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
-color = Color(0.14902, 0.14902, 0.14902, 1)
-
-[node name="Control" type="ScrollContainer" parent="."]
-layout_mode = 1
-anchors_preset = 15
-anchor_right = 1.0
-anchor_bottom = 1.0
-grow_horizontal = 2
-grow_vertical = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
-follow_focus = true
-horizontal_scroll_mode = 0
-
-[node name="ItemContainer" type="VBoxContainer" parent="Control"]
-layout_mode = 2
-size_flags_horizontal = 3
-size_flags_vertical = 3
@@ -1,7 +1,7 @@
 extends Button

@onready var search_bar: LineEdit = $"../SearchBar"
-@onready var songs_menu: Button = $"../SongsMenu"
+@onready var songs_menu: MenuButton = $"../SongsMenu"

@export var PressedIcon:Texture2D
@export var NotPressedIcon:Texture2D
@@ -1 +0,0 @@
-uid://c2t3ignwqoplj
@@ -1,23 +1,10 @@
 extends Button
-@onready var playlists_panel: Control = $"../PlaylistPanelHolder/PlaylistsPanel"
-var currentlyExtending:bool
-var Target:float = 50
+@onready var playlists_panel: Control = $"../PlaylistsPanel"
+

-func _process(delta: float) -> void:
-	if currentlyExtending:
-		playlists_panel.position.x = clamp(lerp(playlists_panel.position.x,Target,0.25),0,100)
-	else:
-		playlists_panel.position.x -=1
-		playlists_panel.position.x = clamp(lerp(Target,playlists_panel.position.x,1.25),0,100)
-	playlists_panel.modulate.a = playlists_panel.position.x / Target
-	if playlists_panel.position.x > 1:
-		playlists_panel.show()
-	else:
-		playlists_panel.hide()

 func _on_toggled(toggled_on: bool) -> void:
 	if toggled_on:
-		currentlyExtending = true
-		playlists_panel.position.x = 1
+		playlists_panel.show()
 	else:
-		currentlyExtending = false
+		playlists_panel.hide()
@@ -1 +0,0 @@
-uid://dv2vjibopktug
@@ -2,8 +2,6 @@ class_name Settings
 extends Control
@onready var exit: Button = $Exit

-# do NOT think i dont hate this codebase, it sucks man 😭
-
@onready var discord_rich_presence_button: CheckBox = $ScrollContainer/VBoxContainer/DiscordRichPresenceButton

@onready var pitch_slider: HSlider = $ScrollContainer/VBoxContainer/PitchAdjustSettings/PitchSlider
@@ -42,14 +40,11 @@ extends Control
@onready var select_bg: Button = $ScrollContainer/VBoxContainer/VBoxContainer/HBoxContainer/SelectBG
@onready var reset_bg: Button = $ScrollContainer/VBoxContainer/VBoxContainer/HBoxContainer/ResetBG

-@onready var now_playing_window_button: CheckBox = $ScrollContainer/VBoxContainer/NowPlayingWindowButton
-
-
 var CurrentBGImagePath:String

 # Called when the node enters the scene tree for the first time.
 func _ready() -> void:
-	now_playing_window_button.button_pressed = Parent.UsingPlayingNow
+	pass


 # Called every frame. 'delta' is the elapsed time since the previous frame.
@@ -79,7 +74,7 @@ func _on_h_slider_drag_ended(value_changed: bool) -> void:
 	Parent.SaveEverything()

 func _on_exit_pressed() -> void:
-	Parent.find_child("SettingsButton").button_pressed = false
+	get_parent().hide()
 	Parent.SaveEverything()

 #region Reverb
@@ -148,7 +143,6 @@ func _on_discord_rich_presence_button_toggled(toggled_on: bool) -> void:
 		Parent.DiscordRichPresenceEnabled = true
 	else:
 		Parent.DiscordRichPresenceEnabled = false
-	Parent.setUpDiscord()
 	Parent.SaveEverything()


@@ -176,10 +170,7 @@ func _on_select_bg_dialog_file_selected(path: String) -> void:
 	Parent.CurrentCustomBackroundImageDirectory = path
 	backround_dir_label.text = path
 	#print(path)
-	if !path.ends_with(".gif"):
-		Parent.user_bg.texture = ImageTexture.create_from_image(Image.load_from_file(CurrentBGImagePath))
-	else:
-		Parent.user_bg.texture = GifManager.animated_texture_from_file(path)
+	Parent.user_bg.texture = ImageTexture.create_from_image(Image.load_from_file(CurrentBGImagePath))
 	Parent.SaveEverything()

 func _on_reset_bg_pressed() -> void:
@@ -187,9 +178,3 @@ func _on_reset_bg_pressed() -> void:
 	Parent.user_bg.texture = null
 	Parent.CurrentCustomBackroundImageDirectory = ""
 	Parent.SaveEverything()
-
-
-func _on_now_playing_window_button_toggled(toggled_on: bool) -> void:
-	Parent.UsingPlayingNow = toggled_on
-	Parent.SaveEverything()
-	
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Bucket Of Chicken	0564e0bd26	Version checker Version checker	2024-09-25 20:33:03 +02:00
Bucket Of Chicken	63be2bb195	Merge pull request #4 from notdraimdev/development Development to main merge	2024-09-25 18:00:19 +02:00
Bucket Of Chicken	d6736d8ff5	Merge pull request #3 from notdraimdev/development Fixed wrong playlist at start	2024-09-16 16:45:12 +02:00
Bucket Of Chicken	090e226053	Merge pull request #1 from notdraimdev/development Development	2024-09-12 22:09:11 +02:00