Output sorted by name

1 files changed, 54 insertions, 10 deletions

diff --git a/src/data_management.c b/src/data_management.c
index a0a1667..d4cf76c 100644
--- a/src/data_management.c
+++ b/src/data_management.c
@@ -121,6 +121,39 @@ inline int insert_sorted_by_time(struct list_head *list, struct list_node *node)
 }
 
 
+inline int insert_sorted_by_name(struct list_head *list, struct list_node *node) {
+    struct list_node *ptr = NULL;
+    if (list == NULL) { LOGERR("ERROR: No list given.\n"); return -1; }
+    if (node == NULL) { LOGERR("ERROR: No node given.\n"); return -2; }
+
+    if (list->first == NULL) {
+        list->first = node;
+        return 0;
+    }
+
+    if (strncmp(node->fname, list->first->fname, 255) < 0) {
+        node->next = list->first;
+        list->first = node;
+        return 0;
+    }
+
+    ptr = list->first;
+    while (ptr != NULL) {
+        if (ptr->next == NULL) {
+            ptr->next = node;
+            return 0;
+        }
+        if (strncmp(node->fname, ptr->next->fname, 255) < 0) {
+            node->next = ptr->next;
+            ptr->next = node;
+            return 0;
+        }
+        ptr = ptr->next;
+    }
+    return -3;
+}
+
+
 inline struct list_head *create_list_sort_reversed(struct list_head *list) {
     struct list_head *lh = NULL;
     struct list_node *cpynode = NULL, *ptr = NULL;
@@ -152,20 +185,13 @@ inline struct list_head *create_list_sort_reversed(struct list_head *list) {
 
 /* This function contains the only time critical code. The loop over
  * the directory content.
- *
- * Note for future:
- * I myself use the dir_monitor in combination with watch on a directory
- * containing temporary data, it may happen that a run into an error occurs,
- * but it's not tragic. To reduce the chance of the error the first step
- * would be to optimize the loop with putting the data into a list in stack
- * form and moving the nodes into a sorted list afterwards.
  */
 struct list_head *get_data_from_directory(char *path) {
     char *fullpath = NULL, *fname_in_path = NULL;
     DIR *dir = NULL;
     size_t l;
     struct dirent *de = NULL;
-    struct list_node *tmp = NULL;
+    struct list_node *lnstack = NULL, *tmp = NULL;
     struct list_head *list = NULL;
     struct stat stat_res;
 
@@ -213,6 +239,20 @@ struct list_head *get_data_from_directory(char *path) {
             LOGERR("ERROR: Skipping entry %s\n", de->d_name);
             continue;
         }
+        /* Performance: Put every node on the stack and do the sorting afterwards */
+        tmp->next = lnstack;
+        lnstack = tmp;
+    }
+    free(fullpath);
+    closedir(dir);
+
+    DBGTRC("Finished reading data from directory\n");
+
+    while (lnstack != NULL) {
+        tmp = lnstack;
+        lnstack = lnstack->next;
+        tmp->next = NULL;
+
         /* SORT_BY_SIZE is the default value, always check it first. */
         switch (option_sort_type) {
             case SORT_BY_SIZE:
@@ -221,11 +261,15 @@ struct list_head *get_data_from_directory(char *path) {
             case SORT_BY_TIME:
                 insert_sorted_by_time(list, tmp);
                 break;
+            case SORT_BY_NAME:
+                insert_sorted_by_name(list, tmp);
+                break;
+            default: /* Never should be the case, but as so often, better safe than sorry */
+                LOGERR("ERROR: No valid sort option set: %d\n", option_sort_type);
+                exit(EXIT_FAILURE);
         };
     }
 
-    free(fullpath);
-    closedir(dir);
     return list;
 }