Changeset 6185 for branches/1.2x

Timestamp:

Jun 13, 2008, 9:25:25 PM (14 years ago)

Author:

charles

Message:

(1.2x) #938: "transmissioncli won't scrape" backported to 1.2x

File:

• branches/1.2x/cli/transmissioncli.c (modified) (5 diffs)

branches/1.2x/cli/transmissioncli.c

@@ -31 +31 @@
 
 #include <libtransmission/transmission.h>
+#include <libtransmission/bencode.h>
 #include <libtransmission/makemeta.h>
 #include <libtransmission/metainfo.h> /* tr_metainfoFree */
 #include <libtransmission/utils.h> /* tr_wait */
-
+#include <libtransmission/web.h> /* tr_webRun */
 
 /* macro to shut up "unused parameter" warnings */
@@ -100 +101 @@
 }
 
+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 += snprintf( out, 4, "%%%02X", (unsigned int)*in++ );
+    *out = '\0';
+}
+
 #define LINEWIDTH 80
 
@@ -108 +129 @@
 {
     system( finishCall );
+}
+
+static int leftToScrape = 0;
+
+static void
+scrapeDoneFunc( struct tr_handle    * 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
+        printf( "unable to parse response (http code %lu) at %s", response_code, (char*)host );
+
+    --leftToScrape;
 }
 
@@ -184 +235 @@
     ctor = tr_ctorNew( h );
     tr_ctorSetMetainfoFromFile( ctor, torrentPath );
-    tr_ctorSetPaused( ctor, TR_FORCE, 0 );
+    tr_ctorSetPaused( ctor, TR_FORCE, showScrape );
     tr_ctorSetDestination( ctor, TR_FORCE, savePath );
+
+    if( showScrape )
+    {
+        tr_info info;
+
+        if( !tr_torrentParse( h, 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[2048], *host;
+                    escape( escaped, info.hash, SHA_DIGEST_LENGTH );
+                    snprintf( url, sizeof(url), "%s%cinfo_hash=%s",
+                                                scrape,
+                                                strchr(scrape,'?')?'&':'?',
+                                                escaped );
+                    tr_httpParseURL( scrape, -1, &host, NULL, NULL );
+                    ++leftToScrape;
+                    tr_webRun( h, url, scrapeDoneFunc, host );
+                }
+            }
+
+            fprintf( stderr, "scraping %d trackers:\n", leftToScrape );
+
+            while( leftToScrape>0 && ((time(NULL)-start)<20) )
+                tr_wait( 250 );
+        }
+        goto cleanup;
+    }
+
 
     if( showInfo )
@@ -241 +327 @@
         tr_close( h );
         return EXIT_FAILURE;
-    }
-
-    if( showScrape )
-    {
-        const struct tr_stat * stats;
-        const uint64_t start = tr_date( );
-        printf( "Scraping, Please wait...\n" );
-        
-        do
-        {
-            stats = tr_torrentStat( tor );
-            if( !stats || tr_date() - start > 20000 )
-            {
-                printf( "Scrape failed.\n" );
-                goto cleanup;
-            }
-            tr_wait( 2000 );
-        }
-        while( stats->completedFromTracker == -1 || stats->leechers == -1 || stats->seeders == -1 );
-        
-        printf( "%d seeder(s), %d leecher(s), %d download(s).\n",
-            stats->seeders, stats->leechers, stats->completedFromTracker );
-
-        goto cleanup;
     }