github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-23 06:35:24 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Rename variable for clarity

Browse source 
The cache now persists more than just translations.
This commit is contained in:
Thomas Piccirello 2024-10-02 10:48:20 -07:00
commit d93ee05b91
No known key found for this signature in database
2 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/webui/webapplication.cpp
View file

@ -412,7 +412,7 @@ void WebApplication::configure()
{ {
m_isAltUIUsed = isAltUIUsed; m_isAltUIUsed = isAltUIUsed;
m_rootFolder = rootFolder; m_rootFolder = rootFolder;
m_translatedFiles.clear(); m_cachedFiles.clear();
if (!m_isAltUIUsed) if (!m_isAltUIUsed)
LogMsg(tr("Using built-in WebUI.")); LogMsg(tr("Using built-in WebUI."));
else else
@ -423,7 +423,7 @@ void WebApplication::configure()
if (m_currentLocale != newLocale) if (m_currentLocale != newLocale)
{ {
m_currentLocale = newLocale; m_currentLocale = newLocale;
m_translatedFiles.clear(); m_cachedFiles.clear();
m_translationFileLoaded = m_translator.load((m_rootFolder / Path(u"translations/webui_"_s) + newLocale).data()); m_translationFileLoaded = m_translator.load((m_rootFolder / Path(u"translations/webui_"_s) + newLocale).data());
if (m_translationFileLoaded) if (m_translationFileLoaded)
@ -539,8 +539,8 @@ void WebApplication::sendFile(const Path &path)
// find translated file in cache // find translated file in cache
if (!m_isAltUIUsed) if (!m_isAltUIUsed)
{ {
if (const auto it = m_translatedFiles.constFind(path); if (const auto it = m_cachedFiles.constFind(path);
(it != m_translatedFiles.constEnd()) && (lastModified <= it->lastModified)) (it != m_cachedFiles.constEnd()) && (lastModified <= it->lastModified))
{ {
print(it->data, it->mimeType); print(it->data, it->mimeType);
setHeader({Http::HEADER_CACHE_CONTROL, getCachingInterval(it->mimeType)}); setHeader({Http::HEADER_CACHE_CONTROL, getCachingInterval(it->mimeType)});
@ -589,7 +589,7 @@ void WebApplication::sendFile(const Path &path)
dataStr.replace(u"${LANGUAGE_OPTIONS}"_s, createLanguagesOptionsHtml()); dataStr.replace(u"${LANGUAGE_OPTIONS}"_s, createLanguagesOptionsHtml());
data = dataStr.toUtf8(); data = dataStr.toUtf8();
m_translatedFiles[path] = {data, mimeType.name(), lastModified}; // caching translated file m_cachedFiles[path] = {data, mimeType.name(), lastModified}; // caching translated file
} }
print(data, mimeType.name()); print(data, mimeType.name());

4
src/webui/webapplication.h
View file

@ -226,13 +226,13 @@ private:
bool m_isAltUIUsed = false; bool m_isAltUIUsed = false;
Path m_rootFolder; Path m_rootFolder;
struct TranslatedFile struct CachedFile
{ {
QByteArray data; QByteArray data;
QString mimeType; QString mimeType;
QDateTime lastModified; QDateTime lastModified;
}; };
QHash<Path, TranslatedFile> m_translatedFiles; QHash<Path, CachedFile> m_cachedFiles;
QString m_currentLocale; QString m_currentLocale;
QTranslator m_translator; QTranslator m_translator;
bool m_translationFileLoaded = false; bool m_translationFileLoaded = false;