Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-25 04:45:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: make parts of tr file private (#2241)

Browse Source 
* refactor: make parts of tr_file private
This commit is contained in:
Charles Kerr
2021-11-27 21:17:47 -06:00
committed by GitHub
parent f6f0db75e1
commit 34881f6295
17 changed files with 237 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
libtransmission/rpcimpl.cc
View File

@@ -382,27 +382,25 @@ static void addLabels(tr_torrent const* tor, tr_variant* list)
static void addFileStats(tr_torrent const* tor, tr_variant* list)
{
auto const* const info = tr_torrentInfo(tor);
for (tr_file_index_t i = 0; i < info->fileCount; ++i)
for (tr_file_index_t i = 0, n = tr_torrentFileCount(tor); i < n; ++i)
{
auto const* const file = &info->files[i];
tr_variant* const d = tr_variantListAddDict(list, 3);
tr_variantDictAddInt(d, TR_KEY_bytesCompleted, tr_torrentFileProgress(tor, i).bytes_completed);
tr_variantDictAddInt(d, TR_KEY_priority, file->priority);
tr_variantDictAddBool(d, TR_KEY_wanted, !file->dnd);
auto const file = tr_torrentFile(tor, i);
tr_variant* d = tr_variantListAddDict(list, 3);
tr_variantDictAddInt(d, TR_KEY_bytesCompleted, file.length);
tr_variantDictAddInt(d, TR_KEY_priority, file.priority);
tr_variantDictAddBool(d, TR_KEY_wanted, file.wanted);
}
}
static void addFiles(tr_torrent const* tor, tr_variant* list)
{
auto const* const info = tr_torrentInfo(tor);
for (tr_file_index_t i = 0; i < info->fileCount; ++i)
for (tr_file_index_t i = 0, n = tr_torrentFileCount(tor); i < n; ++i)
{
tr_file const* file = &info->files[i];
auto const file = tr_torrentFile(tor, i);
tr_variant* d = tr_variantListAddDict(list, 3);
tr_variantDictAddInt(d, TR_KEY_bytesCompleted, tr_torrentFileProgress(tor, i).bytes_completed);
tr_variantDictAddInt(d, TR_KEY_length, file->length);
tr_variantDictAddStr(d, TR_KEY_name, file->name);
tr_variantDictAddInt(d, TR_KEY_bytesCompleted, file.have);
tr_variantDictAddInt(d, TR_KEY_length, file.length);
tr_variantDictAddStr(d, TR_KEY_name, file.name);
}
}
@@ -570,16 +568,16 @@ static void initField(
break;
case TR_KEY_file_count:
tr_variantInitInt(initme, inf->fileCount);
tr_variantInitInt(initme, tr_torrentFileCount(tor));
break;
case TR_KEY_files:
tr_variantInitList(initme, inf->fileCount);
tr_variantInitList(initme, tr_torrentFileCount(tor));
addFiles(tor, initme);
break;
case TR_KEY_fileStats:
tr_variantInitList(initme, inf->fileCount);
tr_variantInitList(initme, tr_torrentFileCount(tor));
addFileStats(tor, initme);
break;
@@ -715,12 +713,14 @@ static void initField(
break;
case TR_KEY_priorities:
tr_variantInitList(initme, inf->fileCount);
for (tr_file_index_t i = 0; i < inf->fileCount; ++i)
{
tr_variantListAddInt(initme, inf->files[i].priority);
auto const n = tr_torrentFileCount(tor);
tr_variantInitList(initme, n);
for (tr_file_index_t i = 0; i < n; ++i)
{
tr_variantListAddInt(initme, tr_torrentFile(tor, i).priority);
}
}
break;
case TR_KEY_queuePosition:
@@ -823,13 +823,14 @@ static void initField(
break;
case TR_KEY_wanted:
tr_variantInitList(initme, inf->fileCount);
for (tr_file_index_t i = 0; i < inf->fileCount; ++i)
{
tr_variantListAddInt(initme, inf->files[i].dnd ? 0 : 1);
auto const n = tr_torrentFileCount(tor);
tr_variantInitList(initme, n);
for (tr_file_index_t i = 0; i < n; ++i)
{
tr_variantListAddInt(initme, tr_torrentFile(tor, i).wanted);
}
}
break;
case TR_KEY_webseeds: