Add natural sorting to some utilities

ShokoAnime · Feb 20, 2017 · 3a26bcc · 3a26bcc
1 parent 5e31762
commit 3a26bcc
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/Shoko.Desktop/UserControls/FileRenameControl.xaml.cs b/Shoko.Desktop/UserControls/FileRenameControl.xaml.cs
@@ -601,7 +601,7 @@ void btnLoadFiles_Click(object sender, RoutedEventArgs e)
 
                 if (LoadTypeIsRandom)
                 {
-                    rawVids = VM_ShokoServer.Instance.ShokoServices.RandomFileRenamePreview(udRandomFiles.Value.Value, VM_ShokoServer.Instance.CurrentUser.JMMUserID).CastList<VM_VideoLocal>();
+                    rawVids = VM_ShokoServer.Instance.ShokoServices.RandomFileRenamePreview(udRandomFiles.Value.Value, VM_ShokoServer.Instance.CurrentUser.JMMUserID).OrderByNatural(a => a.Places.First().FilePath).CastList<VM_VideoLocal>();
 
                     /*List<int> testIDs = new List<int>();
 
@@ -644,17 +644,15 @@ void btnLoadFiles_Click(object sender, RoutedEventArgs e)
                             VM_AnimeGroup_User grp = frm.SelectedObject as VM_AnimeGroup_User;
                             foreach (VM_AnimeSeries_User ser in grp.AllAnimeSeries)
                             {
-
-
                                 rawVids.AddRange(VM_ShokoServer.Instance.ShokoServices.GetVideoLocalsForAnime(ser.AniDB_ID,
-                                VM_ShokoServer.Instance.CurrentUser.JMMUserID).Cast<VM_VideoLocal>());
+                                VM_ShokoServer.Instance.CurrentUser.JMMUserID).OrderByNatural(a => a.Places.First().FilePath).Cast<VM_VideoLocal>());
                             }
                         }
                         if (frm.SelectedObject.GetType() == typeof(VM_AnimeSeries_User))
                         {
                             VM_AnimeSeries_User ser = frm.SelectedObject as VM_AnimeSeries_User;
                             rawVids.AddRange(VM_ShokoServer.Instance.ShokoServices.GetVideoLocalsForAnime(ser.AniDB_ID,
-                                VM_ShokoServer.Instance.CurrentUser.JMMUserID).Cast<VM_VideoLocal>());
+                                VM_ShokoServer.Instance.CurrentUser.JMMUserID).OrderByNatural(a => a.Places.First().FilePath).Cast<VM_VideoLocal>());
                         }
                     }
                 }

diff --git a/Shoko.Desktop/UserControls/FileSearchControl.xaml.cs b/Shoko.Desktop/UserControls/FileSearchControl.xaml.cs
@@ -158,7 +158,7 @@ void btnSearch_Click(object sender, RoutedEventArgs e)
                 EnableDisableControls(false);
 
                 List<VM_VideoLocal> rawVids = VM_ShokoServer.Instance.ShokoServices.SearchForFiles(
-                    (int)searchType, txtFileSearch.Text, VM_ShokoServer.Instance.CurrentUser.JMMUserID).CastList<VM_VideoLocal>();
+                    (int)searchType, txtFileSearch.Text, VM_ShokoServer.Instance.CurrentUser.JMMUserID).OrderByNatural(a => a.Places.First().FilePath).CastList<VM_VideoLocal>();
 
                 foreach (VM_VideoLocal raw in rawVids)
                     FileResults.Add(raw);