Changeset 5196

Timestamp:

01/21/08 15:49:10 (6 months ago)

Author:

morris

Message:

Broadcast new server info message after indexing to update clients with file count/size

Store file count/size last in index, and read it into the server if the index is skipped when starting up

Files:

• wired/trunk/wired/commands.c (modified) (2 diffs)
• wired/trunk/wired/files.c (modified) (8 diffs)
• wired/trunk/wired/server.c (modified) (3 diffs)
• wired/trunk/wired/server.h (modified) (1 diff)

wired/trunk/wired/commands.c

@@ -895 +895 @@
-static void wd_cmd_hello(wi_array_t *arguments) {
-        wd_user_t               *user = wd_users_user_for_thread();
-, *start_date
+
-
-        if(wd_user_state(user) != WD_USER_CONNECTED)
@@ -911 +911 @@
-                return;
-        }
-
-
-
-
-
-
-
-
-
-
-
+
+
-        
-        wd_user_set_state(user, WD_USER_SAID_HELLO);

wired/trunk/wired/files.c

@@ -69 +69 @@
-
-static void                                                                     wd_files_update_index(wi_timer_t *);
+static void                                                                     wd_files_update_index_size(void);
-static void                                                                     wd_files_index_thread(wi_runtime_instance_t *);
-static void                                                                     wd_files_index_path(wi_string_t *, wi_file_t *, const char *);
@@ -681 +682 @@
-
-static void wd_files_search_index(wi_string_t *query) {
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-        
-        wi_rwlock_rdlock(wd_files_index_lock);
@@ -699 +702 @@
-                goto end;
-        }
+        
+        if(wi_file_stat(wd_settings.index, &sb))
+                length = sb.st_size;
+        else
+                length = 0;
-        
-        account = wd_user_account(user);
@@ -717 +725 @@
-                        break;
-                
-
+length < wi_file_offset(file) && 
-                        index = wi_string_index_of_char(string, WD_FIELD_SEPARATOR, 0);
-                        
@@ -778 +786 @@
-                if(!wi_thread_create_thread_with_priority(wd_files_index_thread, NULL, 0.0))
-                        wi_log_warn(WI_STR("Could not create a thread for index: %m"));
+        } else {
+                wd_files_update_index_size();
+        }
+}
+
+
+
+static void wd_files_update_index_size(void) {
+        wi_file_t                       *file;
+        wi_array_t                      *array;
+        wi_string_t                     *string;
+        wi_file_offset_t        offset;
+        
+        file = wi_file_for_reading(wd_settings.index);
+        
+        if(!file)
+                return;
+        
+        offset = wi_file_seek_to_end_of_file(file);
+        wi_file_seek(file, offset - 1024);
+                
+        while((string = wi_file_read_line(file))) {
+                if(wi_string_has_prefix(string, WI_STR("/"))) {
+                        array = wi_string_components_separated_by_string(string, WI_STR(WD_FIELD_SEPARATOR_STR));
+                        
+                        if(wi_array_count(array) == 3) {
+                                wd_files_unique_count = wi_string_uint32(WI_ARRAY(array, 1));
+                                wd_files_unique_size = wi_string_uint32(WI_ARRAY(array, 2));
+                        }
+                }
-        }
-}
@@ -810 +848 @@
-                
-                wd_files_index_level    = 0;
-set_init_with_capacity(wi_set_alloc(), capacity
+autorelease(wi_set_init_with_capacity(wi_set_alloc(), capacity)
-
-                path = wi_string_with_format(WI_STR("%@~"), wd_settings.index);
@@ -827 +865 @@
-
-                if(wi_file_rename(path, wd_settings.index)) {
+                        wi_file_write(file, WI_STR("%s%c%u%c%llu"),
+                                "/",                                    WD_FIELD_SEPARATOR,
+                                wd_files_unique_count,  WD_FIELD_SEPARATOR,
+                                wd_files_unique_size);
+                        
-                        wi_log_info(WI_STR("Indexed %u %s (%u unique) and %u %s (%u unique) for a total of %llu %s (%llu unique) in %.2f seconds"),
-                                wd_files_count,
@@ -851 +894 @@
-                wi_rwlock_unlock(wd_files_index_lock);
-                
+                wd_server_send_server_info(true);
+                
-end:
-                wi_release(wd_files_index_set);
-
-                wi_lock_unlock(wd_files_indexer_lock);
-        }

wired/trunk/wired/server.c

@@ -173 +173 @@
-
-void wd_server_apply_settings(void) {
-        wi_string_t             *string;
-        wi_data_t               *data;
-
@@ -196 +195 @@
-
-        /* reload server name/description */
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-        /* set SSL cipher list */
@@ -233 +222 @@
-        }
-}
+
+
+
+void wd_server_send_server_info(wi_boolean_t broadcast) {
+        wi_string_t             *string, *start_date;
+        
+        start_date = wi_date_iso8601_string(wd_start_date);
+        string = wi_string_with_format(WI_STR("%#@%c%#@%c%#@%c%#@%c%#@%c%u%c%llu"),
+                wd_server_version_string,               WD_FIELD_SEPARATOR,
+                wd_protocol_version_string,             WD_FIELD_SEPARATOR,
+                wd_settings.name,                               WD_FIELD_SEPARATOR,
+                wd_settings.description,                WD_FIELD_SEPARATOR,
+                start_date,                                             WD_FIELD_SEPARATOR,
+                wd_files_unique_count,                  WD_FIELD_SEPARATOR,
+                wd_files_unique_size);
+        
+        if(broadcast)
+                wd_broadcast(wd_public_chat, 200, WI_STR("%#@"), string);
+        else
+                wd_reply(200, WI_STR("%#@"), string);
+}
+
-
-

wired/trunk/wired/server.h

@@ -49 +49 @@
-void                                                            wd_server_create_threads(void);
-void                                                            wd_server_apply_settings(void);
+void                                                            wd_server_send_server_info(wi_boolean_t);
-
-void                                                            wd_ssl_init(void);