Changeset 5614

Timestamp:

Apr 14, 2008, 3:17:16 PM (14 years ago)

Author:

charles

Message:

get DND working in the benc resume files

Location:

trunk/libtransmission

Files:

• resume.c (modified) (5 diffs)
• resume.h (modified) (1 diff)

trunk/libtransmission/resume.c

@@ -27 +27 @@
 #define KEY_CORRUPT     "corrupt"
 #define KEY_DESTINATION "destination"
+#define KEY_DND         "dnd"
 #define KEY_DOWNLOADED  "downloaded"
 #define KEY_MAX_PEERS   "max-peers"
@@ -101 +102 @@
 
 static void
-savePriorities( tr_benc * dict, const tr_torrent * tor )
+saveDND( tr_benc * dict, const tr_torrent * tor )
 {
     const tr_info * inf = &tor->info;
@@ -108 +109 @@
     tr_benc * list;
 
-    list = tr_bencDictAddList( dict, KEY_PRIORITY, tor->info.fileCount );
+    list = tr_bencDictAddList( dict, KEY_DND, n );
+    for( i=0; i<n; ++i )
+        tr_bencInitInt( tr_bencListAdd( list ), inf->files[i].dnd ? 1 : 0 );
+}
+
+static uint64_t
+loadDND( tr_benc * dict, tr_torrent * tor )
+{
+    uint64_t ret = 0;
+    tr_info * inf = &tor->info;
+    const tr_file_index_t n = inf->fileCount;
+    tr_benc * list;
+
+    if( tr_bencDictFindList( dict, KEY_DND, &list )
+        && ( list->val.l.count == (int)n ) )
+    {
+        int64_t tmp;
+        tr_file_index_t * dl = tr_new( tr_file_index_t, n );
+        tr_file_index_t * dnd = tr_new( tr_file_index_t, n );
+        tr_file_index_t i, dlCount=0, dndCount=0;
+
+        for( i=0; i<n; ++i ) {
+            if( tr_bencGetInt( &list->val.l.vals[i], &tmp ) && tmp )
+                dnd[dndCount++] = i;
+            else
+                dl[dlCount++] = i;
+        }
+
+        if( dndCount )
+            tr_torrentInitFileDLs ( tor, dnd, dndCount, FALSE );
+        if( dlCount )
+            tr_torrentInitFileDLs ( tor, dl, dlCount, TRUE );
+
+        tr_free( dnd );
+        tr_free( dl );
+        ret = TR_FR_PRIORITY;
+    }
+
+    return ret;
+}
+
+/***
+****
+***/
+
+static void
+savePriorities( tr_benc * dict, const tr_torrent * tor )
+{
+    const tr_info * inf = &tor->info;
+    const tr_file_index_t n = inf->fileCount;
+    tr_file_index_t i;
+    tr_benc * list;
+
+    list = tr_bencDictAddList( dict, KEY_PRIORITY, n );
     for( i=0; i<n; ++i )
         tr_bencInitInt( tr_bencListAdd( list ), inf->files[i].priority );
@@ -297 +351 @@
     savePeers( &top, tor );
     savePriorities( &top, tor );
+    saveDND( &top, tor );
     saveProgress( &top, tor );
     saveSpeedLimits( &top, tor );
@@ -382 +437 @@
         fieldsLoaded |= loadProgress( &top, tor );
 
+    if( fieldsToLoad & TR_FR_DND )
+        fieldsLoaded |= loadDND( &top, tor );
+
     if( fieldsToLoad & TR_FR_SPEEDLIMIT )
         fieldsLoaded |= loadSpeedLimits( &top, tor );

trunk/libtransmission/resume.h

@@ -21 +21 @@
   TR_FR_PEERS        = (1<<3),
   TR_FR_PROGRESS     = (1<<4),
-  TR_FR_PRIORITY     = (1<<5),
-  TR_FR_SPEEDLIMIT   = (1<<6),
-  TR_FR_RUN          = (1<<7),
-  TR_FR_DESTINATION  = (1<<8),
-  TR_FR_MAX_PEERS    = (1<<9)
+  TR_FR_DND          = (1<<5),
+  TR_FR_PRIORITY     = (1<<6),
+  TR_FR_SPEEDLIMIT   = (1<<7),
+  TR_FR_RUN          = (1<<8),
+  TR_FR_DESTINATION  = (1<<9),
+  TR_FR_MAX_PEERS    = (1<<10)
 };