Skip to content

Commit

Permalink
refactor: Optimize global network module[263931]
Browse files Browse the repository at this point in the history
  • Loading branch information
@Greedysky
Greedysky committed Jan 15, 2025
1 parent 926cc73 commit 565b01f
Show file tree
Hide file tree
Showing 3 changed files with 81 additions and 81 deletions.
2 changes: 1 addition & 1 deletion TTKModule/TTKCore/musicNetworkKits/radio/mv/musicabstractmvradiorequest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

#include "musicabstractqueryrequest.h"

static constexpr const char *MV_CATEGORY_URL = "a2JPOG81ckd3T1NtN004dnRBZ2JubTZYeFYxSFBXWCtDdkZmVVZKY1NVNGxDUGhaMjY0dXh2bk1XWWpXRlpQUmE3ZG5VZVErNURVPQ==";
static constexpr const char *MV_CATEGORY_URL = "US93a3pGUVMzNmdBUDRtUGUyMk42WFZzS2oyczJpTzFTWWNzVmxJbGt0VmhSQk5qdzFZTGZDWHJ4U1JnY1pQMkdycm1rdz09";


/*! @brief The class of the music mv radio request abstract.
Expand Down
54 changes: 27 additions & 27 deletions TTKModule/TTKCore/musicNetworkKits/radio/mv/musicmvradiocategoryrequest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,44 +13,44 @@ void MusicMVRadioCategoryRequest::downLoadFinished()
MusicAbstractMVRadioRequest::downLoadFinished();
if(m_reply && m_reply->error() == QNetworkReply::NoError)
{
QByteArray bytes = m_reply->readAll();
bytes = QString(bytes).split("var mvfmdata = ").back().split("$img = ").front().toUtf8();
bytes.chop(3);

QJson::Parser json;
bool ok = false;
const QVariant &data = json.parse(bytes, &ok);
const QVariant &data = json.parse(m_reply->readAll(), &ok);
if(ok)
{
const QVariantList &datas = data.toList();
for(const QVariant &var : qAsConst(datas))
QVariantMap value = data.toMap();
if(value.contains("data"))
{
if(var.isNull())
const QVariantList &datas = value["data"].toList();
for(const QVariant &var : qAsConst(datas))
{
continue;
}
if(var.isNull())
{
continue;
}

QVariantMap value = var.toMap();
TTK_NETWORK_QUERY_CHECK();
QVariantMap value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

if(value["classId"].toString() == m_queryValue)
{
const QVariantList &fms = value["fm_list"].toList();
for(const QVariant &var : qAsConst(fms))
if(value["classId"].toString() == m_queryValue)
{
if(var.isNull())
const QVariantList &fms = value["fm_list"].toList();
for(const QVariant &var : qAsConst(fms))
{
continue;
if(var.isNull())
{
continue;
}

value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

MusicResultDataItem item;
item.m_name = value["fmName"].toString();
item.m_id = value["fmId"].toString();
item.m_coverUrl = value["imgUrlMv"].toString();
Q_EMIT createMVRadioItem(item);
}

value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

MusicResultDataItem item;
item.m_name = value["fmName"].toString();
item.m_id = value["fmId"].toString();
item.m_coverUrl = value["imgUrlMv"].toString();
Q_EMIT createMVRadioItem(item);
}
}
}
Expand Down
106 changes: 53 additions & 53 deletions TTKModule/TTKCore/musicNetworkKits/radio/mv/musicmvradioprogramrequest.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -112,85 +112,85 @@ void MusicMVRadioProgramRequest::downLoadFinished()
MusicAbstractMVRadioRequest::downLoadFinished();
if(m_reply && m_reply->error() == QNetworkReply::NoError)
{
QByteArray bytes = m_reply->readAll();
bytes = QString(bytes).split("var mvfmdata = ").back().split("$img = ").front().toUtf8();
bytes.chop(3);

QJson::Parser json;
bool ok = false;
const QVariant &data = json.parse(bytes, &ok);
const QVariant &data = json.parse(m_reply->readAll(), &ok);
if(ok)
{
bool contains = false;
for(const QVariant &var : data.toList())
QVariantMap value = data.toMap();
if(value.contains("data"))
{
if(var.isNull())
{
continue;
}

QVariantMap value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

MusicResultDataItem item;
item.m_nickName = value["className"].toString();

for(const QVariant &var : value["fm_list"].toList())
bool contains = false;
for(const QVariant &var : value["data"].toList())
{
if(var.isNull())
{
continue;
}

value = var.toMap();
QVariantMap value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

if(!contains && value["fmId"].toString() == m_queryValue)
MusicResultDataItem item;
item.m_nickName = value["className"].toString();

for(const QVariant &var : value["fm_list"].toList())
{
contains = true;
item.m_name = value["fmName"].toString();
item.m_id = value["fmId"].toString();
item.m_coverUrl = value["imgUrlMv"].toString();
Q_EMIT createMVRadioItem(item);
if(var.isNull())
{
continue;
}

for(const QVariant &var : value["mvs"].toList())
value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

if(!contains && value["fmId"].toString() == m_queryValue)
{
if(var.isNull())
contains = true;
item.m_name = value["fmName"].toString();
item.m_id = value["fmId"].toString();
item.m_coverUrl = value["imgUrlMv"].toString();
Q_EMIT createMVRadioItem(item);

for(const QVariant &var : value["mvs"].toList())
{
continue;
}
if(var.isNull())
{
continue;
}

value = var.toMap();
TTK_NETWORK_QUERY_CHECK();
value = var.toMap();
TTK_NETWORK_QUERY_CHECK();

TTK::MusicSongInformation info;
info.m_songId = value["mvhash"].toString();
info.m_songName = TTK::String::charactersReplace(value["name"].toString());
TTK::MusicSongInformation info;
info.m_songId = value["mvhash"].toString();
info.m_songName = TTK::String::charactersReplace(value["name"].toString());

info.m_artistName = info.m_songName;
if(info.m_artistName.contains(TTK_DEFAULT_STR))
{
const QStringList &ds = info.m_artistName.split(TTK_DEFAULT_STR);
if(ds.count() >= 2)
info.m_artistName = info.m_songName;
if(info.m_artistName.contains(TTK_DEFAULT_STR))
{
info.m_artistName = ds.front().trimmed();
info.m_songName = ds.back().trimmed();
const QStringList &ds = info.m_artistName.split(TTK_DEFAULT_STR);
if(ds.count() >= 2)
{
info.m_artistName = ds.front().trimmed();
info.m_songName = ds.back().trimmed();
}
}
}

info.m_duration = TTKTime::formatDuration(value["time"].toInt());
info.m_duration = TTKTime::formatDuration(value["time"].toInt());

TTK_NETWORK_QUERY_CHECK();
ReqKGInterface::parseFromMovieProperty(&info);
TTK_NETWORK_QUERY_CHECK();
TTK_NETWORK_QUERY_CHECK();
ReqKGInterface::parseFromMovieProperty(&info);
TTK_NETWORK_QUERY_CHECK();

if(info.m_songProps.isEmpty())
{
continue;
}
if(info.m_songProps.isEmpty())
{
continue;
}

Q_EMIT createResultItem({info});
m_items << info;
Q_EMIT createResultItem({info});
m_items << info;
}
}
}
}
Expand Down

0 comments on commit 565b01f

Please sign in to comment.