Added basic sorting for asset browser (#256)

* Added basic sorting for asset browser

* Remove Ord implementation for Entry and move ordering to seperate functions

* Remove temporary fix I accidentally made permenant

Author: Freyja-moth

bevy_editor_panes/bevy_asset_browser/src/io/task.rs

@@ -1,4 +1,4 @@
-use crate::{AssetBrowserLocation, DirectoryContent, Entry};
+use crate::{AssetBrowserLocation, DirectoryContent, DirectoryContentOrder, Entry};
 use bevy::{
     asset::io::AssetSourceBuilders,
     prelude::*,
@@ -20,9 +20,12 @@ pub(crate) fn fetch_task_is_running(
 pub(crate) fn poll_task(
     mut commands: Commands,
     mut task_query: Query<(Entity, &mut FetchDirectoryContentTask)>,
+    content_order: Res<DirectoryContentOrder>,
 ) {
     let (task_entity, mut task) = task_query.single_mut().unwrap();
-    if let Some(content) = block_on(poll_once(&mut task.0)) {
+    if let Some(mut content) = block_on(poll_once(&mut task.0)) {
+        content_order.sort(&mut content);
+
         commands.entity(task_entity).despawn();
         commands.insert_resource(content);
     }

bevy_editor_panes/bevy_asset_browser/src/lib.rs

@@ -1,7 +1,7 @@
 //! A UI element for browsing assets in the Bevy Editor.
 /// The intent of this system is to provide a simple and frictionless way to browse assets in the Bevy Editor.
 /// The asset browser is a replica of the your asset directory on disk and get's automatically updated when the directory is modified.
-use std::path::PathBuf;
+use std::{cmp::Ordering, path::PathBuf};
 
 use bevy::{
     asset::{
@@ -47,6 +47,8 @@ impl Plugin for AssetBrowserPanePlugin {
             .insert_resource(DefaultSourceFilePath(default_source_absolute_file_path))
             .insert_resource(AssetBrowserLocation::default())
             .insert_resource(DirectoryContent::default())
+            .insert_resource(DirectoryContentOrder::ReverseAlphabetical)
+            // .init_resource::<DirectoryContentOrder>()
             .add_systems(Startup, io::task::fetch_directory_content)
             // .add_systems(Update, button_interaction)
             .add_systems(
@@ -70,6 +72,47 @@ impl Plugin for AssetBrowserPanePlugin {
     }
 }
 
+fn alphabetical_sort(left: &Entry, right: &Entry) -> Ordering {
+    match (left, right) {
+        (Entry::Folder(left_name), Entry::Folder(right_name))
+        | (Entry::File(left_name), Entry::File(right_name)) => left_name.cmp(right_name),
+        (Entry::File(_), Entry::Folder(_)) => Ordering::Greater,
+        (Entry::Folder(_), Entry::File(_)) => Ordering::Less,
+        // TODO: Figure out whether or not ignoring the order of asset sources is a good idea.
+        _ => Ordering::Equal,
+    }
+}
+
+fn reverse_alphabetical_sort(left: &Entry, right: &Entry) -> Ordering {
+    match (left, right) {
+        (Entry::Folder(left_name), Entry::Folder(right_name))
+        | (Entry::File(left_name), Entry::File(right_name)) => left_name.cmp(right_name).reverse(),
+        (Entry::File(_), Entry::Folder(_)) => Ordering::Greater,
+        (Entry::Folder(_), Entry::File(_)) => Ordering::Less,
+        // TODO: Figure out whether or not ignoring the order of asset sources is a good idea.
+        _ => Ordering::Equal,
+    }
+}
+
+/// How [`DirectoryContent`] should be ordered
+#[derive(Resource, Default, Debug, Clone, PartialEq, Eq)]
+pub enum DirectoryContentOrder {
+    /// Ordered alphabetically with respect to folders
+    #[default]
+    Alphabetical,
+    /// Ordered reverse alphabetically with respect to folders
+    ReverseAlphabetical,
+}
+impl DirectoryContentOrder {
+    /// Sorts a given [`DirectoryContent`] with the current method
+    pub fn sort(&self, content: &mut DirectoryContent) {
+        match self {
+            Self::Alphabetical => content.0.sort_by(alphabetical_sort),
+            Self::ReverseAlphabetical => content.0.sort_by(reverse_alphabetical_sort),
+        }
+    }
+}
+
 /// One entry of [`DirectoryContent`]
 #[derive(Debug, Clone, PartialEq, Eq)]
 pub enum Entry {