dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change artist and song ID to strings

Browse Source
This commit is contained in:
Jonas Kvinge
2020-04-13 03:39:51 +02:00
parent 30e6ced4e9
commit 5591472dbd
10 changed files with 328 additions and 121 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/core/database.cpp
View File

@@ -54,7 +54,7 @@
#include "scopedtransaction.h"
const char *Database::kDatabaseFilename = "strawberry.db";
const int Database::kSchemaVersion = 10;
const int Database::kSchemaVersion = 11;
const char *Database::kMagicAllSongsTables = "%allsongstables";
int Database::sNextConnectionId = 1;

21
src/core/song.cpp
View File

@@ -181,9 +181,9 @@ struct Song::Private : public QSharedData {
QString comment_;
QString lyrics_;
qint64 artist_id_;
QString artist_id_;
QString album_id_;
qint64 song_id_;
QString song_id_;
qint64 beginning_;
qint64 end_;
@@ -279,9 +279,9 @@ bool Song::is_valid() const { return d->valid_; }
bool Song::is_unavailable() const { return d->unavailable_; }
int Song::id() const { return d->id_; }
qint64 Song::artist_id() const { return d->artist_id_; }
QString Song::artist_id() const { return d->artist_id_.isNull() ? "" : d->artist_id_; }
QString Song::album_id() const { return d->album_id_.isNull() ? "" : d->album_id_; }
qint64 Song::song_id() const { return d->song_id_; }
QString Song::song_id() const { return d->song_id_.isNull() ? "" : d->song_id_; }
const QString &Song::title() const { return d->title_; }
const QString &Song::title_sortable() const { return d->title_sortable_; }
@@ -380,10 +380,9 @@ const QString &Song::error() const { return d->error_; }
void Song::set_id(int id) { d->id_ = id; }
void Song::set_valid(bool v) { d->valid_ = v; }
void Song::set_artist_id(qint64 v) { d->artist_id_ = v; }
void Song::set_album_id(qint64 v) { d->album_id_ = QString::number(v); }
void Song::set_artist_id(const QString &v) { d->artist_id_ = v; }
void Song::set_album_id(const QString &v) { d->album_id_ = v; }
void Song::set_song_id(qint64 v) { d->song_id_ = v; }
void Song::set_song_id(const QString &v) { d->song_id_ = v; }
QString Song::sortable(const QString &v) const {
@@ -860,13 +859,13 @@ void Song::InitFromQuery(const SqlRow &q, bool reliable_metadata, int col) {
}
else if (Song::kColumns.value(i) == "artist_id") {
d->artist_id_ = tolonglong(x);
d->artist_id_ = tostr(x);
}
else if (Song::kColumns.value(i) == "album_id") {
d->album_id_ = tostr(x);
}
else if (Song::kColumns.value(i) == "song_id") {
d->song_id_ = tolonglong(x);
d->song_id_ = tostr(x);
}
else if (Song::kColumns.value(i) == "beginning") {
@@ -1265,9 +1264,9 @@ void Song::BindToQuery(QSqlQuery *query) const {
query->bindValue(":comment", strval(d->comment_));
query->bindValue(":lyrics", strval(d->lyrics_));
query->bindValue(":artist_id", intval(d->artist_id_));
query->bindValue(":artist_id", strval(d->artist_id_));
query->bindValue(":album_id", strval(d->album_id_));
query->bindValue(":song_id", intval(d->song_id_));
query->bindValue(":song_id", strval(d->song_id_));
query->bindValue(":beginning", d->beginning_);
query->bindValue(":length", intval(length_nanosec()));

9
src/core/song.h
View File

@@ -208,9 +208,9 @@ class Song {
const QString &comment() const;
const QString &lyrics() const;
qint64 artist_id() const;
QString artist_id() const;
QString album_id() const;
qint64 song_id() const;
QString song_id() const;
qint64 beginning_nanosec() const;
qint64 end_nanosec() const;
@@ -309,10 +309,9 @@ class Song {
void set_comment(const QString &v);
void set_lyrics(const QString &v);
void set_artist_id(qint64 v);
void set_album_id(qint64 v);
void set_artist_id(const QString &v);
void set_album_id(const QString &v);
void set_song_id(qint64 v);
void set_song_id(const QString &v);
void set_beginning_nanosec(qint64 v);
void set_end_nanosec(qint64 v);