d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-01-12 15:57:57 +00:00
Code Issues Projects Releases Wiki Activity

WebUI: Improve btjson.* indentation.

Browse Source
This commit is contained in:
Vladimir Golovnev (Glassez) 2014-11-20 17:46:14 +03:00
parent 96ec6777e6
commit c24610ec80
2 changed files with 187 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/webui/btjson.cpp
View File

@ -160,9 +160,11 @@ static QVariantMap toMap(const QTorrentHandle& h)
state = "error"; state = "error";
else else
state = h.is_seed(status) ? "pausedUP" : "pausedDL"; state = h.is_seed(status) ? "pausedUP" : "pausedDL";
} else { }
if (QBtSession::instance()->isQueueingEnabled() && h.is_queued(status)) else {
if (QBtSession::instance()->isQueueingEnabled() && h.is_queued(status)) {
state = h.is_seed(status) ? "queuedUP" : "queuedDL"; state = h.is_seed(status) ? "queuedUP" : "queuedDL";
}
else { else {
switch (status.state) { switch (status.state) {
case torrent_status::finished: case torrent_status::finished:
@ -213,13 +215,16 @@ static QVariantMap toMap(const QTorrentHandle& h)
*/ */
QByteArray btjson::getTorrents() QByteArray btjson::getTorrents()
{ {
CACHED_VARIABLE(QVariantList, torrent_list, CACHE_DURATION_MS); QVariantList torrent_list;
std::vector<torrent_handle> torrents = QBtSession::instance()->getTorrents(); std::vector<torrent_handle> torrents = QBtSession::instance()->getTorrents();
std::vector<torrent_handle>::const_iterator it = torrents.begin(); std::vector<torrent_handle>::const_iterator it = torrents.begin();
std::vector<torrent_handle>::const_iterator end = torrents.end(); std::vector<torrent_handle>::const_iterator end = torrents.end();
for( ; it != end; ++it) { for( ; it != end; ++it) {
torrent_list.append(toMap(QTorrentHandle(*it))); torrent_list.append(toMap(QTorrentHandle(*it)));
} }
return json::toJson(torrent_list); return json::toJson(torrent_list);
} }
@ -262,7 +267,8 @@ QByteArray btjson::getTrackersForTorrent(const QString& hash)
tracker_list.append(tracker_dict); tracker_list.append(tracker_dict);
} }
} catch(const std::exception& e) { }
catch(const std::exception& e) {
qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what()); qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what());
return QByteArray(); return QByteArray();
} }
@ -323,7 +329,8 @@ QByteArray btjson::getPropertiesForTorrent(const QString& hash)
data[KEY_PROP_CONNECT_COUNT_LIMIT] = status.connections_limit; data[KEY_PROP_CONNECT_COUNT_LIMIT] = status.connections_limit;
const qreal ratio = QBtSession::instance()->getRealRatio(status); const qreal ratio = QBtSession::instance()->getRealRatio(status);
data[KEY_PROP_RATIO] = ratio > 100. ? -1 : ratio; data[KEY_PROP_RATIO] = ratio > 100. ? -1 : ratio;
} catch(const std::exception& e) { }
catch(const std::exception& e) {
qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what()); qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what());
return QByteArray(); return QByteArray();
} }
@ -368,7 +375,8 @@ QByteArray btjson::getFilesForTorrent(const QString& hash)
file_list.append(file_dict); file_list.append(file_dict);
} }
} catch (const std::exception& e) { }
catch (const std::exception& e) {
qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what()); qWarning() << Q_FUNC_INFO << "Invalid torrent: " << misc::toQStringU(e.what());
return QByteArray(); return QByteArray();
} }

3
src/webui/btjson.h
View File

@ -34,7 +34,8 @@
#include <QCoreApplication> #include <QCoreApplication>
#include <QString> #include <QString>
class btjson { class btjson
{
Q_DECLARE_TR_FUNCTIONS(misc) Q_DECLARE_TR_FUNCTIONS(misc)
private: private: