Skip to content

update framework (languages only) #28

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
luapmartin wants to merge 1 commit into
base: main
Choose a base branch
from
Open

update framework (languages only) #28

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions framework/languages/ilanguagesconfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#ifndef MUSE_LANGUAGES_ILANGUAGESCONFIGURATION_H
#define MUSE_LANGUAGES_ILANGUAGESCONFIGURATION_H

#include <QStringList>

#include "modularity/imoduleinterface.h"
#include "types/retval.h"
#include "io/path.h"
Expand All @@ -46,6 +48,8 @@ class ILanguagesConfiguration : MODULE_GLOBAL_INTERFACE
virtual io::path_t builtinLanguagesJsonPath() const = 0;
virtual io::path_t builtinLanguageFilePath(const QString& resourceName, const QString& languageCode) const = 0;
virtual io::path_t userLanguageFilePath(const QString& resourceName, const QString& languageCode) const = 0;

virtual QStringList languageResourceNames() const = 0;
};
}

Expand Down
11 changes: 11 additions & 0 deletions framework/languages/internal/languagesconfiguration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
*/
#include "languagesconfiguration.h"

#include <QStringList>
#include <QUrl>

#include "global/configreader.h"
Expand Down Expand Up @@ -94,3 +95,13 @@ io::path_t LanguagesConfiguration::userLanguageFilePath(const QString& resourceN
{
return languagesUserAppDataPath() + QString("/%1_%2.qm").arg(resourceName, languageCode);
}

QStringList LanguagesConfiguration::languageResourceNames() const
{
const Val& val = m_config.value("resource_names");
QStringList result;
for (const Val& item : val.toList()) {
result.append(item.toQString());
}
return result;
}
2 changes: 2 additions & 0 deletions framework/languages/internal/languagesconfiguration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@ class LanguagesConfiguration : public ILanguagesConfiguration, public Contextabl
io::path_t builtinLanguageFilePath(const QString& resourceName, const QString& languageCode) const override;
io::path_t userLanguageFilePath(const QString& resourceName, const QString& languageCode) const override;

QStringList languageResourceNames() const override;

private:
Config m_config;
async::Channel<QString> m_currentLanguageCodeChanged;
Expand Down
11 changes: 3 additions & 8 deletions framework/languages/internal/languagesservice.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,11 +46,6 @@ using namespace muse;
using namespace muse::languages;
using namespace muse::network;

static const QStringList LANGUAGE_RESOURCE_NAMES = {
"musescore",
"instruments"
};

static const std::string LANGUAGES_RESOURCE_NAME("LANGUAGES");

void LanguagesService::init()
Expand Down Expand Up @@ -114,7 +109,7 @@ const Language& LanguagesService::placeholderLanguage() const

bool LanguagesService::hasPlaceholderLanguage() const
{
for (const QString& resourceName : LANGUAGE_RESOURCE_NAMES) {
for (const QString& resourceName : configuration()->languageResourceNames()) {
if (!fileSystem()->exists(configuration()->builtinLanguageFilePath(resourceName, PLACEHOLDER_LANGUAGE_CODE))) {
return false;
}
Expand Down Expand Up @@ -334,7 +329,7 @@ Ret LanguagesService::doLoadLanguage(Language& lang)
lang.files[resourceName] = useUserPath ? userFilePath : appFilePath;
}

for (const QString& resourceName : LANGUAGE_RESOURCE_NAMES) {
for (const QString& resourceName : configuration()->languageResourceNames()) {
if (!lang.files.contains(resourceName)) {
LOGE() << "Could not find resource " << resourceName << " for language " << lang.code;
return muse::make_ret(muse::Ret::Code::InternalError);
Expand Down Expand Up @@ -446,7 +441,7 @@ QStringList LanguagesService::languagesToUpdate(const QString& mainLanguageCode,
const Language& lang = m_languagesHash[code];
const QJsonObject languageObject = serverLanguagesInfo.value(code).toObject();

for (const QString& resource : LANGUAGE_RESOURCE_NAMES) {
for (const QString& resource : configuration()->languageResourceNames()) {
RetVal<QString> hash = fileHash(lang.files[resource]);
QString latestHash = languageObject.value(resource).toObject().value("hash").toString();

Expand Down
5 changes: 5 additions & 0 deletions framework/stubs/languages/languagesconfigurationstub.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,3 +67,8 @@ io::path_t LanguagesConfigurationStub::userLanguageFilePath(const QString&, cons
{
return io::path_t();
}

QStringList LanguagesConfigurationStub::languageResourceNames() const
{
return {};
}
2 changes: 2 additions & 0 deletions framework/stubs/languages/languagesconfigurationstub.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@ class LanguagesConfigurationStub : public ILanguagesConfiguration
io::path_t builtinLanguagesJsonPath() const override;
io::path_t builtinLanguageFilePath(const QString& resourceName, const QString& languageCode) const override;
io::path_t userLanguageFilePath(const QString& resourceName, const QString& languageCode) const override;

QStringList languageResourceNames() const override;
};
}

Expand Down