Merge branch 'v2.3.1' into main

ellman12 · Jun 16, 2023 · 38e0e06 · 38e0e06
2 parents 1d985ce + 5f25430
commit 38e0e06
Show file tree

Hide file tree

Showing 8 changed files with 29 additions and 17 deletions.
diff --git a/PSS/PSS/Backend/Connection.cs b/PSS/PSS/Backend/Connection.cs
@@ -717,8 +717,8 @@ public static List<Collection> GetCollectionsTable(bool showAlbums, bool showFol
         {
             CMSortMode.Title => "name ASC",
             CMSortMode.TitleReversed => "name DESC",
-            CMSortMode.LastModified => "last_updated ASC",
-            CMSortMode.LastModifiedReversed => "last_updated DESC",
+            CMSortMode.LastModified => "last_updated DESC",
+            CMSortMode.LastModifiedReversed => "last_updated ASC",
             _ => "name ASC"
         };
 

diff --git a/PSS/PSS/Pages/CollectionsMain.razor b/PSS/PSS/Pages/CollectionsMain.razor
@@ -27,11 +27,11 @@
     <div id="sortDiv" style="visibility: @sortDivVis">
         <button class="textBtn" @onclick="@(() => ChangeOrder(CMSortMode.Title))">
             <span class="material-icons-outlined" style="@(mode == CMSortMode.Title ? "color: #1a73e8" : "visibility: hidden")">check</span>
-            <span style="color: @(mode == CMSortMode.Title ? "#1a73e8" : "white")">Album Title</span>
+            <span style="color: @(mode == CMSortMode.Title ? "#1a73e8" : "white")">Collection Title</span>
         </button>
         <button class="textBtn" @onclick="@(() => ChangeOrder(CMSortMode.TitleReversed))">
             <span class="material-icons-outlined" style="@(mode == CMSortMode.TitleReversed ? "color: #1a73e8" : "visibility: hidden")">check</span>
-            <span style="color: @(mode == CMSortMode.TitleReversed ? "#1a73e8" : "white")">Album Title Reversed</span>
+            <span style="color: @(mode == CMSortMode.TitleReversed ? "#1a73e8" : "white")">Collection Title Reversed</span>
         </button>
         <button class="textBtn" @onclick="@(() => ChangeOrder(CMSortMode.LastModified))">
             <span class="material-icons-outlined" style="@(mode == CMSortMode.LastModified ? "color: #1a73e8" : "visibility: hidden")">check</span>
@@ -62,8 +62,8 @@
     private CollectionCreator collectionCreator;
 
     private string sortBtnText, sortDivVis = "hidden";
-    private CMSortMode mode = CMSortMode.LastModified;
-    private bool showAlbums = true, showFolders, showReadonly = true;
+    private static CMSortMode mode = CMSortMode.LastModified;
+    private static bool showAlbums = true, showFolders, showReadonly = true;
 
     protected override void OnInitialized()
     {

diff --git a/PSS/PSS/Pages/Import.razor b/PSS/PSS/Pages/Import.razor
@@ -154,10 +154,14 @@
 	</div>
 }
 
+<ProgressPopUp Message="@popUpMsg" Visible="@addingItems"/>
+
 @code {
 	private static ElementReference searchInput;
 
-	private static bool finishedLoading;
+	private bool finishedLoading, addingItems;
+
+	private string popUpMsg;
 
 	public static string pathWidthClass;
 
@@ -303,6 +307,13 @@
 	{
 		L.LogLine($"Begin {nameof(AddItems)}", LogLevel.Info);
 
+		if (selectedItems.Count == 0 || selectedItems.Count == importFiles.Count) popUpMsg = "Adding All Items...";
+		else if (selectedItems.Count == 1) popUpMsg = "Adding 1 Item...";
+		else popUpMsg = $"Adding {selectedItems.Count} Items...";
+
+		addingItems = true;
+		await InvokeAsync(StateHasChanged);
+
 		List<ImportFile> filesToAdd = selectedItems.Count == 0  || selectedItems.Count == importFiles.Count 
 			? importFiles : importFiles.Where(file => selectedItems.Contains(file.uuid)).ToList();
 
@@ -339,9 +350,10 @@
 		else
 			importFiles.Clear();
 
+		addingItems = false;
 		OrganizeItems();
-		StateHasChanged();
-		
+		await InvokeAsync(StateHasChanged);
+
 		L.LogLine($"Finish {nameof(AddItems)}", LogLevel.Info);
 	}
 

diff --git a/PSS/PSS/Pages/Maintenance/Backups.razor b/PSS/PSS/Pages/Maintenance/Backups.razor
@@ -31,7 +31,7 @@
         }
     </div>
 
-    <ProgressPopUp Message="@popUpMsg" FontSize="22" Visible="@popUpVis"/>
+    <ProgressPopUp Message="@popUpMsg" Visible="@popUpVis"/>
 }
 
 @code{

diff --git a/PSS/PSS/Shared/CollectionSelector.razor b/PSS/PSS/Shared/CollectionSelector.razor
@@ -32,7 +32,7 @@
             <div class="collectionsList">
                 @for (int i = 0; i < albums.Count; i++)
                 {
-                    if (!String.IsNullOrWhiteSpace(searchText) && !albums[i].name.Contains(searchText)) continue;
+                    if (!String.IsNullOrWhiteSpace(searchText) && albums[i].name.IndexOf(searchText, StringComparison.InvariantCultureIgnoreCase) == -1) continue;
 
                     int ii = i;
                     <div class="collection" @onclick="@(() => { checkedAlbums[ii] = !checkedAlbums[ii]; ClearFolderChecks(); checkedFolderIndex = -1; })">
@@ -49,7 +49,7 @@
             <div class="collectionsList">
                 @for (int i = 0; i < folders.Count; i++)
                 {
-                    if (!String.IsNullOrWhiteSpace(searchText) && !folders[i].name.Contains(searchText)) continue;
+                    if (!String.IsNullOrWhiteSpace(searchText) && folders[i].name.IndexOf(searchText, StringComparison.InvariantCultureIgnoreCase) == -1) continue;
 
                     int ii = i;
                     <div class="collection" @onclick="@(() => { checkedFolderIndex = ii; ClearAlbumChecks(); ClearFolderChecks(); checkedFolders[ii] = true; })">

diff --git a/PSS/PSS/Shared/LibraryContentViewer.razor b/PSS/PSS/Shared/LibraryContentViewer.razor
@@ -200,7 +200,7 @@ else
 {
 	<CtrlGInput @ref=@ctrlGInput StartDateChanged="@StartDateChanged"/>
 }
-<KeyboardShortcuts AltS="@AltSFired" CtrlD="@DeleteBtnClick" Del="@DeleteBtnClick"/>
+<KeyboardShortcuts AltS="@AltSFired" CtrlD="@DeleteBtnClick" Del="@DeleteBtnClick" Esc="@(async () => await ClearChecks())"/>
 <ShortcutsReference DelText="Delete Selected Item(s)" CtrlDText="Delete Selected Item(s)" CtrlGText="Go to a Specific Point in Your Library" AltCText="Show/Hide CollectionSelector" AltSText="Add/Remove Star to Selected Item(s)"/>
 
 @code{
@@ -492,7 +492,7 @@ else
 		}
 		else
 		{
-			foreach (Guid item in SelectedItems) //https://stackoverflow.com/a/604843
+			foreach (Guid item in SelectedItems)
 			{
 				C.MoveToTrash(item);
 				MediaList.RemoveAll(u => u.uuid == item);

diff --git a/PSS/PSS/wwwroot/css/CollectionsMain.css b/PSS/PSS/wwwroot/css/CollectionsMain.css
@@ -9,9 +9,8 @@ header {
     align-items: center;
     position: fixed;
     z-index: 999;
-    top: 5px;
-    left: 171px;
-    height: 56px;
+    left: 170px;
+    height: 64px;
     width: 100%;
     padding-bottom: 6px;
     border-bottom: 1px solid gray;

diff --git a/PSS/PSS/wwwroot/css/IndexStarredNoDT.css b/PSS/PSS/wwwroot/css/IndexStarredNoDT.css
@@ -13,6 +13,7 @@ header {
     left: 145px;
     right: 0;
     z-index: 999;
+    height: 60px;
 }
 
 header > #buttons {