mirror of
https://github.com/Cockatrice/Cockatrice.git
synced 2026-07-06 05:23:56 -07:00
Add batch write function
Took 24 minutes Took 5 seconds Took 26 seconds
This commit is contained in:
parent
21d8e6b9ad
commit
8f9dad8966
9 changed files with 61 additions and 7 deletions
|
|
@ -130,6 +130,11 @@ public:
|
||||||
/** @brief Notifies listeners that enabled sets changed. */
|
/** @brief Notifies listeners that enabled sets changed. */
|
||||||
void notifyEnabledSetsChanged();
|
void notifyEnabledSetsChanged();
|
||||||
|
|
||||||
|
ICardSetPriorityController *getPriorityController()
|
||||||
|
{
|
||||||
|
return setPriorityController;
|
||||||
|
};
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
/**
|
/**
|
||||||
* @brief Adds a card to the database.
|
* @brief Adds a card to the database.
|
||||||
|
|
|
||||||
|
|
@ -181,6 +181,15 @@ public:
|
||||||
*/
|
*/
|
||||||
void loadSetOptions();
|
void loadSetOptions();
|
||||||
|
|
||||||
|
void setSortKeyInMemory(unsigned int _sortKey)
|
||||||
|
{
|
||||||
|
sortKey = _sortKey;
|
||||||
|
}
|
||||||
|
void setEnabledInMemory(bool _enabled)
|
||||||
|
{
|
||||||
|
enabled = _enabled;
|
||||||
|
}
|
||||||
|
|
||||||
/// @return The sort key assigned to this set.
|
/// @return The sort key assigned to this set.
|
||||||
[[nodiscard]] int getSortKey() const
|
[[nodiscard]] int getSortKey() const
|
||||||
{
|
{
|
||||||
|
|
|
||||||
|
|
@ -6,6 +6,12 @@
|
||||||
class ICardSetPriorityController
|
class ICardSetPriorityController
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
struct SetSaveData {
|
||||||
|
QString shortName;
|
||||||
|
unsigned int sortKey;
|
||||||
|
bool enabled;
|
||||||
|
};
|
||||||
|
|
||||||
virtual ~ICardSetPriorityController() = default;
|
virtual ~ICardSetPriorityController() = default;
|
||||||
|
|
||||||
virtual void setSortKey(QString shortName, unsigned int sortKey) = 0;
|
virtual void setSortKey(QString shortName, unsigned int sortKey) = 0;
|
||||||
|
|
@ -15,6 +21,8 @@ public:
|
||||||
virtual unsigned int getSortKey(QString shortName) const = 0;
|
virtual unsigned int getSortKey(QString shortName) const = 0;
|
||||||
virtual bool isEnabled(QString shortName) const = 0;
|
virtual bool isEnabled(QString shortName) const = 0;
|
||||||
virtual bool isKnown(QString shortName) const = 0;
|
virtual bool isKnown(QString shortName) const = 0;
|
||||||
|
|
||||||
|
virtual void saveSets(const QVector<SetSaveData> &data) = 0;
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
|
#endif // COCKATRICE_INTERFACE_CARD_SET_PRIORITY_CONTROLLER_H
|
||||||
|
|
|
||||||
|
|
@ -28,6 +28,9 @@ public:
|
||||||
{
|
{
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void saveSets(const QVector<SetSaveData> & /* data */) override {
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif // COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
|
#endif // COCKATRICE_NOOP_CARD_SET_PRIORITY_CONTROLLER_H
|
||||||
|
|
|
||||||
|
|
@ -228,16 +228,19 @@ void SetsModel::sort(int column, Qt::SortOrder order)
|
||||||
|
|
||||||
void SetsModel::save(CardDatabase *db)
|
void SetsModel::save(CardDatabase *db)
|
||||||
{
|
{
|
||||||
// order
|
QVector<ICardSetPriorityController::SetSaveData> saveData;
|
||||||
for (int i = 0; i < sets.size(); i++)
|
saveData.reserve(sets.size());
|
||||||
sets[i]->setSortKey(static_cast<unsigned int>(i + 1));
|
|
||||||
|
|
||||||
// enabled sets
|
for (int i = 0; i < sets.size(); ++i) {
|
||||||
for (const CardSetPtr &set : sets)
|
const unsigned int sortKey = static_cast<unsigned int>(i + 1);
|
||||||
set->setEnabled(enabledSets.contains(set));
|
const bool enabled = enabledSets.contains(sets[i]);
|
||||||
|
sets[i]->setSortKeyInMemory(sortKey);
|
||||||
|
sets[i]->setEnabledInMemory(enabled);
|
||||||
|
saveData.append({sets[i]->getShortName(), sortKey, enabled});
|
||||||
|
}
|
||||||
|
|
||||||
|
db->getPriorityController()->saveSets(saveData);
|
||||||
sets.sortByKey();
|
sets.sortByKey();
|
||||||
|
|
||||||
db->notifyEnabledSetsChanged();
|
db->notifyEnabledSetsChanged();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -34,3 +34,17 @@ bool CardDatabaseSettings::isKnown(QString shortName) const
|
||||||
{
|
{
|
||||||
return getValue("isknown", "sets", std::move(shortName)).toBool();
|
return getValue("isknown", "sets", std::move(shortName)).toBool();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void CardDatabaseSettings::saveSets(const QVector<ICardSetPriorityController::SetSaveData> &data)
|
||||||
|
{
|
||||||
|
batchWrite([&](QSettings &s) {
|
||||||
|
s.beginGroup("sets");
|
||||||
|
for (const auto &entry : data) {
|
||||||
|
s.beginGroup(entry.shortName);
|
||||||
|
s.setValue("sortkey", entry.sortKey);
|
||||||
|
s.setValue("enabled", entry.enabled);
|
||||||
|
s.endGroup();
|
||||||
|
}
|
||||||
|
s.endGroup();
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
@ -26,6 +26,8 @@ public:
|
||||||
bool isEnabled(QString shortName) const override;
|
bool isEnabled(QString shortName) const override;
|
||||||
bool isKnown(QString shortName) const override;
|
bool isKnown(QString shortName) const override;
|
||||||
|
|
||||||
|
void saveSets(const QVector<SetSaveData> &data) override;
|
||||||
|
|
||||||
private:
|
private:
|
||||||
explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
|
explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -159,6 +159,15 @@ QVariant SettingsManager::getValue(const QString &name, const QString &group, co
|
||||||
return value;
|
return value;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void SettingsManager::batchWrite(std::function<void(QSettings &)> batchWriteFunction)
|
||||||
|
{
|
||||||
|
auto settings = getSettings();
|
||||||
|
settings.setAtomicSyncRequired(false);
|
||||||
|
batchWriteFunction(settings);
|
||||||
|
settings.sync(); // single flush
|
||||||
|
settings.setAtomicSyncRequired(true);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Calls sync on the underlying QSettings object
|
* Calls sync on the underlying QSettings object
|
||||||
*/
|
*/
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,7 @@ public:
|
||||||
|
|
||||||
QVariant getValue(const QString &name) const;
|
QVariant getValue(const QString &name) const;
|
||||||
QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString()) const;
|
QVariant getValue(const QString &name, const QString &group, const QString &subGroup = QString()) const;
|
||||||
|
void batchWrite(std::function<void(QSettings &)> batchWriteFunction);
|
||||||
|
|
||||||
void sync();
|
void sync();
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue