@ -57,63 +57,63 @@
# include "serialize/serialize_torrent.h" # include "serialize/serialize_torrent.h"
// Tracker keys
// Tracker keys
const char KEY_TRACKER_URL [ ] = " url " ; const QString KEY_TRACKER_URL = u " url " _qs ;
const char KEY_TRACKER_STATUS [ ] = " status " ; const QString KEY_TRACKER_STATUS = u " status " _qs ;
const char KEY_TRACKER_TIER [ ] = " tier " ; const QString KEY_TRACKER_TIER = u " tier " _qs ;
const char KEY_TRACKER_MSG [ ] = " msg " ; const QString KEY_TRACKER_MSG = u " msg " _qs ;
const char KEY_TRACKER_PEERS_COUNT [ ] = " num_peers " ; const QString KEY_TRACKER_PEERS_COUNT = u " num_peers " _qs ;
const char KEY_TRACKER_SEEDS_COUNT [ ] = " num_seeds " ; const QString KEY_TRACKER_SEEDS_COUNT = u " num_seeds " _qs ;
const char KEY_TRACKER_LEECHES_COUNT [ ] = " num_leeches " ; const QString KEY_TRACKER_LEECHES_COUNT = u " num_leeches " _qs ;
const char KEY_TRACKER_DOWNLOADED_COUNT [ ] = " num_downloaded " ; const QString KEY_TRACKER_DOWNLOADED_COUNT = u " num_downloaded " _qs ;
// Web seed keys
// Web seed keys
const char KEY_WEBSEED_URL [ ] = " url " ; const QString KEY_WEBSEED_URL = u " url " _qs ;
// Torrent keys (Properties)
// Torrent keys (Properties)
const char KEY_PROP_TIME_ELAPSED [ ] = " time_elapsed " ; const QString KEY_PROP_TIME_ELAPSED = u " time_elapsed " _qs ;
const char KEY_PROP_SEEDING_TIME [ ] = " seeding_time " ; const QString KEY_PROP_SEEDING_TIME = u " seeding_time " _qs ;
const char KEY_PROP_ETA [ ] = " eta " ; const QString KEY_PROP_ETA = u " eta " _qs ;
const char KEY_PROP_CONNECT_COUNT [ ] = " nb_connections " ; const QString KEY_PROP_CONNECT_COUNT = u " nb_connections " _qs ;
const char KEY_PROP_CONNECT_COUNT_LIMIT [ ] = " nb_connections_limit " ; const QString KEY_PROP_CONNECT_COUNT_LIMIT = u " nb_connections_limit " _qs ;
const char KEY_PROP_DOWNLOADED [ ] = " total_downloaded " ; const QString KEY_PROP_DOWNLOADED = u " total_downloaded " _qs ;
const char KEY_PROP_DOWNLOADED_SESSION [ ] = " total_downloaded_session " ; const QString KEY_PROP_DOWNLOADED_SESSION = u " total_downloaded_session " _qs ;
const char KEY_PROP_UPLOADED [ ] = " total_uploaded " ; const QString KEY_PROP_UPLOADED = u " total_uploaded " _qs ;
const char KEY_PROP_UPLOADED_SESSION [ ] = " total_uploaded_session " ; const QString KEY_PROP_UPLOADED_SESSION = u " total_uploaded_session " _qs ;
const char KEY_PROP_DL_SPEED [ ] = " dl_speed " ; const QString KEY_PROP_DL_SPEED = u " dl_speed " _qs ;
const char KEY_PROP_DL_SPEED_AVG [ ] = " dl_speed_avg " ; const QString KEY_PROP_DL_SPEED_AVG = u " dl_speed_avg " _qs ;
const char KEY_PROP_UP_SPEED [ ] = " up_speed " ; const QString KEY_PROP_UP_SPEED = u " up_speed " _qs ;
const char KEY_PROP_UP_SPEED_AVG [ ] = " up_speed_avg " ; const QString KEY_PROP_UP_SPEED_AVG = u " up_speed_avg " _qs ;
const char KEY_PROP_DL_LIMIT [ ] = " dl_limit " ; const QString KEY_PROP_DL_LIMIT = u " dl_limit " _qs ;
const char KEY_PROP_UP_LIMIT [ ] = " up_limit " ; const QString KEY_PROP_UP_LIMIT = u " up_limit " _qs ;
const char KEY_PROP_WASTED [ ] = " total_wasted " ; const QString KEY_PROP_WASTED = u " total_wasted " _qs ;
const char KEY_PROP_SEEDS [ ] = " seeds " ; const QString KEY_PROP_SEEDS = u " seeds " _qs ;
const char KEY_PROP_SEEDS_TOTAL [ ] = " seeds_total " ; const QString KEY_PROP_SEEDS_TOTAL = u " seeds_total " _qs ;
const char KEY_PROP_PEERS [ ] = " peers " ; const QString KEY_PROP_PEERS = u " peers " _qs ;
const char KEY_PROP_PEERS_TOTAL [ ] = " peers_total " ; const QString KEY_PROP_PEERS_TOTAL = u " peers_total " _qs ;
const char KEY_PROP_RATIO [ ] = " share_ratio " ; const QString KEY_PROP_RATIO = u " share_ratio " _qs ;
const char KEY_PROP_REANNOUNCE [ ] = " reannounce " ; const QString KEY_PROP_REANNOUNCE = u " reannounce " _qs ;
const char KEY_PROP_TOTAL_SIZE [ ] = " total_size " ; const QString KEY_PROP_TOTAL_SIZE = u " total_size " _qs ;
const char KEY_PROP_PIECES_NUM [ ] = " pieces_num " ; const QString KEY_PROP_PIECES_NUM = u " pieces_num " _qs ;
const char KEY_PROP_PIECE_SIZE [ ] = " piece_size " ; const QString KEY_PROP_PIECE_SIZE = u " piece_size " _qs ;
const char KEY_PROP_PIECES_HAVE [ ] = " pieces_have " ; const QString KEY_PROP_PIECES_HAVE = u " pieces_have " _qs ;
const char KEY_PROP_CREATED_BY [ ] = " created_by " ; const QString KEY_PROP_CREATED_BY = u " created_by " _qs ;
const char KEY_PROP_LAST_SEEN [ ] = " last_seen " ; const QString KEY_PROP_LAST_SEEN = u " last_seen " _qs ;
const char KEY_PROP_ADDITION_DATE [ ] = " addition_date " ; const QString KEY_PROP_ADDITION_DATE = u " addition_date " _qs ;
const char KEY_PROP_COMPLETION_DATE [ ] = " completion_date " ; const QString KEY_PROP_COMPLETION_DATE = u " completion_date " _qs ;
const char KEY_PROP_CREATION_DATE [ ] = " creation_date " ; const QString KEY_PROP_CREATION_DATE = u " creation_date " _qs ;
const char KEY_PROP_SAVE_PATH [ ] = " save_path " ; const QString KEY_PROP_SAVE_PATH = u " save_path " _qs ;
const char KEY_PROP_DOWNLOAD_PATH [ ] = " download_path " ; const QString KEY_PROP_DOWNLOAD_PATH = u " download_path " _qs ;
const char KEY_PROP_COMMENT [ ] = " comment " ; const QString KEY_PROP_COMMENT = u " comment " _qs ;
// File keys
// File keys
const char KEY_FILE_INDEX [ ] = " index " ; const QString KEY_FILE_INDEX = u " index " _qs ;
const char KEY_FILE_NAME [ ] = " name " ; const QString KEY_FILE_NAME = u " name " _qs ;
const char KEY_FILE_SIZE [ ] = " size " ; const QString KEY_FILE_SIZE = u " size " _qs ;
const char KEY_FILE_PROGRESS [ ] = " progress " ; const QString KEY_FILE_PROGRESS = u " progress " _qs ;
const char KEY_FILE_PRIORITY [ ] = " priority " ; const QString KEY_FILE_PRIORITY = u " priority " _qs ;
const char KEY_FILE_IS_SEED [ ] = " is_seed " ; const QString KEY_FILE_IS_SEED = u " is_seed " _qs ;
const char KEY_FILE_PIECE_RANGE [ ] = " piece_range " ; const QString KEY_FILE_PIECE_RANGE = u " piece_range " _qs ;
const char KEY_FILE_AVAILABILITY [ ] = " availability " ; const QString KEY_FILE_AVAILABILITY = u " availability " _qs ;
namespace namespace
{ {
@ -184,9 +184,9 @@ namespace
const QJsonObject dht const QJsonObject dht
{ {
{ KEY_TRACKER_URL , " ** [DHT] ** " } , { KEY_TRACKER_URL , u " ** [DHT] ** " _qs } ,
{ KEY_TRACKER_TIER , - 1 } , { KEY_TRACKER_TIER , - 1 } ,
{ KEY_TRACKER_MSG , ( isTorrentPrivate ? privateMsg : " " ) } , { KEY_TRACKER_MSG , ( isTorrentPrivate ? privateMsg : u " " _qs ) } ,
{ KEY_TRACKER_STATUS , ( ( BitTorrent : : Session : : instance ( ) - > isDHTEnabled ( ) & & ! isTorrentPrivate ) ? working : disabled ) } , { KEY_TRACKER_STATUS , ( ( BitTorrent : : Session : : instance ( ) - > isDHTEnabled ( ) & & ! isTorrentPrivate ) ? working : disabled ) } ,
{ KEY_TRACKER_PEERS_COUNT , 0 } , { KEY_TRACKER_PEERS_COUNT , 0 } ,
{ KEY_TRACKER_DOWNLOADED_COUNT , 0 } , { KEY_TRACKER_DOWNLOADED_COUNT , 0 } ,
@ -196,9 +196,9 @@ namespace
const QJsonObject pex const QJsonObject pex
{ {
{ KEY_TRACKER_URL , " ** [PeX] ** " } , { KEY_TRACKER_URL , u " ** [PeX] ** " _qs } ,
{ KEY_TRACKER_TIER , - 1 } , { KEY_TRACKER_TIER , - 1 } ,
{ KEY_TRACKER_MSG , ( isTorrentPrivate ? privateMsg : " " ) } , { KEY_TRACKER_MSG , ( isTorrentPrivate ? privateMsg : u " " _qs ) } ,
{ KEY_TRACKER_STATUS , ( ( BitTorrent : : Session : : instance ( ) - > isPeXEnabled ( ) & & ! isTorrentPrivate ) ? working : disabled ) } , { KEY_TRACKER_STATUS , ( ( BitTorrent : : Session : : instance ( ) - > isPeXEnabled ( ) & & ! isTorrentPrivate ) ? working : disabled ) } ,
{ KEY_TRACKER_PEERS_COUNT , 0 } , { KEY_TRACKER_PEERS_COUNT , 0 } ,
{ KEY_TRACKER_DOWNLOADED_COUNT , 0 } , { KEY_TRACKER_DOWNLOADED_COUNT , 0 } ,
@ -208,9 +208,9 @@ namespace
const QJsonObject lsd const QJsonObject lsd
{ {
{ KEY_TRACKER_URL , " ** [LSD] ** " } , { KEY_TRACKER_URL , u " ** [LSD] ** " _qs } ,
{ KEY_TRACKER_TIER , - 1 } , { KEY_TRACKER_TIER , - 1 } ,
{ KEY_TRACKER_MSG , ( isTorrentPrivate ? privateMsg : " " ) } , { KEY_TRACKER_MSG , ( isTorrentPrivate ? privateMsg : u " " _qs ) } ,
{ KEY_TRACKER_STATUS , ( ( BitTorrent : : Session : : instance ( ) - > isLSDEnabled ( ) & & ! isTorrentPrivate ) ? working : disabled ) } , { KEY_TRACKER_STATUS , ( ( BitTorrent : : Session : : instance ( ) - > isLSDEnabled ( ) & & ! isTorrentPrivate ) ? working : disabled ) } ,
{ KEY_TRACKER_PEERS_COUNT , 0 } , { KEY_TRACKER_PEERS_COUNT , 0 } ,
{ KEY_TRACKER_DOWNLOADED_COUNT , 0 } , { KEY_TRACKER_DOWNLOADED_COUNT , 0 } ,
@ -263,14 +263,14 @@ namespace
// - offset (int): set offset (if less than 0 - offset from end)
// - offset (int): set offset (if less than 0 - offset from end)
void TorrentsController : : infoAction ( ) void TorrentsController : : infoAction ( )
{ {
const QString filter { params ( ) [ " filter " ] } ; const QString filter { params ( ) [ u " filter " _qs ] } ;
const std : : optional < QString > category = getOptionalString ( params ( ) , QLatin1String ( " category " ) ) ; const std : : optional < QString > category = getOptionalString ( params ( ) , QLatin1String ( " category " ) ) ;
const std : : optional < QString > tag = getOptionalString ( params ( ) , QLatin1String ( " tag " ) ) ; const std : : optional < QString > tag = getOptionalString ( params ( ) , QLatin1String ( " tag " ) ) ;
const QString sortedColumn { params ( ) [ " sort " ] } ; const QString sortedColumn { params ( ) [ u " sort " _qs ] } ;
const bool reverse { parseBool ( params ( ) [ " reverse " ] ) . value_or ( false ) } ; const bool reverse { parseBool ( params ( ) [ u " reverse " _qs ] ) . value_or ( false ) } ;
int limit { params ( ) [ " limit " ] . toInt ( ) } ; int limit { params ( ) [ u " limit " _qs ] . toInt ( ) } ;
int offset { params ( ) [ " offset " ] . toInt ( ) } ; int offset { params ( ) [ u " offset " _qs ] . toInt ( ) } ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' , Qt : : SkipEmptyParts ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' , Qt : : SkipEmptyParts ) } ;
std : : optional < TorrentIDSet > idSet ; std : : optional < TorrentIDSet > idSet ;
if ( ! hashes . isEmpty ( ) ) if ( ! hashes . isEmpty ( ) )
@ -389,9 +389,9 @@ void TorrentsController::infoAction()
// - "comment": Torrent comment
// - "comment": Torrent comment
void TorrentsController : : propertiesAction ( ) void TorrentsController : : propertiesAction ( )
{ {
requireParams ( { " hash " } ) ; requireParams ( { u " hash " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
@ -463,9 +463,9 @@ void TorrentsController::propertiesAction()
// - "msg": Tracker message (last)
// - "msg": Tracker message (last)
void TorrentsController : : trackersAction ( ) void TorrentsController : : trackersAction ( )
{ {
requireParams ( { " hash " } ) ; requireParams ( { u " hash " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
const BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; const BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
@ -496,9 +496,9 @@ void TorrentsController::trackersAction()
// - "url": Web seed URL
// - "url": Web seed URL
void TorrentsController : : webseedsAction ( ) void TorrentsController : : webseedsAction ( )
{ {
requireParams ( { " hash " } ) ; requireParams ( { u " hash " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
@ -528,9 +528,9 @@ void TorrentsController::webseedsAction()
// and the second number is the ending piece index (inclusive)
// and the second number is the ending piece index (inclusive)
void TorrentsController : : filesAction ( ) void TorrentsController : : filesAction ( )
{ {
requireParams ( { " hash " } ) ; requireParams ( { u " hash " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
const BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; const BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
@ -540,7 +540,7 @@ void TorrentsController::filesAction()
const auto idxIt = params ( ) . constFind ( QLatin1String ( " indexes " ) ) ; const auto idxIt = params ( ) . constFind ( QLatin1String ( " indexes " ) ) ;
if ( idxIt ! = params ( ) . cend ( ) ) if ( idxIt ! = params ( ) . cend ( ) )
{ {
const QStringList indexStrings = idxIt . value ( ) . split ( ' | ' ) ; const QStringList indexStrings = idxIt . value ( ) . split ( u ' | ' ) ;
fileIndexes . reserve ( indexStrings . size ( ) ) ; fileIndexes . reserve ( indexStrings . size ( ) ) ;
std : : transform ( indexStrings . cbegin ( ) , indexStrings . cend ( ) , std : : back_inserter ( fileIndexes ) std : : transform ( indexStrings . cbegin ( ) , indexStrings . cend ( ) , std : : back_inserter ( fileIndexes )
, [ & filesCount ] ( const QString & indexString ) - > int , [ & filesCount ] ( const QString & indexString ) - > int
@ -597,9 +597,9 @@ void TorrentsController::filesAction()
// The return value is a JSON-formatted array of strings (hex strings).
// The return value is a JSON-formatted array of strings (hex strings).
void TorrentsController : : pieceHashesAction ( ) void TorrentsController : : pieceHashesAction ( )
{ {
requireParams ( { " hash " } ) ; requireParams ( { u " hash " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
@ -609,7 +609,7 @@ void TorrentsController::pieceHashesAction()
{ {
const QVector < QByteArray > hashes = torrent - > info ( ) . pieceHashes ( ) ; const QVector < QByteArray > hashes = torrent - > info ( ) . pieceHashes ( ) ;
for ( const QByteArray & hash : hashes ) for ( const QByteArray & hash : hashes )
pieceHashes . append ( QString ( hash . toHex ( ) ) ) ; pieceHashes . append ( QString : : fromLatin1 ( hash . toHex ( ) ) ) ;
} }
setResult ( pieceHashes ) ; setResult ( pieceHashes ) ;
@ -622,9 +622,9 @@ void TorrentsController::pieceHashesAction()
// 2: piece already downloaded
// 2: piece already downloaded
void TorrentsController : : pieceStatesAction ( ) void TorrentsController : : pieceStatesAction ( )
{ {
requireParams ( { " hash " } ) ; requireParams ( { u " hash " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
@ -646,26 +646,26 @@ void TorrentsController::pieceStatesAction()
void TorrentsController : : addAction ( ) void TorrentsController : : addAction ( )
{ {
const QString urls = params ( ) [ " urls " ] ; const QString urls = params ( ) [ u " urls " _qs ] ;
const QString cookie = params ( ) [ " cookie " ] ; const QString cookie = params ( ) [ u " cookie " _qs ] ;
const bool skipChecking = parseBool ( params ( ) [ " skip_checking " ] ) . value_or ( false ) ; const bool skipChecking = parseBool ( params ( ) [ u " skip_checking " _qs ] ) . value_or ( false ) ;
const bool seqDownload = parseBool ( params ( ) [ " sequentialDownload " ] ) . value_or ( false ) ; const bool seqDownload = parseBool ( params ( ) [ u " sequentialDownload " _qs ] ) . value_or ( false ) ;
const bool firstLastPiece = parseBool ( params ( ) [ " firstLastPiecePrio " ] ) . value_or ( false ) ; const bool firstLastPiece = parseBool ( params ( ) [ u " firstLastPiecePrio " _qs ] ) . value_or ( false ) ;
const std : : optional < bool > addPaused = parseBool ( params ( ) [ " paused " ] ) ; const std : : optional < bool > addPaused = parseBool ( params ( ) [ u " paused " _qs ] ) ;
const QString savepath = params ( ) [ " savepath " ] . trimmed ( ) ; const QString savepath = params ( ) [ u " savepath " _qs ] . trimmed ( ) ;
const QString downloadPath = params ( ) [ " downloadPath " ] . trimmed ( ) ; const QString downloadPath = params ( ) [ u " downloadPath " _qs ] . trimmed ( ) ;
const std : : optional < bool > useDownloadPath = parseBool ( params ( ) [ " useDownloadPath " ] ) ; const std : : optional < bool > useDownloadPath = parseBool ( params ( ) [ u " useDownloadPath " _qs ] ) ;
const QString category = params ( ) [ " category " ] ; const QString category = params ( ) [ u " category " _qs ] ;
const QStringList tags = params ( ) [ " tags " ] . split ( ' , ' , Qt : : SkipEmptyParts ) ; const QStringList tags = params ( ) [ u " tags " _qs ] . split ( u ' , ' , Qt : : SkipEmptyParts ) ;
const QString torrentName = params ( ) [ " rename " ] . trimmed ( ) ; const QString torrentName = params ( ) [ u " rename " _qs ] . trimmed ( ) ;
const int upLimit = parseInt ( params ( ) [ " upLimit " ] ) . value_or ( - 1 ) ; const int upLimit = parseInt ( params ( ) [ u " upLimit " _qs ] ) . value_or ( - 1 ) ;
const int dlLimit = parseInt ( params ( ) [ " dlLimit " ] ) . value_or ( - 1 ) ; const int dlLimit = parseInt ( params ( ) [ u " dlLimit " _qs ] ) . value_or ( - 1 ) ;
const double ratioLimit = parseDouble ( params ( ) [ " ratioLimit " ] ) . value_or ( BitTorrent : : Torrent : : USE_GLOBAL_RATIO ) ; const double ratioLimit = parseDouble ( params ( ) [ u " ratioLimit " _qs ] ) . value_or ( BitTorrent : : Torrent : : USE_GLOBAL_RATIO ) ;
const int seedingTimeLimit = parseInt ( params ( ) [ " seedingTimeLimit " ] ) . value_or ( BitTorrent : : Torrent : : USE_GLOBAL_SEEDING_TIME ) ; const int seedingTimeLimit = parseInt ( params ( ) [ u " seedingTimeLimit " _qs ] ) . value_or ( BitTorrent : : Torrent : : USE_GLOBAL_SEEDING_TIME ) ;
const std : : optional < bool > autoTMM = parseBool ( params ( ) [ " autoTMM " ] ) ; const std : : optional < bool > autoTMM = parseBool ( params ( ) [ u " autoTMM " _qs ] ) ;
const QString contentLayoutParam = params ( ) [ " contentLayout " ] ; const QString contentLayoutParam = params ( ) [ u " contentLayout " _qs ] ;
const std : : optional < BitTorrent : : TorrentContentLayout > contentLayout = ( ! contentLayoutParam . isEmpty ( ) const std : : optional < BitTorrent : : TorrentContentLayout > contentLayout = ( ! contentLayoutParam . isEmpty ( )
? Utils : : String : : toEnum ( contentLayoutParam , BitTorrent : : TorrentContentLayout : : Original ) ? Utils : : String : : toEnum ( contentLayoutParam , BitTorrent : : TorrentContentLayout : : Original )
: std : : optional < BitTorrent : : TorrentContentLayout > { } ) ; : std : : optional < BitTorrent : : TorrentContentLayout > { } ) ;
@ -673,11 +673,11 @@ void TorrentsController::addAction()
QList < QNetworkCookie > cookies ; QList < QNetworkCookie > cookies ;
if ( ! cookie . isEmpty ( ) ) if ( ! cookie . isEmpty ( ) )
{ {
const QStringList cookiesStr = cookie . split ( " ; " ) ; const QStringList cookiesStr = cookie . split ( u " ; " _qs ) ;
for ( QString cookieStr : cookiesStr ) for ( QString cookieStr : cookiesStr )
{ {
cookieStr = cookieStr . trimmed ( ) ; cookieStr = cookieStr . trimmed ( ) ;
int index = cookieStr . indexOf ( ' = ' ) ; int index = cookieStr . indexOf ( u ' = ' ) ;
if ( index > 1 ) if ( index > 1 )
{ {
QByteArray name = cookieStr . left ( index ) . toLatin1 ( ) ; QByteArray name = cookieStr . left ( index ) . toLatin1 ( ) ;
@ -707,7 +707,7 @@ void TorrentsController::addAction()
addTorrentParams . useAutoTMM = autoTMM ; addTorrentParams . useAutoTMM = autoTMM ;
bool partialSuccess = false ; bool partialSuccess = false ;
for ( QString url : asConst ( urls . split ( ' \n ' ) ) ) for ( QString url : asConst ( urls . split ( u ' \n ' ) ) )
{ {
url = url . trimmed ( ) ; url = url . trimmed ( ) ;
if ( ! url . isEmpty ( ) ) if ( ! url . isEmpty ( ) )
@ -737,15 +737,15 @@ void TorrentsController::addAction()
void TorrentsController : : addTrackersAction ( ) void TorrentsController : : addTrackersAction ( )
{ {
requireParams ( { " hash " , " urls " } ) ; requireParams ( { u " hash " _qs , u " urls " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
QVector < BitTorrent : : TrackerEntry > trackers ; QVector < BitTorrent : : TrackerEntry > trackers ;
for ( const QString & urlStr : asConst ( params ( ) [ " urls " ] . split ( ' \n ' ) ) ) for ( const QString & urlStr : asConst ( params ( ) [ u " urls " _qs ] . split ( u ' \n ' ) ) )
{ {
const QUrl url { urlStr . trimmed ( ) } ; const QUrl url { urlStr . trimmed ( ) } ;
if ( url . isValid ( ) ) if ( url . isValid ( ) )
@ -756,11 +756,11 @@ void TorrentsController::addTrackersAction()
void TorrentsController : : editTrackerAction ( ) void TorrentsController : : editTrackerAction ( )
{ {
requireParams ( { " hash " , " origUrl " , " newUrl " } ) ; requireParams ( { u " hash " _qs , u " origUrl " _qs , u " newUrl " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
const QString origUrl = params ( ) [ " origUrl " ] ; const QString origUrl = params ( ) [ u " origUrl " _qs ] ;
const QString newUrl = params ( ) [ " newUrl " ] ; const QString newUrl = params ( ) [ u " newUrl " _qs ] ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
@ -771,7 +771,7 @@ void TorrentsController::editTrackerAction()
if ( origTrackerUrl = = newTrackerUrl ) if ( origTrackerUrl = = newTrackerUrl )
return ; return ;
if ( ! newTrackerUrl . isValid ( ) ) if ( ! newTrackerUrl . isValid ( ) )
throw APIError ( APIErrorType : : BadParams , " New tracker URL is invalid " ) ; throw APIError ( APIErrorType : : BadParams , u " New tracker URL is invalid " _qs ) ;
QVector < BitTorrent : : TrackerEntry > trackers = torrent - > trackers ( ) ; QVector < BitTorrent : : TrackerEntry > trackers = torrent - > trackers ( ) ;
bool match = false ; bool match = false ;
@ -779,7 +779,7 @@ void TorrentsController::editTrackerAction()
{ {
const QUrl trackerUrl ( tracker . url ) ; const QUrl trackerUrl ( tracker . url ) ;
if ( trackerUrl = = newTrackerUrl ) if ( trackerUrl = = newTrackerUrl )
throw APIError ( APIErrorType : : Conflict , " New tracker URL already exists " ) ; throw APIError ( APIErrorType : : Conflict , u " New tracker URL already exists " _qs ) ;
if ( trackerUrl = = origTrackerUrl ) if ( trackerUrl = = origTrackerUrl )
{ {
match = true ; match = true ;
@ -787,7 +787,7 @@ void TorrentsController::editTrackerAction()
} }
} }
if ( ! match ) if ( ! match )
throw APIError ( APIErrorType : : Conflict , " Tracker not found " ) ; throw APIError ( APIErrorType : : Conflict , u " Tracker not found " _qs ) ;
torrent - > replaceTrackers ( trackers ) ; torrent - > replaceTrackers ( trackers ) ;
@ -797,14 +797,14 @@ void TorrentsController::editTrackerAction()
void TorrentsController : : removeTrackersAction ( ) void TorrentsController : : removeTrackersAction ( )
{ {
requireParams ( { " hash " , " urls " } ) ; requireParams ( { u " hash " _qs , u " urls " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
const QStringList urls = params ( ) [ " urls " ] . split ( ' | ' ) ; const QStringList urls = params ( ) [ u " urls " _qs ] . split ( u ' | ' ) ;
const QVector < BitTorrent : : TrackerEntry > trackers = torrent - > trackers ( ) ; const QVector < BitTorrent : : TrackerEntry > trackers = torrent - > trackers ( ) ;
QVector < BitTorrent : : TrackerEntry > remainingTrackers ; QVector < BitTorrent : : TrackerEntry > remainingTrackers ;
@ -816,7 +816,7 @@ void TorrentsController::removeTrackersAction()
} }
if ( remainingTrackers . size ( ) = = trackers . size ( ) ) if ( remainingTrackers . size ( ) = = trackers . size ( ) )
throw APIError ( APIErrorType : : Conflict , " No trackers were removed " ) ; throw APIError ( APIErrorType : : Conflict , u " No trackers were removed " _qs ) ;
torrent - > replaceTrackers ( remainingTrackers ) ; torrent - > replaceTrackers ( remainingTrackers ) ;
@ -826,10 +826,10 @@ void TorrentsController::removeTrackersAction()
void TorrentsController : : addPeersAction ( ) void TorrentsController : : addPeersAction ( )
{ {
requireParams ( { " hashes " , " peers " } ) ; requireParams ( { u " hashes " _qs , u " peers " _qs } ) ;
const QStringList hashes = params ( ) [ " hashes " ] . split ( ' | ' ) ; const QStringList hashes = params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) ;
const QStringList peers = params ( ) [ " peers " ] . split ( ' | ' ) ; const QStringList peers = params ( ) [ u " peers " _qs ] . split ( u ' | ' ) ;
QVector < BitTorrent : : PeerAddress > peerList ; QVector < BitTorrent : : PeerAddress > peerList ;
peerList . reserve ( peers . size ( ) ) ; peerList . reserve ( peers . size ( ) ) ;
@ -841,7 +841,7 @@ void TorrentsController::addPeersAction()
} }
if ( peerList . isEmpty ( ) ) if ( peerList . isEmpty ( ) )
throw APIError ( APIErrorType : : BadParams , " No valid peers were specified " ) ; throw APIError ( APIErrorType : : BadParams , u " No valid peers were specified " _qs ) ;
QJsonObject results ; QJsonObject results ;
@ -854,8 +854,8 @@ void TorrentsController::addPeersAction()
results [ torrent - > id ( ) . toString ( ) ] = QJsonObject results [ torrent - > id ( ) . toString ( ) ] = QJsonObject
{ {
{ " added " , peersAdded } , { u " added " _qs , peersAdded } ,
{ " failed " , ( peers . size ( ) - peersAdded ) } { u " failed " _qs , ( peers . size ( ) - peersAdded ) }
} ; } ;
} ) ; } ) ;
@ -864,27 +864,27 @@ void TorrentsController::addPeersAction()
void TorrentsController : : pauseAction ( ) void TorrentsController : : pauseAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList hashes = params ( ) [ " hashes " ] . split ( ' | ' ) ; const QStringList hashes = params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) ;
applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > pause ( ) ; } ) ; applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > pause ( ) ; } ) ;
} }
void TorrentsController : : resumeAction ( ) void TorrentsController : : resumeAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList idStrings = params ( ) [ " hashes " ] . split ( ' | ' ) ; const QStringList idStrings = params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) ;
applyToTorrents ( idStrings , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > resume ( ) ; } ) ; applyToTorrents ( idStrings , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > resume ( ) ; } ) ;
} }
void TorrentsController : : filePrioAction ( ) void TorrentsController : : filePrioAction ( )
{ {
requireParams ( { " hash " , " id " , " priority " } ) ; requireParams ( { u " hash " _qs , u " id " _qs , u " priority " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
bool ok = false ; bool ok = false ;
const auto priority = static_cast < BitTorrent : : DownloadPriority > ( params ( ) [ " priority " ] . toInt ( & ok ) ) ; const auto priority = static_cast < BitTorrent : : DownloadPriority > ( params ( ) [ u " priority " _qs ] . toInt ( & ok ) ) ;
if ( ! ok ) if ( ! ok )
throw APIError ( APIErrorType : : BadParams , tr ( " Priority must be an integer " ) ) ; throw APIError ( APIErrorType : : BadParams , tr ( " Priority must be an integer " ) ) ;
@ -900,7 +900,7 @@ void TorrentsController::filePrioAction()
const int filesCount = torrent - > filesCount ( ) ; const int filesCount = torrent - > filesCount ( ) ;
QVector < BitTorrent : : DownloadPriority > priorities = torrent - > filePriorities ( ) ; QVector < BitTorrent : : DownloadPriority > priorities = torrent - > filePriorities ( ) ;
bool priorityChanged = false ; bool priorityChanged = false ;
for ( const QString & fileID : params ( ) [ " id " ] . split ( ' | ' ) ) for ( const QString & fileID : params ( ) [ u " id " _qs ] . split ( u ' | ' ) )
{ {
const int id = fileID . toInt ( & ok ) ; const int id = fileID . toInt ( & ok ) ;
if ( ! ok ) if ( ! ok )
@ -921,9 +921,9 @@ void TorrentsController::filePrioAction()
void TorrentsController : : uploadLimitAction ( ) void TorrentsController : : uploadLimitAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList idList { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList idList { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
QJsonObject map ; QJsonObject map ;
for ( const QString & id : idList ) for ( const QString & id : idList )
{ {
@ -939,9 +939,9 @@ void TorrentsController::uploadLimitAction()
void TorrentsController : : downloadLimitAction ( ) void TorrentsController : : downloadLimitAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList idList { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList idList { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
QJsonObject map ; QJsonObject map ;
for ( const QString & id : idList ) for ( const QString & id : idList )
{ {
@ -957,35 +957,35 @@ void TorrentsController::downloadLimitAction()
void TorrentsController : : setUploadLimitAction ( ) void TorrentsController : : setUploadLimitAction ( )
{ {
requireParams ( { " hashes " , " limit " } ) ; requireParams ( { u " hashes " _qs , u " limit " _qs } ) ;
qlonglong limit = params ( ) [ " limit " ] . toLongLong ( ) ; qlonglong limit = params ( ) [ u " limit " _qs ] . toLongLong ( ) ;
if ( limit = = 0 ) if ( limit = = 0 )
limit = - 1 ; limit = - 1 ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ limit ] ( BitTorrent : : Torrent * const torrent ) { torrent - > setUploadLimit ( limit ) ; } ) ; applyToTorrents ( hashes , [ limit ] ( BitTorrent : : Torrent * const torrent ) { torrent - > setUploadLimit ( limit ) ; } ) ;
} }
void TorrentsController : : setDownloadLimitAction ( ) void TorrentsController : : setDownloadLimitAction ( )
{ {
requireParams ( { " hashes " , " limit " } ) ; requireParams ( { u " hashes " _qs , u " limit " _qs } ) ;
qlonglong limit = params ( ) [ " limit " ] . toLongLong ( ) ; qlonglong limit = params ( ) [ u " limit " _qs ] . toLongLong ( ) ;
if ( limit = = 0 ) if ( limit = = 0 )
limit = - 1 ; limit = - 1 ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ limit ] ( BitTorrent : : Torrent * const torrent ) { torrent - > setDownloadLimit ( limit ) ; } ) ; applyToTorrents ( hashes , [ limit ] ( BitTorrent : : Torrent * const torrent ) { torrent - > setDownloadLimit ( limit ) ; } ) ;
} }
void TorrentsController : : setShareLimitsAction ( ) void TorrentsController : : setShareLimitsAction ( )
{ {
requireParams ( { " hashes " , " ratioLimit " , " seedingTimeLimit " } ) ; requireParams ( { u " hashes " _qs , u " ratioLimit " _qs , u " seedingTimeLimit " _qs } ) ;
const qreal ratioLimit = params ( ) [ " ratioLimit " ] . toDouble ( ) ; const qreal ratioLimit = params ( ) [ u " ratioLimit " _qs ] . toDouble ( ) ;
const qlonglong seedingTimeLimit = params ( ) [ " seedingTimeLimit " ] . toLongLong ( ) ; const qlonglong seedingTimeLimit = params ( ) [ u " seedingTimeLimit " _qs ] . toLongLong ( ) ;
const QStringList hashes = params ( ) [ " hashes " ] . split ( ' | ' ) ; const QStringList hashes = params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) ;
applyToTorrents ( hashes , [ ratioLimit , seedingTimeLimit ] ( BitTorrent : : Torrent * const torrent ) applyToTorrents ( hashes , [ ratioLimit , seedingTimeLimit ] ( BitTorrent : : Torrent * const torrent )
{ {
@ -996,35 +996,35 @@ void TorrentsController::setShareLimitsAction()
void TorrentsController : : toggleSequentialDownloadAction ( ) void TorrentsController : : toggleSequentialDownloadAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > toggleSequentialDownload ( ) ; } ) ; applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > toggleSequentialDownload ( ) ; } ) ;
} }
void TorrentsController : : toggleFirstLastPiecePrioAction ( ) void TorrentsController : : toggleFirstLastPiecePrioAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > toggleFirstLastPiecePriority ( ) ; } ) ; applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > toggleFirstLastPiecePriority ( ) ; } ) ;
} }
void TorrentsController : : setSuperSeedingAction ( ) void TorrentsController : : setSuperSeedingAction ( )
{ {
requireParams ( { " hashes " , " value " } ) ; requireParams ( { u " hashes " _qs , u " value " _qs } ) ;
const bool value { parseBool ( params ( ) [ " value " ] ) . value_or ( false ) } ; const bool value { parseBool ( params ( ) [ u " value " _qs ] ) . value_or ( false ) } ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ value ] ( BitTorrent : : Torrent * const torrent ) { torrent - > setSuperSeeding ( value ) ; } ) ; applyToTorrents ( hashes , [ value ] ( BitTorrent : : Torrent * const torrent ) { torrent - > setSuperSeeding ( value ) ; } ) ;
} }
void TorrentsController : : setForceStartAction ( ) void TorrentsController : : setForceStartAction ( )
{ {
requireParams ( { " hashes " , " value " } ) ; requireParams ( { u " hashes " _qs , u " value " _qs } ) ;
const bool value { parseBool ( params ( ) [ " value " ] ) . value_or ( false ) } ; const bool value { parseBool ( params ( ) [ u " value " _qs ] ) . value_or ( false ) } ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ value ] ( BitTorrent : : Torrent * const torrent ) applyToTorrents ( hashes , [ value ] ( BitTorrent : : Torrent * const torrent )
{ {
torrent - > resume ( value ? BitTorrent : : TorrentOperatingMode : : Forced : BitTorrent : : TorrentOperatingMode : : AutoManaged ) ; torrent - > resume ( value ? BitTorrent : : TorrentOperatingMode : : Forced : BitTorrent : : TorrentOperatingMode : : AutoManaged ) ;
@ -1033,10 +1033,10 @@ void TorrentsController::setForceStartAction()
void TorrentsController : : deleteAction ( ) void TorrentsController : : deleteAction ( )
{ {
requireParams ( { " hashes " , " deleteFiles " } ) ; requireParams ( { u " hashes " _qs , u " deleteFiles " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
const DeleteOption deleteOption = parseBool ( params ( ) [ " deleteFiles " ] ) . value_or ( false ) const DeleteOption deleteOption = parseBool ( params ( ) [ u " deleteFiles " _qs ] ) . value_or ( false )
? DeleteTorrentAndFiles : DeleteTorrent ; ? DeleteTorrentAndFiles : DeleteTorrent ;
applyToTorrents ( hashes , [ deleteOption ] ( const BitTorrent : : Torrent * torrent ) applyToTorrents ( hashes , [ deleteOption ] ( const BitTorrent : : Torrent * torrent )
{ {
@ -1046,54 +1046,54 @@ void TorrentsController::deleteAction()
void TorrentsController : : increasePrioAction ( ) void TorrentsController : : increasePrioAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) ) if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) )
throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ; throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
BitTorrent : : Session : : instance ( ) - > increaseTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ; BitTorrent : : Session : : instance ( ) - > increaseTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ;
} }
void TorrentsController : : decreasePrioAction ( ) void TorrentsController : : decreasePrioAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) ) if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) )
throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ; throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
BitTorrent : : Session : : instance ( ) - > decreaseTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ; BitTorrent : : Session : : instance ( ) - > decreaseTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ;
} }
void TorrentsController : : topPrioAction ( ) void TorrentsController : : topPrioAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) ) if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) )
throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ; throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
BitTorrent : : Session : : instance ( ) - > topTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ; BitTorrent : : Session : : instance ( ) - > topTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ;
} }
void TorrentsController : : bottomPrioAction ( ) void TorrentsController : : bottomPrioAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) ) if ( ! BitTorrent : : Session : : instance ( ) - > isQueueingSystemEnabled ( ) )
throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ; throw APIError ( APIErrorType : : Conflict , tr ( " Torrent queueing must be enabled " ) ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
BitTorrent : : Session : : instance ( ) - > bottomTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ; BitTorrent : : Session : : instance ( ) - > bottomTorrentsQueuePos ( toTorrentIDs ( hashes ) ) ;
} }
void TorrentsController : : setLocationAction ( ) void TorrentsController : : setLocationAction ( )
{ {
requireParams ( { " hashes " , " location " } ) ; requireParams ( { u " hashes " _qs , u " location " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
const Path newLocation { params ( ) [ " location " ] . trimmed ( ) } ; const Path newLocation { params ( ) [ u " location " _qs ] . trimmed ( ) } ;
if ( newLocation . isEmpty ( ) ) if ( newLocation . isEmpty ( ) )
throw APIError ( APIErrorType : : BadParams , tr ( " Save path cannot be empty " ) ) ; throw APIError ( APIErrorType : : BadParams , tr ( " Save path cannot be empty " ) ) ;
@ -1117,10 +1117,10 @@ void TorrentsController::setLocationAction()
void TorrentsController : : setSavePathAction ( ) void TorrentsController : : setSavePathAction ( )
{ {
requireParams ( { " id " , " path " } ) ; requireParams ( { u " id " _qs , u " path " _qs } ) ;
const QStringList ids { params ( ) [ " id " ] . split ( ' | ' ) } ; const QStringList ids { params ( ) [ u " id " _qs ] . split ( u ' | ' ) } ;
const Path newPath { params ( ) [ " path " ] } ; const Path newPath { params ( ) [ u " path " _qs ] } ;
if ( newPath . isEmpty ( ) ) if ( newPath . isEmpty ( ) )
throw APIError ( APIErrorType : : BadParams , tr ( " Save path cannot be empty " ) ) ; throw APIError ( APIErrorType : : BadParams , tr ( " Save path cannot be empty " ) ) ;
@ -1142,10 +1142,10 @@ void TorrentsController::setSavePathAction()
void TorrentsController : : setDownloadPathAction ( ) void TorrentsController : : setDownloadPathAction ( )
{ {
requireParams ( { " id " , " path " } ) ; requireParams ( { u " id " _qs , u " path " _qs } ) ;
const QStringList ids { params ( ) [ " id " ] . split ( ' | ' ) } ; const QStringList ids { params ( ) [ u " id " _qs ] . split ( u ' | ' ) } ;
const Path newPath { params ( ) [ " path " ] } ; const Path newPath { params ( ) [ u " path " _qs ] } ;
if ( ! newPath . isEmpty ( ) ) if ( ! newPath . isEmpty ( ) )
{ {
@ -1167,10 +1167,10 @@ void TorrentsController::setDownloadPathAction()
void TorrentsController : : renameAction ( ) void TorrentsController : : renameAction ( )
{ {
requireParams ( { " hash " , " name " } ) ; requireParams ( { u " hash " _qs , u " name " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
QString name = params ( ) [ " name " ] . trimmed ( ) ; QString name = params ( ) [ u " name " _qs ] . trimmed ( ) ;
if ( name . isEmpty ( ) ) if ( name . isEmpty ( ) )
throw APIError ( APIErrorType : : Conflict , tr ( " Incorrect torrent name " ) ) ; throw APIError ( APIErrorType : : Conflict , tr ( " Incorrect torrent name " ) ) ;
@ -1179,16 +1179,16 @@ void TorrentsController::renameAction()
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
name . replace ( QRegularExpression ( " \r ? \n | \r " ) , " " ) ; name . replace ( QRegularExpression ( u " \r ? \n | \r " _qs ) , u " " _qs ) ;
torrent - > setName ( name ) ; torrent - > setName ( name ) ;
} }
void TorrentsController : : setAutoManagementAction ( ) void TorrentsController : : setAutoManagementAction ( )
{ {
requireParams ( { " hashes " , " enable " } ) ; requireParams ( { u " hashes " _qs , u " enable " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
const bool isEnabled { parseBool ( params ( ) [ " enable " ] ) . value_or ( false ) } ; const bool isEnabled { parseBool ( params ( ) [ u " enable " _qs ] ) . value_or ( false ) } ;
applyToTorrents ( hashes , [ isEnabled ] ( BitTorrent : : Torrent * const torrent ) applyToTorrents ( hashes , [ isEnabled ] ( BitTorrent : : Torrent * const torrent )
{ {
@ -1198,26 +1198,26 @@ void TorrentsController::setAutoManagementAction()
void TorrentsController : : recheckAction ( ) void TorrentsController : : recheckAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > forceRecheck ( ) ; } ) ; applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > forceRecheck ( ) ; } ) ;
} }
void TorrentsController : : reannounceAction ( ) void TorrentsController : : reannounceAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > forceReannounce ( ) ; } ) ; applyToTorrents ( hashes , [ ] ( BitTorrent : : Torrent * const torrent ) { torrent - > forceReannounce ( ) ; } ) ;
} }
void TorrentsController : : setCategoryAction ( ) void TorrentsController : : setCategoryAction ( )
{ {
requireParams ( { " hashes " , " category " } ) ; requireParams ( { u " hashes " _qs , u " category " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
const QString category { params ( ) [ " category " ] } ; const QString category { params ( ) [ u " category " _qs ] } ;
applyToTorrents ( hashes , [ category ] ( BitTorrent : : Torrent * const torrent ) applyToTorrents ( hashes , [ category ] ( BitTorrent : : Torrent * const torrent )
{ {
@ -1228,22 +1228,22 @@ void TorrentsController::setCategoryAction()
void TorrentsController : : createCategoryAction ( ) void TorrentsController : : createCategoryAction ( )
{ {
requireParams ( { " category " } ) ; requireParams ( { u " category " _qs } ) ;
const QString category = params ( ) [ " category " ] ; const QString category = params ( ) [ u " category " _qs ] ;
if ( category . isEmpty ( ) ) if ( category . isEmpty ( ) )
throw APIError ( APIErrorType : : BadParams , tr ( " Category cannot be empty " ) ) ; throw APIError ( APIErrorType : : BadParams , tr ( " Category cannot be empty " ) ) ;
if ( ! BitTorrent : : Session : : isValidCategoryName ( category ) ) if ( ! BitTorrent : : Session : : isValidCategoryName ( category ) )
throw APIError ( APIErrorType : : Conflict , tr ( " Incorrect category name " ) ) ; throw APIError ( APIErrorType : : Conflict , tr ( " Incorrect category name " ) ) ;
const Path savePath { params ( ) [ " savePath " ] } ; const Path savePath { params ( ) [ u " savePath " _qs ] } ;
const auto useDownloadPath = parseBool ( params ( ) [ " downloadPathEnabled " ] ) ; const auto useDownloadPath = parseBool ( params ( ) [ u " downloadPathEnabled " _qs ] ) ;
BitTorrent : : CategoryOptions categoryOptions ; BitTorrent : : CategoryOptions categoryOptions ;
categoryOptions . savePath = savePath ; categoryOptions . savePath = savePath ;
if ( useDownloadPath . has_value ( ) ) if ( useDownloadPath . has_value ( ) )
{ {
const Path downloadPath { params ( ) [ " downloadPath " ] } ; const Path downloadPath { params ( ) [ u " downloadPath " _qs ] } ;
categoryOptions . downloadPath = { useDownloadPath . value ( ) , downloadPath } ; categoryOptions . downloadPath = { useDownloadPath . value ( ) , downloadPath } ;
} }
@ -1253,19 +1253,19 @@ void TorrentsController::createCategoryAction()
void TorrentsController : : editCategoryAction ( ) void TorrentsController : : editCategoryAction ( )
{ {
requireParams ( { " category " , " savePath " } ) ; requireParams ( { u " category " _qs , u " savePath " _qs } ) ;
const QString category = params ( ) [ " category " ] ; const QString category = params ( ) [ u " category " _qs ] ;
if ( category . isEmpty ( ) ) if ( category . isEmpty ( ) )
throw APIError ( APIErrorType : : BadParams , tr ( " Category cannot be empty " ) ) ; throw APIError ( APIErrorType : : BadParams , tr ( " Category cannot be empty " ) ) ;
const Path savePath { params ( ) [ " savePath " ] } ; const Path savePath { params ( ) [ u " savePath " _qs ] } ;
const auto useDownloadPath = parseBool ( params ( ) [ " downloadPathEnabled " ] ) ; const auto useDownloadPath = parseBool ( params ( ) [ u " downloadPathEnabled " _qs ] ) ;
BitTorrent : : CategoryOptions categoryOptions ; BitTorrent : : CategoryOptions categoryOptions ;
categoryOptions . savePath = savePath ; categoryOptions . savePath = savePath ;
if ( useDownloadPath . has_value ( ) ) if ( useDownloadPath . has_value ( ) )
{ {
const Path downloadPath { params ( ) [ " downloadPath " ] } ; const Path downloadPath { params ( ) [ u " downloadPath " _qs ] } ;
categoryOptions . downloadPath = { useDownloadPath . value ( ) , downloadPath } ; categoryOptions . downloadPath = { useDownloadPath . value ( ) , downloadPath } ;
} }
@ -1275,9 +1275,9 @@ void TorrentsController::editCategoryAction()
void TorrentsController : : removeCategoriesAction ( ) void TorrentsController : : removeCategoriesAction ( )
{ {
requireParams ( { " categories " } ) ; requireParams ( { u " categories " _qs } ) ;
const QStringList categories { params ( ) [ " categories " ] . split ( ' \n ' ) } ; const QStringList categories { params ( ) [ u " categories " _qs ] . split ( u ' \n ' ) } ;
for ( const QString & category : categories ) for ( const QString & category : categories )
BitTorrent : : Session : : instance ( ) - > removeCategory ( category ) ; BitTorrent : : Session : : instance ( ) - > removeCategory ( category ) ;
} }
@ -1303,10 +1303,10 @@ void TorrentsController::categoriesAction()
void TorrentsController : : addTagsAction ( ) void TorrentsController : : addTagsAction ( )
{ {
requireParams ( { " hashes " , " tags " } ) ; requireParams ( { u " hashes " _qs , u " tags " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
const QStringList tags { params ( ) [ " tags " ] . split ( ' , ' , Qt : : SkipEmptyParts ) } ; const QStringList tags { params ( ) [ u " tags " _qs ] . split ( u ' , ' , Qt : : SkipEmptyParts ) } ;
for ( const QString & tag : tags ) for ( const QString & tag : tags )
{ {
@ -1320,10 +1320,10 @@ void TorrentsController::addTagsAction()
void TorrentsController : : removeTagsAction ( ) void TorrentsController : : removeTagsAction ( )
{ {
requireParams ( { " hashes " } ) ; requireParams ( { u " hashes " _qs } ) ;
const QStringList hashes { params ( ) [ " hashes " ] . split ( ' | ' ) } ; const QStringList hashes { params ( ) [ u " hashes " _qs ] . split ( u ' | ' ) } ;
const QStringList tags { params ( ) [ " tags " ] . split ( ' , ' , Qt : : SkipEmptyParts ) } ; const QStringList tags { params ( ) [ u " tags " _qs ] . split ( u ' , ' , Qt : : SkipEmptyParts ) } ;
for ( const QString & tag : tags ) for ( const QString & tag : tags )
{ {
@ -1345,9 +1345,9 @@ void TorrentsController::removeTagsAction()
void TorrentsController : : createTagsAction ( ) void TorrentsController : : createTagsAction ( )
{ {
requireParams ( { " tags " } ) ; requireParams ( { u " tags " _qs } ) ;
const QStringList tags { params ( ) [ " tags " ] . split ( ' , ' , Qt : : SkipEmptyParts ) } ; const QStringList tags { params ( ) [ u " tags " _qs ] . split ( u ' , ' , Qt : : SkipEmptyParts ) } ;
for ( const QString & tag : tags ) for ( const QString & tag : tags )
BitTorrent : : Session : : instance ( ) - > addTag ( tag . trimmed ( ) ) ; BitTorrent : : Session : : instance ( ) - > addTag ( tag . trimmed ( ) ) ;
@ -1355,9 +1355,9 @@ void TorrentsController::createTagsAction()
void TorrentsController : : deleteTagsAction ( ) void TorrentsController : : deleteTagsAction ( )
{ {
requireParams ( { " tags " } ) ; requireParams ( { u " tags " _qs } ) ;
const QStringList tags { params ( ) [ " tags " ] . split ( ' , ' , Qt : : SkipEmptyParts ) } ; const QStringList tags { params ( ) [ u " tags " _qs ] . split ( u ' , ' , Qt : : SkipEmptyParts ) } ;
for ( const QString & tag : tags ) for ( const QString & tag : tags )
BitTorrent : : Session : : instance ( ) - > removeTag ( tag . trimmed ( ) ) ; BitTorrent : : Session : : instance ( ) - > removeTag ( tag . trimmed ( ) ) ;
} }
@ -1372,15 +1372,15 @@ void TorrentsController::tagsAction()
void TorrentsController : : renameFileAction ( ) void TorrentsController : : renameFileAction ( )
{ {
requireParams ( { " hash " , " oldPath " , " newPath " } ) ; requireParams ( { u " hash " _qs , u " oldPath " _qs , u " newPath " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
const Path oldPath { params ( ) [ " oldPath " ] } ; const Path oldPath { params ( ) [ u " oldPath " _qs ] } ;
const Path newPath { params ( ) [ " newPath " ] } ; const Path newPath { params ( ) [ u " newPath " _qs ] } ;
try try
{ {
@ -1394,15 +1394,15 @@ void TorrentsController::renameFileAction()
void TorrentsController : : renameFolderAction ( ) void TorrentsController : : renameFolderAction ( )
{ {
requireParams ( { " hash " , " oldPath " , " newPath " } ) ; requireParams ( { u " hash " _qs , u " oldPath " _qs , u " newPath " _qs } ) ;
const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ " hash " ] ) ; const auto id = BitTorrent : : TorrentID : : fromString ( params ( ) [ u " hash " _qs ] ) ;
BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ; BitTorrent : : Torrent * const torrent = BitTorrent : : Session : : instance ( ) - > findTorrent ( id ) ;
if ( ! torrent ) if ( ! torrent )
throw APIError ( APIErrorType : : NotFound ) ; throw APIError ( APIErrorType : : NotFound ) ;
const Path oldPath { params ( ) [ " oldPath " ] } ; const Path oldPath { params ( ) [ u " oldPath " _qs ] } ;
const Path newPath { params ( ) [ " newPath " ] } ; const Path newPath { params ( ) [ u " newPath " _qs ] } ;
try try
{ {
Chocobo1
3 years ago