Changeset 10783

Timestamp:

Jun 16, 2010, 2:27:24 PM (12 years ago)

Author:

charles

Message:

(trunk) #2983: add command-line utilities for creating .torrent files, for editing passkeys, for adding/removing trackers, etc.

Location:

trunk

Files:

• Makefile.am (modified) (1 diff)
• cli/cli.c (modified) (12 diffs)
• cli/transmissioncli.1 (modified) (5 diffs)
• configure.ac (modified) (1 diff)
• daemon/daemon.c (modified) (1 diff)
• daemon/remote.c (modified) (1 diff)
• daemon/watch.c (modified) (1 diff)
• libtransmission/bencode.c (modified) (1 diff)
• libtransmission/bencode.h (modified) (1 diff)
• libtransmission/list.h (modified) (1 diff)
• libtransmission/utils.c (modified) (1 diff)
• utils (added)
• utils/Makefile.am (added)
• utils/create.c (added)
• utils/edit.c (added)
• utils/show.c (added)
• utils/transmission-create.1 (added)
• utils/transmission-edit.1 (added)

trunk/Makefile.am

@@ -20 +20 @@
   third-party \
   libtransmission \
+  utils \
   $(DAEMON_DIR) \
   $(CLI_DIR) \

trunk/cli/cli.c

@@ -31 +31 @@
 #include <libtransmission/transmission.h>
 #include <libtransmission/bencode.h>
-#include <libtransmission/makemeta.h>
 #include <libtransmission/tr-getopt.h>
 #include <libtransmission/utils.h> /* tr_wait_msec */
@@ -40 +39 @@
 #define MY_NAME "transmissioncli"
 
-static tr_bool showInfo         = 0;
-static tr_bool showScrape       = 0;
-static tr_bool isPrivate        = 0;
 static tr_bool verify           = 0;
 static sig_atomic_t gotsig           = 0;
@@ -48 +44 @@
 
 static const char * torrentPath  = NULL;
-static const char * sourceFile   = NULL;
-static const char * comment      = NULL;
-
-#define MAX_ANNOUNCE 128
-static tr_tracker_info announce[MAX_ANNOUNCE];
-static int announceCount = 0;
 
 static const struct tr_option options[] =
 {
-    { 'a', "announce",             "Set the new torrent's announce URL", "a",  1, "<url>"     },
     { 'b', "blocklist",            "Enable peer blocklists", "b",  0, NULL        },
     { 'B', "no-blocklist",         "Disable peer blocklists", "B",  0, NULL        },
-    { 'c', "comment",              "Set the new torrent's comment", "c",  1, "<comment>" },
     { 'd', "downlimit",            "Set max download speed in KiB/s", "d",  1, "<speed>"   },
     { 'D', "no-downlimit",         "Don't limit the download speed", "D",  0, NULL        },
@@ -68 +56 @@
     { 'f', "finish",               "Run a script when the torrent finishes", "f", 1, "<script>" },
     { 'g', "config-dir",           "Where to find configuration files", "g", 1, "<path>" },
-    { 'i', "info",                 "Show torrent details and exit", "i",  0, NULL        },
     { 'm', "portmap",              "Enable portmapping via NAT-PMP or UPnP", "m",  0, NULL        },
     { 'M', "no-portmap",           "Disable portmapping", "M",  0, NULL        },
-    { 'n', "new",                  "Create a new torrent", "n", 1, "<source>" },
     { 'p', "port", "Port for incoming peers (Default: " TR_DEFAULT_PEER_PORT_STR ")", "p", 1, "<port>" },
-    { 'r', "private",              "Set the new torrent's 'private' flag", "r",  0, NULL        },
-    { 's', "scrape",               "Scrape the torrent and exit", "s",  0, NULL        },
     { 't', "tos", "Peer socket TOS (0 to 255, default=" TR_DEFAULT_PEER_SOCKET_TOS_STR ")", "t", 1, "<tos>" },
     { 'u', "uplimit",              "Set max upload speed in KiB/s", "u",  1, "<speed>"   },
@@ -113 +97 @@
 }
 
-static int
-is_rfc2396_alnum( char ch )
-{
-    return ( '0' <= ch && ch <= '9' )
-           || ( 'A' <= ch && ch <= 'Z' )
-           || ( 'a' <= ch && ch <= 'z' );
-}
-
-static void
-escape( char *          out,
-        const uint8_t * in,
-        int             in_len )                     /* rfc2396 */
-{
-    const uint8_t *end = in + in_len;
-
-    while( in != end )
-        if( is_rfc2396_alnum( *in ) )
-            *out++ = (char) *in++;
-        else
-            out += tr_snprintf( out, 4, "%%%02X", (unsigned int)*in++ );
-
-    *out = '\0';
-}
-
 static tr_bool waitingOnWeb;
 
@@ -148 +108 @@
     tr_ctorSetMetainfo( ctor, response, response_byte_count );
     waitingOnWeb = FALSE;
-}
-
-static int leftToScrape = 0;
-
-static void
-scrapeDoneFunc( tr_session   * session UNUSED,
-                long           response_code,
-                const void   * response,
-                size_t         response_byte_count,
-                void         * host )
-{
-    tr_benc top, *files;
-
-    if( !tr_bencLoad( response, response_byte_count, &top, NULL )
-      && tr_bencDictFindDict( &top, "files", &files )
-      && files->val.l.count >= 2 )
-    {
-        int64_t   complete = -1, incomplete = -1, downloaded = -1;
-        tr_benc * hash = &files->val.l.vals[1];
-        tr_bencDictFindInt( hash, "complete", &complete );
-        tr_bencDictFindInt( hash, "incomplete", &incomplete );
-        tr_bencDictFindInt( hash, "downloaded", &downloaded );
-        printf( "%4d seeders, %4d leechers, %5d downloads at %s\n",
-                (int)complete, (int)incomplete, (int)downloaded,
-                (char*)host );
-        tr_bencFree( &top );
-    }
-    else
-        fprintf( stderr, "Unable to parse response (http code %lu) at %s",
-                 response_code,
-                 (char*)host );
-
-    --leftToScrape;
-
-    tr_free( host );
-}
-
-static void
-dumpInfo( FILE *          out,
-          const tr_info * inf )
-{
-    int             i;
-    int             prevTier = -1;
-    tr_file_index_t ff;
-
-    fprintf( out, "hash:\t" );
-    for( i = 0; i < SHA_DIGEST_LENGTH; ++i )
-        fprintf( out, "%02x", inf->hash[i] );
-    fprintf( out, "\n" );
-
-    fprintf( out, "name:\t%s\n", inf->name );
-
-    for( i = 0; i < inf->trackerCount; ++i )
-    {
-        if( prevTier != inf->trackers[i].tier )
-        {
-            prevTier = inf->trackers[i].tier;
-            fprintf( out, "\ntracker tier #%d:\n", ( prevTier + 1 ) );
-        }
-        fprintf( out, "\tannounce:\t%s\n", inf->trackers[i].announce );
-    }
-
-    fprintf( out, "size:\t%" PRIu64 " (%" PRIu64 " * %d + %" PRIu64 ")\n",
-             inf->totalSize, inf->totalSize / inf->pieceSize,
-             inf->pieceSize, inf->totalSize % inf->pieceSize );
-
-    if( inf->comment && *inf->comment )
-        fprintf( out, "comment:\t%s\n", inf->comment );
-    if( inf->creator && *inf->creator )
-        fprintf( out, "creator:\t%s\n", inf->creator );
-    if( inf->isPrivate )
-        fprintf( out, "private flag set\n" );
-
-    fprintf( out, "file(s):\n" );
-    for( ff = 0; ff < inf->fileCount; ++ff )
-        fprintf( out, "\t%s (%" PRIu64 ")\n", inf->files[ff].name,
-                 inf->files[ff].length );
 }
 
@@ -305 +188 @@
     tr_benc       settings;
     const char  * configDir;
-    tr_bool       haveSource;
-    tr_bool       haveAnnounce;
     uint8_t     * fileContents;
     size_t        fileLength;
@@ -334 +215 @@
     }
 
-    /* don't bind the port if we're just running the CLI
-       to get metainfo or to create a torrent */
-    if( showInfo || showScrape || ( sourceFile != NULL ) )
-        tr_bencDictAddInt( &settings, TR_PREFS_KEY_PEER_PORT, -1 );
-
     h = tr_sessionInit( "cli", configDir, FALSE, &settings );
 
-    haveSource = sourceFile && *sourceFile;
-    haveAnnounce = announceCount > 0;
-
-    if( haveSource && !haveAnnounce )
-        fprintf( stderr, "Did you mean to create a torrent without a tracker's announce URL?\n" );
-
-    if( haveSource ) /* creating a torrent */
-    {
-        int err;
-        tr_metainfo_builder * b;
-        fprintf( stderr, "creating torrent \"%s\"\n", torrentPath );
-
-        b = tr_metaInfoBuilderCreate( sourceFile );
-        tr_makeMetaInfo( b, torrentPath, announce, announceCount, comment, isPrivate );
-        while( !b->isDone )
-        {
-            tr_wait_msec( 1000 );
-            printf( "." );
-        }
-
-        err = b->result;
-        tr_metaInfoBuilderFree( b );
-        return err;
-    }
-
     ctor = tr_ctorNew( h );
 
     fileContents = tr_loadFile( torrentPath, &fileLength );
-    tr_ctorSetPaused( ctor, TR_FORCE, showScrape );
+    tr_ctorSetPaused( ctor, TR_FORCE, FALSE );
     if( fileContents != NULL ) {
         tr_ctorSetMetainfo( ctor, fileContents, fileLength );
@@ -380 +231 @@
     }
     tr_free( fileContents );
-
-    if( showScrape )
-    {
-        tr_info info;
-
-        if( !tr_torrentParse( ctor, &info ) )
-        {
-            int          i;
-            const time_t start = time( NULL );
-            for( i = 0; i < info.trackerCount; ++i )
-            {
-                if( info.trackers[i].scrape )
-                {
-                    const char * scrape = info.trackers[i].scrape;
-                    char         escaped[SHA_DIGEST_LENGTH * 3 + 1];
-                    char *       url, *host;
-                    escape( escaped, info.hash, SHA_DIGEST_LENGTH );
-                    url = tr_strdup_printf( "%s%cinfo_hash=%s",
-                                            scrape,
-                                            strchr( scrape,
-                                                    '?' ) ? '&' : '?',
-                                            escaped );
-                    tr_urlParse( scrape, -1, NULL, &host, NULL, NULL );
-                    ++leftToScrape;
-
-                    tr_webRun( h, url, NULL, scrapeDoneFunc, host );
-                    tr_free( url );
-                }
-            }
-
-            fprintf( stderr, "scraping %d trackers:\n", leftToScrape );
-
-            while( leftToScrape > 0 && ( ( time( NULL ) - start ) < 20 ) )
-                tr_wait_msec( 250 );
-        }
-        goto cleanup;
-    }
-
-    if( showInfo )
-    {
-        tr_info info;
-
-        if( !tr_torrentParse( ctor, &info ) )
-        {
-            dumpInfo( stdout, &info );
-            tr_metainfoFree( &info );
-        }
-
-        tr_ctorFree( ctor );
-        goto cleanup;
-    }
 
     tor = tr_torrentNew( ctor, &error );
@@ -496 +296 @@
     }
 
-cleanup:
-
     tr_sessionSaveSettings( h, configDir, &settings );
 
@@ -522 +320 @@
         switch( c )
         {
-            case 'a': if( announceCount + 1 < MAX_ANNOUNCE ) {
-                          announce[announceCount].tier = announceCount;
-                          announce[announceCount].announce = (char*) optarg;
-                          ++announceCount;
-                      }
-                      break;
             case 'b': tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED, TRUE );
                       break;
             case 'B': tr_bencDictAddBool( d, TR_PREFS_KEY_BLOCKLIST_ENABLED, FALSE );
-                      break;
-            case 'c': comment = optarg;
                       break;
             case 'd': tr_bencDictAddInt ( d, TR_PREFS_KEY_DSPEED, atoi( optarg ) );
@@ -544 +334 @@
             case 'g': /* handled above */
                       break;
-            case 'i': showInfo = 1;
-                      break;
             case 'm': tr_bencDictAddBool( d, TR_PREFS_KEY_PORT_FORWARDING, TRUE );
                       break;
             case 'M': tr_bencDictAddBool( d, TR_PREFS_KEY_PORT_FORWARDING, FALSE );
                       break;
-            case 'n': sourceFile = optarg; break;
             case 'p': tr_bencDictAddInt( d, TR_PREFS_KEY_PEER_PORT, atoi( optarg ) );
-                      break;
-            case 'r': isPrivate = 1;
-                      break;
-            case 's': showScrape = 1;
                       break;
             case 't': tr_bencDictAddInt( d, TR_PREFS_KEY_PEER_SOCKET_TOS, atoi( optarg ) );

trunk/cli/transmissioncli.1

@@ -25 +25 @@
 .Fl h
 .Nm
-.Fl i
-.Ar torrent-file
-.Nm
-.Fl s
-.Ar torrent-file
-.Nm
-.Fl n Ar sourcefile
-.Op Fl a Ar url
-.Op Fl c Ar comment
-.Op Fl r
-.Ar new-torrent-file
-.Nm
 .Op Fl b | B
 .Op Fl d Ar number | Fl D
@@ -59 +47 @@
 The options are as follows:
 .Bl -tag -width Ds
-.It Fl a, Fl -announce Ar announce-url
-When creating a new torrent, set its announce URL
 .It Fl b Fl -blocklist
 Enable peer blocklists.  Transmission understands the bluetack blocklist file format.
@@ -66 +52 @@
 .It Fl B Fl -no-blocklist
 Disble blocklists.
-.It Fl c, Fl -comment Ar comment-text
-When creating a new torrent, set its comment field
 .It Fl d, -downlimit Ar number
 Set the maximum download speed in KB/s
@@ -85 +69 @@
 .It Fl h, Fl -help
 Prints a short usage summary.
-.It Fl i, Fl -info
-Shows torrent details and exit
 .It Fl m, Fl -portmap
 Enable portmapping via NAT-PMP or UPnP
@@ -95 +77 @@
 .It Fl p, -port Ar port
 Set the port to listen for incoming peers. (Default: 51413)
-.It Fl r, Fl -private
-When creating a new torrent, set its 'private' flag
-.It Fl s, -scrape
-Print the current number of seeders and leechers for the specified torrent
 .It Fl t, -tos
 Set the peer socket TOS for local router-based traffic shaping.

trunk/configure.ac

@@ -477 +477 @@
                  doc/Makefile
                  libtransmission/Makefile
+                 utils/Makefile
                  third-party/Makefile
                  third-party/miniupnp/Makefile

trunk/daemon/daemon.c

@@ -2 +2 @@
  * This file Copyright (C) 2008-2010 Mnemosyne LLC
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
- * so that the bulk of its code can remain under the MIT license.
- * This exemption does not extend to derived works not owned by
- * the Transmission project.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
  * $Id$

trunk/daemon/remote.c

@@ -2 +2 @@
  * This file Copyright (C) 2008-2010 Mnemosyne LLC
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
- * so that the bulk of its code can remain under the MIT license.
- * This exemption does not extend to derived works not owned by
- * the Transmission project.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
  * $Id$

trunk/daemon/watch.c

@@ -2 +2 @@
  * This file Copyright (C) 2009-2010 Mnemosyne LLC
  *
- * This file is licensed by the GPL version 2.  Works owned by the
- * Transmission project are granted a special exemption to clause 2(b)
- * so that the bulk of its code can remain under the MIT license.
- * This exemption does not extend to derived works not owned by
- * the Transmission project.
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2
+ * as published by the Free Software Foundation.
+ *
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
  *
  * $Id$

trunk/libtransmission/bencode.c

@@ -422 +422 @@
         ret = val->val.l.vals + i;
     return ret;
+}
+
+int
+tr_bencListRemove( tr_benc * list, size_t i )
+{
+    if( tr_bencIsList( list ) && ( i < list->val.l.count ) )
+    {
+        tr_bencFree( &list->val.l.vals[i] );
+        tr_removeElementFromArray( list->val.l.vals, i, sizeof( tr_benc ), list->val.l.count-- );
+        return 1;
+    }
+
+    return 0;
 }
 

trunk/libtransmission/bencode.h

@@ -157 +157 @@
 tr_benc * tr_bencListChild( tr_benc * list, size_t n );
 
+int       tr_bencListRemove( tr_benc *, size_t n );
+
 /***
 ****

trunk/libtransmission/list.h

@@ -12 +12 @@
 
 #ifndef __TRANSMISSION__
-#error only libtransmission should #include this header.
+ #error only libtransmission should #include this header.
 #endif
 

trunk/libtransmission/utils.c

@@ -115 +115 @@
 tr_setMessageLevel( int level )
 {
-    tr_lockLock( messageLock );
-
     messageLevel = MAX( 0, level );
-
-    tr_lockUnlock( messageLock );
 }