Changeset 5607 for wire/trunk

Timestamp:

07/22/08 11:00:56 (1 month ago)

Author:

morris

Message:

Fix a few problems with recursive downloads

Files:

• wire/trunk/Makefile.in (modified) (1 diff)
• wire/trunk/wire/transfers.c (modified) (4 diffs)

wire/trunk/Makefile.in

@@ -18 +18 @@
-SUBDIRS                 = libwired
-
-
+[a-z]
-
-DEFS                    = @DEFS@

wire/trunk/wire/transfers.c

@@ -343 +343 @@
-        
-        local_path = wi_string_by_appending_path_component(wi_string_by_normalizing_path(wr_download_path), local_path);
-
+
+
+
+
-        if(wr_file_type(file) == WR_FILE_FILE) {
-                wi_array_add_data(transfer->remote_paths, remote_path);
@@ -351 +354 @@
-                transfer->total_size += wr_file_size(file);
-        } else {
-                parent_path = wi_string_by_deleting_last_path_component(local_path);
-
-                wi_file_create_directory(parent_path, 0755);
-                
-                if(!wi_file_exists(local_path, NULL)) {
+                        wi_log_info(WI_STR("create %@"), local_path);
+
-                        if(!wi_file_create_directory(local_path, 0755)) {
-                                wr_printf_prefix(WI_STR("get: Unable to create directory at %@: %m"),
@@ -540 +541 @@
-        wi_file_stat_t          sb;
-
+        if(wi_array_count(transfer->local_paths) == 0) {
+                wr_transfer_start_next_or_stop(transfer);
+                
+                return;
+        }
+
-        if(transfer->type == WR_TRANSFER_DOWNLOAD) {
-                local_path = wi_array_first_data(transfer->local_paths);
@@ -589 +596 @@
-                        transfer->file_offset);
-        } else {
-                if(wi_array_count(transfer->local_paths) == 0) {
-                        wr_transfer_start_next_or_stop(transfer);
-                        
-                        return;
-                }
-                
-                local_path = wi_array_first_data(transfer->local_paths);
-