Browse Source

Merge pull request #13625 from FranciscoPombal/expose_content_path

Expose contentPath in WebAPI torrents/info
adaptive-webui-19844
Vladimir Golovnev 4 years ago committed by GitHub
parent
commit
0a2a71e83b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      src/webui/api/serialize/serialize_torrent.cpp
  2. 1
      src/webui/api/serialize/serialize_torrent.h
  3. 2
      src/webui/webapplication.h

1
src/webui/api/serialize/serialize_torrent.cpp

@ -108,6 +108,7 @@ QVariantMap serialize(const BitTorrent::TorrentHandle &torrent) @@ -108,6 +108,7 @@ QVariantMap serialize(const BitTorrent::TorrentHandle &torrent)
{KEY_TORRENT_SUPER_SEEDING, torrent.superSeeding()},
{KEY_TORRENT_FORCE_START, torrent.isForced()},
{KEY_TORRENT_SAVE_PATH, Utils::Fs::toNativePath(torrent.savePath())},
{KEY_TORRENT_CONTENT_PATH, Utils::Fs::toNativePath(torrent.contentPath())},
{KEY_TORRENT_ADDED_ON, torrent.addedTime().toSecsSinceEpoch()},
{KEY_TORRENT_COMPLETION_ON, torrent.completedTime().toSecsSinceEpoch()},
{KEY_TORRENT_TRACKER, torrent.currentTracker()},

1
src/webui/api/serialize/serialize_torrent.h

@ -58,6 +58,7 @@ const char KEY_TORRENT_TAGS[] = "tags"; @@ -58,6 +58,7 @@ const char KEY_TORRENT_TAGS[] = "tags";
const char KEY_TORRENT_SUPER_SEEDING[] = "super_seeding";
const char KEY_TORRENT_FORCE_START[] = "force_start";
const char KEY_TORRENT_SAVE_PATH[] = "save_path";
const char KEY_TORRENT_CONTENT_PATH[] = "content_path";
const char KEY_TORRENT_ADDED_ON[] = "added_on";
const char KEY_TORRENT_COMPLETION_ON[] = "completion_on";
const char KEY_TORRENT_TRACKER[] = "tracker";

2
src/webui/webapplication.h

@ -43,7 +43,7 @@ @@ -43,7 +43,7 @@
#include "base/utils/net.h"
#include "base/utils/version.h"
constexpr Utils::Version<int, 3, 2> API_VERSION {2, 6, 0};
constexpr Utils::Version<int, 3, 2> API_VERSION {2, 6, 1};
class APIController;
class WebApplication;

Loading…
Cancel
Save