smallsolar
/
libkiwix
mirror of https://github.com/kiwix/libkiwix.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

NameMapperProxy respects the withAlias flag

This commit is contained in:
Veloman Yunkan 2021-11-21 19:58:20 +04:00
parent 8fffa59974
commit 6199c11505
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/name_mapper.h
View File

@ -59,7 +59,7 @@ class HumanReadableNameMapper : public NameMapper {
class NameMapperProxy : public NameMapper { class NameMapperProxy : public NameMapper {
typedef std::shared_ptr<NameMapper> NameMapperHandle; typedef std::shared_ptr<NameMapper> NameMapperHandle;
public: public:
explicit NameMapperProxy(Library& library); NameMapperProxy(Library& library, bool withAlias);
virtual std::string getNameForId(const std::string& id) const; virtual std::string getNameForId(const std::string& id) const;
virtual std::string getIdForName(const std::string& name) const; virtual std::string getIdForName(const std::string& name) const;
@ -73,6 +73,7 @@ class NameMapperProxy : public NameMapper {
mutable std::mutex mutex; mutable std::mutex mutex;
Library& library; Library& library;
NameMapperHandle nameMapper; NameMapperHandle nameMapper;
const bool withAlias;
}; };
} }

5
src/name_mapper.cpp
View File

@ -63,15 +63,16 @@ std::string HumanReadableNameMapper::getIdForName(const std::string& name) const
// NameMapperProxy // NameMapperProxy
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
NameMapperProxy::NameMapperProxy(Library& lib) NameMapperProxy::NameMapperProxy(Library& lib, bool withAlias)
: library(lib) : library(lib)
, withAlias(withAlias)
{ {
update(); update();
} }
void NameMapperProxy::update() void NameMapperProxy::update()
{ {
const auto newNameMapper = new HumanReadableNameMapper(library, false); const auto newNameMapper = new HumanReadableNameMapper(library, withAlias);
std::lock_guard<std::mutex> lock(mutex); std::lock_guard<std::mutex> lock(mutex);
nameMapper.reset(newNameMapper); nameMapper.reset(newNameMapper);
} }