Changeset 1507

Timestamp:

Feb 23, 2007, 6:54:49 AM (15 years ago)

Author:

joshe

Message:

Calculate and show directory sizes in file window.

File:

• trunk/gtk/dialogs.c (modified) (5 diffs)

trunk/gtk/dialogs.c

@@ -86 +86 @@
 parsepath( GtkTreeStore * store, GtkTreeIter * ret,
            const char * path, int index, uint64_t size );
+static uint64_t
+getdirtotals( GtkTreeStore * store, GtkTreeIter * parent, tr_file_t * files );
 static void
 setscroll( void * arg );
@@ -417 +419 @@
                    ii, inf->files[ii].length );
     }
+    getdirtotals( store, NULL, inf->files );
     gtk_tree_sortable_set_sort_column_id( GTK_TREE_SORTABLE( store ),
                                           FC_KEY, GTK_SORT_ASCENDING );
@@ -516 +519 @@
         label = g_markup_printf_escaped( _("<small>%s (%s)</small>"),
                                          file, sizestr );
+        g_free( file );
+        file = label;
         g_free( sizestr );
         stock = GTK_STOCK_FILE;
@@ -521 +526 @@
     else
     {
-        label = g_markup_printf_escaped( _("<small>%s</small>"), file );
         stock = GTK_STOCK_DIRECTORY;
-    }
-    gtk_tree_store_set( store, &iter, FC_INDEX, index, FC_LABEL, label,
+        index = -1;
+    }
+    gtk_tree_store_set( store, &iter, FC_INDEX, index, FC_LABEL, file,
                         FC_KEY, mykey, FC_STOCK, stock, -1 );
-    g_free( label );
   done:
     g_free( mykey );
@@ -534 +538 @@
         memcpy( ret, &iter, sizeof( iter ) );
     }
+}
+
+static uint64_t
+getdirtotals( GtkTreeStore * store, GtkTreeIter * parent, tr_file_t * files )
+{
+    GtkTreeModel * model;
+    GtkTreeIter    iter;
+    int            index;
+    uint64_t       mysize, subsize;
+    char         * sizestr, * name, * label;
+
+    model  = GTK_TREE_MODEL( store );
+    mysize = 0;
+    if( gtk_tree_model_iter_children( model, &iter, parent ) )
+    {
+        do
+        {
+            if( gtk_tree_model_iter_has_child( model, &iter ) )
+            {
+                subsize = getdirtotals( store, &iter, files );
+                mysize += subsize;
+                gtk_tree_model_get( model, &iter, FC_LABEL, &name, -1 );
+                sizestr = readablesize( subsize );
+                label = g_markup_printf_escaped( _("<small>%s (%s)</small>"),
+                                                 name, sizestr );
+                g_free( sizestr );
+                g_free( name );
+                gtk_tree_store_set( store, &iter, FC_LABEL, label, -1 );
+                g_free( label );
+            }
+            else
+            {
+                gtk_tree_model_get( model, &iter, FC_INDEX, &index, -1 );
+                g_assert( 0 <= index );
+                mysize += files[index].length;
+            }
+        }
+        while( gtk_tree_model_iter_next( model, &iter ) );
+    }
+
+    return mysize;
 }