Changeset 2097

Timestamp:

Jun 16, 2007, 7:55:40 PM (15 years ago)

Author:

charles

Message:

more rough work on makemeta. not stable yet.

Location:

branches/file_selection

Files:

• cli/transmissioncli.c (modified) (1 diff)
• gtk/actions.c (modified) (1 diff)
• gtk/hig.c (modified) (1 diff)
• gtk/main.c (modified) (2 diffs)
• gtk/make-meta-ui.c (added)
• gtk/make-meta-ui.h (added)
• gtk/ui.h (modified) (1 diff)
• libtransmission/makemeta.c (modified) (11 diffs)
• libtransmission/makemeta.h (modified) (1 diff)
• mk/gtk.mk (modified) (1 diff)

branches/file_selection/cli/transmissioncli.c

@@ -134 +134 @@
 
     if( sourceFile && *sourceFile ) /* creating a torrent */
-        return tr_makeMetaInfo( torrentPath,
-                                announce,
-                                comment,
-                                sourceFile,
-                                isPrivate );
+    {
+        meta_info_builder_t* builder = tr_metaInfoBuilderCreate( sourceFile );
+        int ret = tr_makeMetaInfo( builder, NULL, announce, comment, isPrivate );
+        tr_metaInfoBuilderFree( builder );
+        return ret;
+    }
 
     /* Open and parse torrent file */

branches/file_selection/gtk/actions.c

@@ -84 +84 @@
   { "remove-torrent", GTK_STOCK_REMOVE,
     N_("_Remove"), "<control>R", NULL, G_CALLBACK(action_cb) },
+  { "create-torrent", GTK_STOCK_NEW,
+    N_("_Create New Torrent"), NULL, NULL, G_CALLBACK(action_cb) },
   { "close", GTK_STOCK_CLOSE,
     N_("_Close"), "<control>C", NULL, G_CALLBACK(action_cb) },

branches/file_selection/gtk/hig.c

@@ -103 +103 @@
 {
   if (GTK_IS_MISC(l))
-    gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.0f);
+    gtk_misc_set_alignment (GTK_MISC(l), 0.0f, 0.5f);
   if (GTK_IS_LABEL(l))
     gtk_label_set_use_markup (GTK_LABEL(l), TRUE);

branches/file_selection/gtk/main.c

@@ -41 +41 @@
 #include "dialogs.h"
 #include "ipc.h"
+#include "make-meta-ui.h"
 #include "msgwin.h"
 #include "torrent-inspector.h"
@@ -992 +993 @@
         gtk_tree_selection_selected_foreach( s, showInfoForeach, data->wind );
     }
+    else if (!strcmp (action_name, "create-torrent"))
+    {
+        GtkWidget * w = make_meta_ui( GTK_WINDOW( data->wind ) );
+        gtk_widget_show_all( w );
+    }
     else if (!strcmp (action_name, "remove-torrent"))
     {

branches/file_selection/gtk/ui.h

@@ -8 +8 @@
 "      <menuitem action='recheck-torrent'/>\n"
 "      <menuitem action='remove-torrent'/>\n"
+"      <separator/>\n"
+"      <menuitem action='create-torrent'/>\n"
 "      <separator/>\n"
 "      <menuitem action='close'/>\n"

branches/file_selection/libtransmission/makemeta.c

@@ -79 +79 @@
 }
 
-static int
-getListSize( const struct FileList * list )
-{
-    int i;
-    for( i=0; list!=NULL; list=list->next )
-        ++i;
-    return i;
-}
-
 static void
 freeFileList( struct FileList * list )
@@ -184 +175 @@
     ret->pieceSize = bestPieceSize( ret->totalSize );
     ret->pieceCount = MAX( 1, ret->totalSize / ret->pieceSize );
+    if( ret->totalSize % ret->pieceSize )
+        ++ret->pieceCount;
+
     return ret;
 }
@@ -203 +197 @@
 
 static uint8_t*
-getHashInfo ( const char              * topFile,
-              const struct FileList   * files,
-              int                       pieceSize,
-              int                     * setmeCount )
-{
-    int i;
+getHashInfo ( const meta_info_builder_t  * builder,
+              int                        * setmeCount )
+{
+    size_t i;
     tr_torrent_t t;
     uint8_t *ret, *walk;
-    const struct FileList * fwalk;
-    const size_t topLen = strlen(topFile) + 1; /* +1 for '/' */
+    const size_t topLen = strlen(builder->top) + 1; /* +1 for '/' */
 
     /* build a mock tr_torrent_t that we can feed to tr_ioRecalculateHash() */  
     memset( &t, 0, sizeof( tr_torrent_t ) );
     tr_lockInit ( &t.lock );
-    t.destination = (char*) topFile;
-    t.info.fileCount = getListSize( files );
+    t.destination = (char*) builder->top;
+    t.info.fileCount = builder->fileCount;
     t.info.files = calloc( t.info.fileCount, sizeof( tr_file_t ) );
-    
-    for( fwalk=files, i=0; fwalk!=NULL; fwalk=fwalk->next, ++i ) {
+    t.info.totalSize = builder->totalSize;
+    t.info.pieceSize = builder->pieceSize;
+    t.info.pieceCount = builder->pieceCount;
+    for( i=0; i<builder->fileCount; ++i ) {
         tr_file_t * file = &t.info.files[i];
-        file->length = getFileSize( fwalk->filename );
-        strlcpy( file->name, fwalk->filename + topLen, sizeof( file->name ) );
-        t.info.totalSize += file->length;
-    }
-    t.info.pieceSize = pieceSize;
-    t.info.pieceCount = t.info.totalSize / pieceSize;
-    if ( t.info.totalSize % pieceSize )
-        ++t.info.pieceCount;
+        file->length = builder->fileLengths[i];
+        strlcpy( file->name, builder->files[i]+topLen, sizeof(file->name) );
+    }
     t.info.pieces = calloc( t.info.pieceCount, sizeof( tr_piece_t ) );
     tr_torrentInitFilePieces( &t );
-
     ret = (uint8_t*) malloc ( SHA_DIGEST_LENGTH * t.info.pieceCount );
     walk = ret;
-    for( i=0; i<t.info.pieceCount; ++i ) {
+    for( i=0; i<(size_t)t.info.pieceCount; ++i ) {
         tr_ioRecalculateHash( &t, i, walk );
         walk += SHA_DIGEST_LENGTH;
@@ -291 +278 @@
 
 static void
-makeFilesList( benc_val_t            * list,
-               const char            * topFile,
-               const struct FileList * files )
-{
-    const struct FileList * walk;
-
-    tr_bencListReserve( list, getListSize(files) );
-
-    for( walk=files; walk!=NULL; walk=walk->next )
+makeFilesList( benc_val_t                 * list,
+               const meta_info_builder_t  * builder )
+{
+    size_t i = 0;
+
+    tr_bencListReserve( list, builder->fileCount );
+
+    for( i=0; i<builder->fileCount; ++i )
     {
         benc_val_t * dict = tr_bencListAdd( list );
@@ -308 +294 @@
         length = tr_bencDictAdd( dict, "length" );
         pathVal = tr_bencDictAdd( dict, "path" );
-        getFileInfo( topFile, walk->filename, length, pathVal );
+        getFileInfo( builder->top, builder->files[i], length, pathVal );
     }
 }
 
 static void
-makeInfoDict ( benc_val_t              * dict,
-               const char              * topFile,
-               const struct FileList   * files,
-               int                       isPrivate )
-{
-    static const int pieceSize = 262144; /* 256 KiB. TODO: let user choose? */
-    const int single = files->next == NULL;
+makeInfoDict ( benc_val_t                 * dict,
+               const meta_info_builder_t  * builder,
+               int                          isPrivate )
+{
     uint8_t * pch;
     int pieceCount = 0;
@@ -328 +311 @@
 
     val = tr_bencDictAdd( dict, "name" );
-    strlcpy( base, topFile, sizeof( base ) );
+    strlcpy( base, builder->top, sizeof( base ) );
     tr_bencInitStrDup ( val, basename( base ) );
 
     val = tr_bencDictAdd( dict, "piece length" );
-    tr_bencInitInt( val, pieceSize );
-
-    pch = getHashInfo( topFile, files, pieceSize, &pieceCount );
+    tr_bencInitInt( val, builder->pieceSize );
+
+    pch = getHashInfo( builder, &pieceCount );
     val = tr_bencDictAdd( dict, "pieces" );
     tr_bencInitStr( val, pch, SHA_DIGEST_LENGTH * pieceCount, 0 );
 
-    if ( single )
+    if ( builder->isSingleFile )
     {
         val = tr_bencDictAdd( dict, "length" );
-        tr_bencInitInt( val, getFileSize(files->filename) );
+        tr_bencInitInt( val, builder->fileLengths[0] );
     }
     else
@@ -347 +330 @@
         val = tr_bencDictAdd( dict, "files" );
         tr_bencInit( val, TYPE_LIST );
-        makeFilesList( val, topFile, files );
+        makeFilesList( val, builder );
     }
 
@@ -354 +337 @@
 }
 
+/* if outputFile is NULL, builder->top + ".torrent" is used */
 int
-tr_makeMetaInfo( const char   * outputFile,
-                 const char   * announce,
-                 const char   * comment,
-                 const char   * topFile,
-                 int            isPrivate )
+tr_makeMetaInfo( const meta_info_builder_t  * builder,
+                 const char                 * outputFile,
+                 const char                 * announce,
+                 const char                 * comment,
+                 int                          isPrivate )
 {
     int n = 5;
     benc_val_t top, *val;
-    struct FileList *files;
-
-    /* build a list of files containing topFile and,
-       if it's a directory, all of its children */
-    if (1) {
-        char *dir, *base;
-        char dirbuf[MAX_PATH_LENGTH];
-        char basebuf[MAX_PATH_LENGTH];
-        strlcpy( dirbuf, topFile, sizeof( dirbuf ) );
-        strlcpy( basebuf, topFile, sizeof( basebuf ) );
-        dir = dirname( dirbuf );
-        base = basename( basebuf );
-        files = getFiles( dir, base, NULL );
-        assert( files != NULL  );
-    }
 
     tr_bencInit ( &top, TYPE_DICT );
@@ -403 +372 @@
         tr_bencInit( val, TYPE_DICT );
         tr_bencDictReserve( val, 666 );
-        makeInfoDict( val, topFile, files, isPrivate );
+        makeInfoDict( val, builder, isPrivate );
 
     /* debugging... */
@@ -410 +379 @@
     /* save the file */
     if (1) {
-        FILE * fp = fopen( outputFile, "wb+" );
-        char * pch = tr_bencSaveMalloc( &top, &n );
+        char out[MAX_PATH_LENGTH];
+        FILE * fp;
+        char * pch;
+        if ( !outputFile || !*outputFile ) {
+            snprintf( out, sizeof(out), "%s.torrent", builder->top);
+            outputFile = out;
+        }
+        fp = fopen( outputFile, "wb+" );
+        pch = tr_bencSaveMalloc( &top, &n );
         fwrite( pch, n, 1, fp );
         free( pch );
@@ -418 +394 @@
 
     /* cleanup */
-    freeFileList( files );
     tr_bencFree( & top );
     return 0;

branches/file_selection/libtransmission/makemeta.h

@@ -42 +42 @@
 tr_metaInfoBuilderCreate( const char * topFile );
 
+int
+tr_makeMetaInfo( const meta_info_builder_t * builder,
+                 const char                * outputFile, /* NULL for builder->top + ".torrent" */
+                 const char                * announce,
+                 const char                * comment,
+                 int                         isPrivate );
+
 void
 tr_metaInfoBuilderFree( meta_info_builder_t* );
 
-
-int
-tr_makeMetaInfo( const char   * outputFile,
-                 const char   * announce,
-                 const char   * comment,
-                 const char   * topFile,
-                 int            isPrivate );
-
 #endif

branches/file_selection/mk/gtk.mk

@@ -5 +5 @@
 
 SRCS = actions.c conf.c dialogs.c hig.c io.c ipc.c main.c msgwin.c \
-       torrent-inspector.c tr_cell_renderer_progress.c tr_core.c \
-       tr_icon.c tr_prefs.c tr_torrent.c tr_window.c util.c
+       make-meta-ui.c torrent-inspector.c tr_cell_renderer_progress.c \
+       tr_core.c tr_icon.c tr_prefs.c tr_torrent.c tr_window.c util.c
 OBJS = $(SRCS:%.c=%.o)