Greatly optimized and refactored sorting and searching code (YARC-Off…

…icial#477) * Refactored a lot of stuff * Fixed remaining bugs * Sort by name after other sorts * Made sort headers display song count
SolemnSpirit · Jun 18, 2023 · ed9d5a9 · ed9d5a9
1 parent 28420e6
commit ed9d5a9
Show file tree

Hide file tree

Showing 13 changed files with 469 additions and 762 deletions.
diff --git a/Assets/Prefabs/UI/MusicLibrary/MusicLibrary.prefab b/Assets/Prefabs/UI/MusicLibrary/MusicLibrary.prefab
@@ -422,7 +422,7 @@ RectTransform:
   - {fileID: 4030813025972567528}
   - {fileID: 6271388387458492797}
   m_Father: {fileID: 4030813025219603266}
-  m_RootOrder: 3
+  m_RootOrder: 2
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 1}
   m_AnchorMax: {x: 1, y: 1}
@@ -500,7 +500,6 @@ RectTransform:
   m_ConstrainProportionsScale: 0
   m_Children:
   - {fileID: 4030813025405445822}
-  - {fileID: 4030813026458977997}
   - {fileID: 6752159586258751426}
   - {fileID: 4030813025152668004}
   m_Father: {fileID: 0}
@@ -584,13 +583,12 @@ MonoBehaviour:
   m_Script: {fileID: 11500000, guid: 06c7227a8e2dd1f46a66eea1291d775b, type: 3}
   m_Name: 
   m_EditorClassIdentifier: 
-  songViewPrefab: {fileID: 6846856529861592903, guid: 2ac99c03b5c92274d8dc4785c6cbf879,
+  _songViewPrefab: {fileID: 6846856529861592903, guid: 2ac99c03b5c92274d8dc4785c6cbf879,
     type: 3}
-  searchField: {fileID: 4030813025972567531}
-  songListContent: {fileID: 4030813026311060847}
-  sidebar: {fileID: 5958352451011471034}
-  noSongsText: {fileID: 4030813026458977986}
-  scrollbar: {fileID: 4030813026755114794}
+  _searchField: {fileID: 4030813025972567531}
+  _songListContent: {fileID: 4030813026311060847}
+  _sidebar: {fileID: 5958352451011471034}
+  _scrollbar: {fileID: 4030813026755114794}
 --- !u!1 &4030813025300223061
 GameObject:
   m_ObjectHideFlags: 0
@@ -1242,142 +1240,6 @@ MonoBehaviour:
   m_EditorClassIdentifier: 
   m_HorizontalFit: 0
   m_VerticalFit: 2
---- !u!1 &4030813026458977986
-GameObject:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  serializedVersion: 6
-  m_Component:
-  - component: {fileID: 4030813026458977997}
-  - component: {fileID: 4030813026458977999}
-  - component: {fileID: 4030813026458977996}
-  m_Layer: 5
-  m_Name: No Songs Text
-  m_TagString: Untagged
-  m_Icon: {fileID: 0}
-  m_NavMeshLayer: 0
-  m_StaticEditorFlags: 0
-  m_IsActive: 0
---- !u!224 &4030813026458977997
-RectTransform:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4030813026458977986}
-  m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
-  m_LocalPosition: {x: 0, y: 0, z: 0}
-  m_LocalScale: {x: 1, y: 1, z: 1}
-  m_ConstrainProportionsScale: 0
-  m_Children: []
-  m_Father: {fileID: 4030813025219603266}
-  m_RootOrder: 1
-  m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
-  m_AnchorMin: {x: 0, y: 0}
-  m_AnchorMax: {x: 1, y: 1}
-  m_AnchoredPosition: {x: -249.75, y: -68.27002}
-  m_SizeDelta: {x: -499.5, y: -304.54}
-  m_Pivot: {x: 0.5, y: 0.5}
---- !u!222 &4030813026458977999
-CanvasRenderer:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4030813026458977986}
-  m_CullTransparentMesh: 1
---- !u!114 &4030813026458977996
-MonoBehaviour:
-  m_ObjectHideFlags: 0
-  m_CorrespondingSourceObject: {fileID: 0}
-  m_PrefabInstance: {fileID: 0}
-  m_PrefabAsset: {fileID: 0}
-  m_GameObject: {fileID: 4030813026458977986}
-  m_Enabled: 1
-  m_EditorHideFlags: 0
-  m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
-  m_Name: 
-  m_EditorClassIdentifier: 
-  m_Material: {fileID: 0}
-  m_Color: {r: 1, g: 1, b: 1, a: 1}
-  m_RaycastTarget: 1
-  m_RaycastPadding: {x: 0, y: 0, z: 0, w: 0}
-  m_Maskable: 1
-  m_OnCullStateChanged:
-    m_PersistentCalls:
-      m_Calls: []
-  m_text: Nothing is here...
-  m_isRightToLeft: 0
-  m_fontAsset: {fileID: 11400000, guid: ae170e91fd29a90479e906ddffb1d8ee, type: 2}
-  m_sharedMaterial: {fileID: -5480317595949376055, guid: ae170e91fd29a90479e906ddffb1d8ee,
-    type: 2}
-  m_fontSharedMaterials: []
-  m_fontMaterial: {fileID: 0}
-  m_fontMaterials: []
-  m_fontColor32:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontColor: {r: 1, g: 1, b: 1, a: 1}
-  m_enableVertexGradient: 0
-  m_colorMode: 3
-  m_fontColorGradient:
-    topLeft: {r: 1, g: 1, b: 1, a: 1}
-    topRight: {r: 1, g: 1, b: 1, a: 1}
-    bottomLeft: {r: 1, g: 1, b: 1, a: 1}
-    bottomRight: {r: 1, g: 1, b: 1, a: 1}
-  m_fontColorGradientPreset: {fileID: 0}
-  m_spriteAsset: {fileID: 0}
-  m_tintAllSprites: 0
-  m_StyleSheet: {fileID: 0}
-  m_TextStyleHashCode: -1183493901
-  m_overrideHtmlColors: 0
-  m_faceColor:
-    serializedVersion: 2
-    rgba: 4294967295
-  m_fontSize: 32
-  m_fontSizeBase: 32
-  m_fontWeight: 400
-  m_enableAutoSizing: 0
-  m_fontSizeMin: 18
-  m_fontSizeMax: 72
-  m_fontStyle: 0
-  m_HorizontalAlignment: 2
-  m_VerticalAlignment: 512
-  m_textAlignment: 65535
-  m_characterSpacing: 0
-  m_wordSpacing: 0
-  m_lineSpacing: 0
-  m_lineSpacingMax: 0
-  m_paragraphSpacing: 0
-  m_charWidthMaxAdj: 0
-  m_enableWordWrapping: 1
-  m_wordWrappingRatios: 0.4
-  m_overflowMode: 0
-  m_linkedTextComponent: {fileID: 0}
-  parentLinkedComponent: {fileID: 0}
-  m_enableKerning: 1
-  m_enableExtraPadding: 0
-  checkPaddingRequired: 0
-  m_isRichText: 1
-  m_parseCtrlCharacters: 1
-  m_isOrthographic: 1
-  m_isCullingEnabled: 0
-  m_horizontalMapping: 0
-  m_verticalMapping: 0
-  m_uvLineOffset: 0
-  m_geometrySortingOrder: 0
-  m_IsTextObjectScaleStatic: 0
-  m_VertexBufferAutoSizeReduction: 0
-  m_useMaxVisibleDescender: 1
-  m_pageToDisplay: 1
-  m_margin: {x: 0, y: 0, z: 0, w: 0}
-  m_isUsingLegacyAnimationComponent: 0
-  m_isVolumetricText: 0
-  m_hasFontAssetChanged: 0
-  m_baseMaterial: {fileID: 0}
-  m_maskOffset: {x: 0, y: 0, z: 0, w: 0}
 --- !u!1 &4030813026502511153
 GameObject:
   m_ObjectHideFlags: 0
@@ -5095,7 +4957,7 @@ RectTransform:
   - {fileID: 4030813026755114795}
   - {fileID: 5958352451011471039}
   m_Father: {fileID: 4030813025219603266}
-  m_RootOrder: 2
+  m_RootOrder: 1
   m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
   m_AnchorMin: {x: 0, y: 0}
   m_AnchorMax: {x: 1, y: 1}

diff --git a/Assets/Script/LoadingManager.cs b/Assets/Script/LoadingManager.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Threading.Tasks;
 using Cysharp.Threading.Tasks;
 using TMPro;
 using UnityEngine;
@@ -66,13 +67,22 @@ public void QueueSongRefresh(bool fast) {
 			Queue(async () => {
 				await ScanSongFolders(fast);
 			});
+			QueueSongSort();
 		}
 
 		public void QueueSongFolderRefresh(string path) {
 			// Refreshes 1 folder (called when clicking "Refresh" on a folder in settings)
 			Queue(async () => {
 				await ScanSongFolder(path, false);
 			});
+			QueueSongSort();
+		}
+
+		public void QueueSongSort() {
+			Queue(async () => {
+				SetLoadingText("Sorting songs...");
+				await UniTask.RunOnThreadPool(SongSorting.GenerateSortCache);
+			});
 		}
 
 		private async UniTask ScanSongFolders(bool fast) {

diff --git a/Assets/Script/Settings/SettingsMenu.cs b/Assets/Script/Settings/SettingsMenu.cs
@@ -110,7 +110,7 @@ private async UniTask OnDisable() {
 				await LoadingManager.Instance.StartLoad();
 
 				// Then refresh song select
-				SongSelection.refreshFlag = true;
+				SongSelection.RefreshFlag = true;
 			}
 		}