Funkwhale/strawberry-audio-player-windows-mac-linux
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Automatically remove devices with old schemas when upgrading

Browse Source
This commit is contained in:
Jonas Kvinge 2019-08-02 22:58:30 +02:00
parent 43b9941dc8
commit 2d3f41da6f
3 changed files with 21 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
data/schema/device-schema.sql
View File

@ -75,4 +75,4 @@ CREATE VIRTUAL TABLE device_%deviceid_fts USING fts5(
tokenize = "unicode61 remove_diacritics 0" tokenize = "unicode61 remove_diacritics 0"
); );
UPDATE devices SET schema_version=0 WHERE ROWID=%deviceid; UPDATE devices SET schema_version=1 WHERE ROWID=%deviceid;

5
src/core/database.cpp
View File

@ -147,7 +147,10 @@ QSqlDatabase Database::Connect() {
UpdateDatabaseSchema(0, db); UpdateDatabaseSchema(0, db);
} }
else if (SchemaVersion(&db) <= 8) { // Register unicode from unicode61 tokenizer to drop old FTS3 tables. {
// Register unicode from unicode61 tokenizer to drop old FTS3 tables.
// We need it also to drop old devices later when loading devices.
// And that's done in a different thread after schemas are upgraded, so register it anyway.
#ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER #ifdef SQLITE_DBCONFIG_ENABLE_FTS3_TOKENIZER
QVariant v = db.driver()->handle(); QVariant v = db.driver()->handle();
if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) { if (v.isValid() && qstrcmp(v.typeName(), "sqlite3*") == 0) {

21
src/device/devicedatabasebackend.cpp
View File

@ -40,7 +40,7 @@
#include "core/logging.h" #include "core/logging.h"
#include "devicedatabasebackend.h" #include "devicedatabasebackend.h"
const int DeviceDatabaseBackend::kDeviceSchemaVersion = 0; const int DeviceDatabaseBackend::kDeviceSchemaVersion = 1;
DeviceDatabaseBackend::DeviceDatabaseBackend(QObject *parent) : DeviceDatabaseBackend::DeviceDatabaseBackend(QObject *parent) :
QObject(parent), QObject(parent),
@ -81,12 +81,13 @@ void DeviceDatabaseBackend::Exit() {
DeviceDatabaseBackend::DeviceList DeviceDatabaseBackend::GetAllDevices() { DeviceDatabaseBackend::DeviceList DeviceDatabaseBackend::GetAllDevices() {
DeviceList ret; DeviceList ret;
DeviceList old_devices;
{ {
QMutexLocker l(db_->Mutex()); QMutexLocker l(db_->Mutex());
QSqlDatabase db(db_->Connect()); QSqlDatabase db(db_->Connect());
QSqlQuery q(db); QSqlQuery q(db);
q.prepare("SELECT ROWID, unique_id, friendly_name, size, icon, transcode_mode, transcode_format FROM devices"); q.prepare("SELECT ROWID, unique_id, friendly_name, size, icon, schema_version, transcode_mode, transcode_format FROM devices");
q.exec(); q.exec();
if (db_->CheckErrors(q)) return ret; if (db_->CheckErrors(q)) return ret;
@ -97,12 +98,22 @@ DeviceDatabaseBackend::DeviceList DeviceDatabaseBackend::GetAllDevices() {
dev.friendly_name_ = q.value(2).toString(); dev.friendly_name_ = q.value(2).toString();
dev.size_ = q.value(3).toLongLong(); dev.size_ = q.value(3).toLongLong();
dev.icon_name_ = q.value(4).toString(); dev.icon_name_ = q.value(4).toString();
dev.transcode_mode_ = MusicStorage::TranscodeMode(q.value(5).toInt()); int schema_version = q.value(5).toInt();
dev.transcode_format_ = Song::FileType(q.value(6).toInt()); dev.transcode_mode_ = MusicStorage::TranscodeMode(q.value(6).toInt());
ret << dev; dev.transcode_format_ = Song::FileType(q.value(7).toInt());
if (schema_version < kDeviceSchemaVersion) { // Device is using old schema, drop it.
old_devices << dev;
}
else {
ret << dev;
}
} }
} }
for (Device dev : old_devices) {
RemoveDevice(dev.id_);
}
Close(); Close();
return ret; return ret;