Changeset 4378

Timestamp:

09/20/06 17:59:39 (2 years ago)

Author:

morris

Message:

Add globbing

Files:

• wire/trunk/NEWS (modified) (1 diff)
• wire/trunk/wire/client.c (modified) (4 diffs)
• wire/trunk/wire/files.c (modified) (9 diffs)
• wire/trunk/wire/files.h (modified) (2 diffs)

wire/trunk/NEWS

@@ -3 +3 @@
-
-1.1.2
+- Add globbing, e.g. /get *.mp3
-- Clear the chat action indicator when scrolling to the bottom of a window
-

wire/trunk/wire/client.c

@@ -1083 +1083 @@
-        file->name      = wi_retain(wi_string_last_path_component(file->path));
-
-list_appen
+array_ad
-        wi_release(file);
-}
@@ -1090 +1090 @@
-
-static void wr_msg_411(wi_array_t *arguments) {
-        wi_list_node_t          *node;
-        wr_file_t                       *file;
-        wi_file_offset_t        free;
-nsigned int           
+int32_t                       i, count, 
-
-        if(wr_ls_state == WR_LS_LISTING) {
-                free = wi_string_uint64(WI_ARRAY(arguments, 1));
+                count = wi_array_count(wr_files);
-
-                wr_printf_prefix(WI_STR("Listing of %@ (%@ available):"), wr_files_ld, wr_files_string_for_size(free));
-
-wi_list_count(wr_files)
+count
-                        wr_printf_block(WI_STR("(empty)"));
-                } else {
-
+
+
-                                max_length = WI_MAX(max_length, wi_string_length(file->name));
-
-
+
+
+
+
-                                wr_print_file(file, false, max_length);
+                        }
-                }
-        }
@@ -1123 +1127 @@
-        file->name      = wi_retain(wi_string_last_path_component(file->path));
-
-list_appen
+array_ad
-        wi_release(file);
-}
@@ -1130 +1134 @@
-
-static void wr_msg_421(wi_array_t *arguments) {
-        wi_list_node_t  *node;
-        wr_file_t               *file;
-
+
+
+
-
-        wr_printf_prefix(WI_STR("Search results:"));
-
-wi_list_count(wr_files)
+count
-                wr_printf_block(WI_STR("(none)"));
-        } else {
-
+
+
-                        max_length = WI_MAX(max_length, wi_string_length(file->name));
-
-
-
-
-
+
+
+
+
+
+
+
+

wire/trunk/wire/files.c

@@ -29 +29 @@
-#include "config.h"
-
+#include <sys/stat.h>
-#include <stdio.h>
-#include <stdlib.h>
+#include <dirent.h>
+#include <glob.h>
-#include <readline/readline.h>
-#include <wired/wired.h>
@@ -38 +41 @@
-#include "main.h"
-
+#include "windows.h"
+
+struct _wr_files_glob_dir {
+        wi_string_t                                             *path;
+        struct dirent                                   **entries;
+        uint32_t                                                count, offset;
+};
+
+typedef struct _wr_files_glob_dir       wr_files_glob_dir_t;
+
+
+static wi_array_t *                                     wr_files_glob(wi_string_t *);
+static void *                                           wr_files_glob_opendir(const char *);
+static struct dirent *                          wr_files_glob_readdir(void *);
+static void                                                     wr_files_glob_closedir(void *);
+static int                                                      wr_files_glob_stat(const char *, struct stat *);
+
-static void                                                     wr_file_dealloc(wi_runtime_instance_t *);
-static wi_string_t *                            wr_file_description(wi_runtime_instance_t *);
@@ -43 +63 @@
-wi_string_t *                                           wr_files_cwd;
-wi_string_t *                                           wr_files_ld;
-list
+array
-
-wr_ls_state_t                                           wr_ls_state;
@@ -62 +82 @@
-        wr_file_runtime_id = wi_runtime_register_class(&wr_file_runtime_class);
-
-list_init(wi_list
+array_init(wi_array
-        
-        wr_files_cwd = wi_string_init_with_cstring(wi_string_alloc(), "/");
@@ -70 +90 @@
-
-void wr_clear_files(void) {
-list
+array
-        
-        wi_release(wr_files_ld);
@@ -81 +101 @@
-
-char * wr_readline_filename_generator(const char *text, int state) {
-        static wi_list_node_t   *node;
-        static wi_string_t              *directory_path;
+        static uint32_t                 index;
-        wi_string_t                             *path, *full_path, *name;
-        wr_file_t                               *file;
-        char                                    *cname;
-        wi_boolean_t                    root;
+        uint32_t                                count;
-        
-        cname = ((*rl_filename_dequoting_function) ((char *) text, 0));
@@ -97 +118 @@
-                directory_path  = wi_retain(wi_string_by_deleting_last_path_component(path));
-                full_path               = wr_files_full_path(directory_path);
+                index                   = 0;
-
-                wr_clear_files();
-                wr_send_command(WI_STR("LIST %@"), full_path);
-                wr_runloop_run_for_socket(wr_socket, 3.0, 411);
-
-                node = wi_list_first_node(wr_files);
-        }
-
-        name = wi_string_last_path_component(path);
-        root = wi_is_equal(name, WI_STR("/"));
-
-
-       file = wi_list_node_data(node);
-node = wi_list_node_next_node(node
+
+
+while(index < count) {
+file = WI_ARRAY(wr_files, index++
-
-                if(file->type == WR_FILE_FILE && wr_ls_state == WR_LS_COMPLETING_DIRECTORY)
@@ -147 +167 @@
-
-wi_array_t * wr_files_full_paths(wi_array_t *paths) {
-
-
+, *globpaths
+, j, globcount
-        
-        count = wi_array_count(paths);
-        fullpaths = wi_array_init_with_capacity(wi_array_alloc(), count);
-        
-
-
+
+
+
+
+
+
+
-        
-        return wi_autorelease(fullpaths);
@@ -214 +239 @@
-#pragma mark -
-
+static wi_array_t * wr_files_glob(wi_string_t *pattern) {
+        wi_array_t              *array;
+        glob_t                  gl;
+        uint32_t                i;
+        
+        gl.gl_opendir   = wr_files_glob_opendir;
+        gl.gl_readdir   = wr_files_glob_readdir;
+        gl.gl_closedir  = wr_files_glob_closedir;
+        gl.gl_lstat             = wr_files_glob_stat;
+        gl.gl_stat              = wr_files_glob_stat;
+        
+        if(glob(wi_string_cstring(pattern), GLOB_ALTDIRFUNC, NULL, &gl) != 0) {
+                wr_printf_prefix(WI_STR("glob: %m"));
+                
+                return NULL;
+        }
+        
+        array = wi_array_init_with_capacity(wi_array_alloc(), gl.gl_pathc);
+        
+        for(i = 0; i < gl.gl_pathc; i++)
+                wi_array_add_data(array, wi_string_with_cstring(gl.gl_pathv[i]));
+        
+        globfree(&gl);
+        
+        return wi_autorelease(array);
+}
+
+
+
+static void * wr_files_glob_opendir(const char *path) {
+        wr_files_glob_dir_t             *dir;
+        wr_file_t                               *file;
+        uint32_t                                i;
+        
+        dir = wi_malloc(sizeof(wr_files_glob_dir_t));
+        dir->path = wi_retain(wr_files_full_path(wi_string_with_cstring(path)));
+        
+        wr_ls_state = WR_LS_GLOBBING;
+        wr_clear_files();
+        wr_send_command(WI_STR("LIST %@"), dir->path);
+        wr_runloop_run_for_socket(wr_socket, 3.0, 411);
+        
+        dir->count = wi_array_count(wr_files);
+        dir->entries = wi_malloc(sizeof(struct dirent) * (dir->count + 1));
+        
+        for(i = 0; i < dir->count; i++) {
+                file = WI_ARRAY(wr_files, i);
+
+                dir->entries[i] = wi_malloc(sizeof(struct dirent));
+                dir->entries[i]->d_ino = 0;
+                dir->entries[i]->d_reclen = 0;
+                dir->entries[i]->d_type = (file->type == WR_FILE_FILE) ? DT_REG : DT_DIR;
+                dir->entries[i]->d_namlen = wi_string_length(file->name);
+                
+                strlcpy(dir->entries[i]->d_name, wi_string_cstring(file->name), sizeof(dir->entries[i]->d_name));
+        }
+
+        return dir;
+}
+
+
+
+static struct dirent * wr_files_glob_readdir(void *p) {
+        wr_files_glob_dir_t             *dir = p;
+
+        return dir->entries[dir->offset++];
+}
+
+
+
+static void wr_files_glob_closedir(void *p) {
+        wr_files_glob_dir_t             *dir = p;
+        uint32_t                                i;
+        
+        wi_release(dir->path);
+        
+        for(i = 0; i < dir->count; i++)
+                wi_free(dir->entries[i]);
+        
+        wi_free(dir->entries);
+        wi_free(dir);
+}
+
+
+
+static int wr_files_glob_stat(const char *path, struct stat *sp) {
+        memset(sp, 0, sizeof(struct stat));
+        
+        return 0;
+}
+
+
+
+#pragma mark -
+
-wr_file_t * wr_file_alloc(void) {
-        return wi_runtime_create_instance(wr_file_runtime_id, sizeof(wr_file_t));

wire/trunk/wire/files.h

@@ -55 +55 @@
-        WR_LS_LISTING,
-        WR_LS_COMPLETING,
-
+
+
-};
-typedef enum _wr_ls_state                       wr_ls_state_t;
@@ -84 +85 @@
-extern wi_string_t                                      *wr_files_cwd;
-extern wi_string_t                                      *wr_files_ld;
-list
+array
-
-extern wr_ls_state_t                            wr_ls_state;