Differential D23402 Diff 64486 src/databaseinterface.cpp

Changeset View

Standalone View

View Options

src/databaseinterface.cpp

  • This file is larger than 256 KB, so syntax highlighting is disabled by default.
Show First 20 Lines • Show All 1211 Lines • ▼ Show 20 Line(s)1158{
1212 1212​
1213 if (listTables.contains(QStringLiteral("DatabaseVersionV5")) && 1213​ if (listTables.contains(QStringLiteral("DatabaseVersionV5")) &&
1214 !listTables.contains(QStringLiteral("DatabaseVersionV9"))) { 1214​ !listTables.contains(QStringLiteral("DatabaseVersionV9"))) {
1215 upgradeDatabaseV9(); 1215​ upgradeDatabaseV9();
1216 upgradeDatabaseV11(); 1216​ upgradeDatabaseV11();
1217 upgradeDatabaseV12(); 1217​ upgradeDatabaseV12();
1218 upgradeDatabaseV13(); 1218​ upgradeDatabaseV13();
1219 upgradeDatabaseV14(); 1219​ upgradeDatabaseV14();
1220​ upgradeDatabaseV15();
1220 1221​
1221 checkDatabaseSchema(); 1222​ checkDatabaseSchema();
1222 } else if (listTables.contains(QStringLiteral("DatabaseVersionV9"))) { 1223​ } else if (listTables.contains(QStringLiteral("DatabaseVersionV9"))) {
1223 if (!listTables.contains(QStringLiteral("DatabaseVersionV11"))) { 1224​ if (!listTables.contains(QStringLiteral("DatabaseVersionV11"))) {
1224 upgradeDatabaseV11(); 1225​ upgradeDatabaseV11();
1225 } 1226​ }
1226 if (!listTables.contains(QStringLiteral("DatabaseVersionV12"))) { 1227​ if (!listTables.contains(QStringLiteral("DatabaseVersionV12"))) {
1227 upgradeDatabaseV12(); 1228​ upgradeDatabaseV12();
1228 } 1229​ }
1229 if (!listTables.contains(QStringLiteral("DatabaseVersionV13"))) { 1230​ if (!listTables.contains(QStringLiteral("DatabaseVersionV13"))) {
1230 upgradeDatabaseV13(); 1231​ upgradeDatabaseV13();
1231 } 1232​ }
1232 if (!listTables.contains(QStringLiteral("DatabaseVersionV14"))) { 1233​ if (!listTables.contains(QStringLiteral("DatabaseVersionV14"))) {
1233 upgradeDatabaseV14(); 1234​ upgradeDatabaseV14();
1234 } 1235​ }
1236​ if (!listTables.contains(QStringLiteral("DatabaseVersionV15"))) {
1237​ upgradeDatabaseV15();
1238​ }
1235 1239​
1236 checkDatabaseSchema(); 1240​ checkDatabaseSchema();
1237 } else { 1241​ } else {
1238 createDatabaseV9(); 1242​ createDatabaseV9();
1239 upgradeDatabaseV11(); 1243​ upgradeDatabaseV11();
1240 upgradeDatabaseV12(); 1244​ upgradeDatabaseV12();
1241 upgradeDatabaseV13(); 1245​ upgradeDatabaseV13();
1242 upgradeDatabaseV14(); 1246​ upgradeDatabaseV14();
1247​ upgradeDatabaseV15();
1243 } 1248​ }
1244} 1249​}
1245 1250​
1246void DatabaseInterface::createDatabaseV9() 1251​void DatabaseInterface::createDatabaseV9()
1247{ 1252​{
1248 qCInfo(orgKdeElisaDatabase) << "begin creation of v9 database schema"; 1253​ qCInfo(orgKdeElisaDatabase) << "begin creation of v9 database schema";
1249 1254​
1250 { 1255​ {
▲ Show 20 Lines • Show All 1648 Lines • ▼ Show 20 Line(s)2901 if (!result) {
2899 2904​
2900 Q_EMIT databaseError(); 2905​ Q_EMIT databaseError();
2901 } 2906​ }
2902 } 2907​ }
2903 2908​
2904 qCInfo(orgKdeElisaDatabase) << "finished update to v14 of database schema"; 2909​ qCInfo(orgKdeElisaDatabase) << "finished update to v14 of database schema";
2905} 2910​}
2906 2911​
2912​void DatabaseInterface::upgradeDatabaseV15() {
2913​ qCInfo(orgKdeElisaDatabase) << "begin update to v15 of database schema";
2914​
2915​ {
2916​ QSqlQuery createSchemaQuery(d->mTracksDatabase);
2917​
2918​ const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `DatabaseVersionV15` (`Version` INTEGER PRIMARY KEY NOT NULL)"));
2919​
2920​ if (!result) {
2921​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastQuery();
2922​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastError();
2923​
2924​ Q_EMIT databaseError();
2925​ }
2926​ }
2927​
2928​ {
2929​ QSqlQuery disableForeignKeys(d->mTracksDatabase);
2930​
2931​ auto result = disableForeignKeys.exec(QStringLiteral(" PRAGMA foreign_keys=OFF"));
2932​
2933​ if (!result) {
2934​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << disableForeignKeys.lastQuery();
2935​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << disableForeignKeys.lastError();
2936​
2937​ Q_EMIT databaseError();
2938​ }
2939​ }
2940​
2941​ d->mTracksDatabase.transaction();
2942​
2943​ {
2944​ QSqlQuery createSchemaQuery(d->mTracksDatabase);
2945​
2946​ const auto &result = createSchemaQuery.exec(QStringLiteral("CREATE TABLE `NewTracks` ("
2947​ "`ID` INTEGER PRIMARY KEY AUTOINCREMENT, "
2948​ "`FileName` VARCHAR(255) NOT NULL, "
2949​ "`Priority` INTEGER NOT NULL, "
2950​ "`Title` VARCHAR(85), "
2951​ "`ArtistName` VARCHAR(55), "
2952​ "`AlbumTitle` VARCHAR(55), "
2953​ "`AlbumArtistName` VARCHAR(55), "
2954​ "`AlbumPath` VARCHAR(255), "
2955​ "`TrackNumber` INTEGER, "
2956​ "`DiscNumber` INTEGER, "
2957​ "`Duration` INTEGER NOT NULL, "
2958​ "`Rating` INTEGER NOT NULL DEFAULT 0, "
2959​ "`Genre` VARCHAR(55), "
2960​ "`Composer` VARCHAR(55), "
2961​ "`Lyricist` VARCHAR(55), "
2962​ "`Comment` VARCHAR(255), "
2963​ "`Year` INTEGER, "
2964​ "`Channels` INTEGER, "
2965​ "`BitRate` INTEGER, "
2966​ "`SampleRate` INTEGER, "
2967​ "`HasEmbeddedCover` BOOLEAN NOT NULL, "
2968​ "UNIQUE ("
2969​ "`FileName`"
2970​ "), "
2971​ "UNIQUE ("
2972​ "`Priority`, `Title`, `ArtistName`, "
2973​ "`AlbumTitle`, `AlbumArtistName`, `AlbumPath`, "
2974​ "`TrackNumber`, `DiscNumber`"
2975​ "), "
2976​ "CONSTRAINT fk_fileName FOREIGN KEY (`FileName`) "
2977​ "REFERENCES `TracksData`(`FileName`) ON DELETE CASCADE, "
2978​ "CONSTRAINT fk_artist FOREIGN KEY (`ArtistName`) REFERENCES `Artists`(`Name`), "
2979​ "CONSTRAINT fk_tracks_composer FOREIGN KEY (`Composer`) REFERENCES `Composer`(`Name`), "
2980​ "CONSTRAINT fk_tracks_lyricist FOREIGN KEY (`Lyricist`) REFERENCES `Lyricist`(`Name`), "
2981​ "CONSTRAINT fk_tracks_genre FOREIGN KEY (`Genre`) REFERENCES `Genre`(`Name`), "
2982​ "CONSTRAINT fk_tracks_album FOREIGN KEY ("
2983​ "`AlbumTitle`, `AlbumArtistName`, `AlbumPath`)"
2984​ "REFERENCES `Albums`(`Title`, `ArtistName`, `AlbumPath`))"));
2985​
2986​ if (!result) {
2987​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastQuery();
2988​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastError();
2989​ }
2990​ }
2991​
2992​ {
2993​ QSqlQuery copyDataQuery(d->mTracksDatabase);
2994​
2995​ auto result = copyDataQuery.exec(QStringLiteral("INSERT INTO `NewTracks` "
2996​ "SELECT "
2997​ "t.`ID`, "
2998​ "t.`FileName`, "
2999​ "t.`Priority`, "
3000​ "t.`Title`, "
3001​ "t.`ArtistName`, "
3002​ "t.`AlbumTitle`, "
3003​ "t.`AlbumArtistName`, "
3004​ "t.`AlbumPath`, "
3005​ "t.`TrackNumber`, "
3006​ "t.`DiscNumber`, "
3007​ "t.`Duration`, "
3008​ "t.`Rating`, "
3009​ "t.`Genre`, "
3010​ "t.`Composer`, "
3011​ "t.`Lyricist`, "
3012​ "t.`Comment`, "
3013​ "t.`Year`, "
3014​ "t.`Channels`, "
3015​ "t.`BitRate`, "
3016​ "t.`SampleRate`, "
3017​ "t.`HasEmbeddedCover` "
3018​ "FROM "
3019​ "`Tracks` t"));
3020​
3021​ if (!result) {
3022​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << copyDataQuery.lastQuery();
3023​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << copyDataQuery.lastError();
3024​
3025​ Q_EMIT databaseError();
3026​ }
3027​ }
3028​
3029​ {
3030​ QSqlQuery createSchemaQuery(d->mTracksDatabase);
3031​
3032​ auto result = createSchemaQuery.exec(QStringLiteral("DROP TABLE `Tracks`"));
3033​
3034​ if (!result) {
3035​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastQuery();
3036​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastError();
3037​
3038​ Q_EMIT databaseError();
3039​ }
3040​ }
3041​
3042​ {
3043​ QSqlQuery createSchemaQuery(d->mTracksDatabase);
3044​
3045​ auto result = createSchemaQuery.exec(QStringLiteral("ALTER TABLE `NewTracks` RENAME TO `Tracks`"));
3046​
3047​ if (!result) {
3048​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastQuery();
3049​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createSchemaQuery.lastError();
3050​
3051​ Q_EMIT databaseError();
3052​ }
3053​ }
3054​
3055​ d->mTracksDatabase.commit();
3056​
3057​ {
3058​ QSqlQuery enableForeignKeys(d->mTracksDatabase);
3059​
3060​ auto result = enableForeignKeys.exec(QStringLiteral(" PRAGMA foreign_keys=ON"));
3061​
3062​ if (!result) {
3063​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << enableForeignKeys.lastQuery();
3064​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << enableForeignKeys.lastError();
3065​
3066​ Q_EMIT databaseError();
3067​ }
3068​ }
3069​
3070​ {
3071​ QSqlQuery createTrackIndex(d->mTracksDatabase);
3072​
3073​ const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
3074​ "IF NOT EXISTS "
3075​ "`TracksAlbumIndex` ON `Tracks` "
3076​ "(`AlbumTitle`, `AlbumArtistName`, `AlbumPath`)"));
3077​
3078​ if (!result) {
3079​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastQuery();
3080​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastError();
3081​
3082​ Q_EMIT databaseError();
3083​ }
3084​ }
3085​
3086​ {
3087​ QSqlQuery createTrackIndex(d->mTracksDatabase);
3088​
3089​ const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
3090​ "IF NOT EXISTS "
3091​ "`ArtistNameIndex` ON `Tracks` "
3092​ "(`ArtistName`)"));
3093​
3094​ if (!result) {
3095​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastQuery();
3096​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastError();
3097​
3098​ Q_EMIT databaseError();
3099​ }
3100​ }
3101​
3102​ {
3103​ QSqlQuery createTrackIndex(d->mTracksDatabase);
3104​
3105​ const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
3106​ "IF NOT EXISTS "
3107​ "`AlbumArtistNameIndex` ON `Tracks` "
3108​ "(`AlbumArtistName`)"));
3109​
3110​ if (!result) {
3111​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastQuery();
3112​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastError();
3113​
3114​ Q_EMIT databaseError();
3115​ }
3116​ }
3117​
3118​ {
3119​ QSqlQuery createTrackIndex(d->mTracksDatabase);
3120​
3121​ const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
3122​ "IF NOT EXISTS "
3123​ "`TracksUniqueData` ON `Tracks` "
3124​ "(`Title`, `ArtistName`, "
3125​ "`AlbumTitle`, `AlbumArtistName`, `AlbumPath`, "
3126​ "`TrackNumber`, `DiscNumber`)"));
3127​
3128​ if (!result) {
3129​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastQuery();
3130​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastError();
3131​
3132​ Q_EMIT databaseError();
3133​ }
3134​ }
3135​
3136​ {
3137​ QSqlQuery createTrackIndex(d->mTracksDatabase);
3138​
3139​ const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
3140​ "IF NOT EXISTS "
3141​ "`TracksUniqueDataPriority` ON `Tracks` "
3142​ "(`Priority`, `Title`, `ArtistName`, "
3143​ "`AlbumTitle`, `AlbumArtistName`, `AlbumPath`, "
3144​ "`TrackNumber`, `DiscNumber`)"));
3145​
3146​ if (!result) {
3147​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastQuery();
3148​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastError();
3149​
3150​ Q_EMIT databaseError();
3151​ }
3152​ }
3153​
3154​ {
3155​ QSqlQuery createTrackIndex(d->mTracksDatabase);
3156​
3157​ const auto &result = createTrackIndex.exec(QStringLiteral("CREATE INDEX "
3158​ "IF NOT EXISTS "
3159​ "`TracksFileNameIndex` ON `Tracks` "
3160​ "(`FileName`)"));
3161​
3162​ if (!result) {
3163​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastQuery();
3164​ qCDebug(orgKdeElisaDatabase) << "DatabaseInterface::upgradeDatabaseV15" << createTrackIndex.lastError();
3165​
3166​ Q_EMIT databaseError();
3167​ }
3168​ }
3169​
3170​ qCInfo(orgKdeElisaDatabase) << "finished update to v14 of database schema";
mgallienUnsubmitted
Not Done

You are upgrading the v15 schema.
By the way, on my tests, the upgrade is too long and that is a blocker for integration of this work.

mgallien: You are upgrading the v15 schema. By the way, on my tests, the upgrade is too long and that is…
astippichAuthorUnsubmitted
Not Done

Well, that is kind of expected with a large collection as the tracks table is huge. I have no idea how to prevent this besides forcing a complete reindex

astippich: Well, that is kind of expected with a large collection as the tracks table is huge. I have no…
mgallienUnsubmitted
Not Done

I have to do some research to find why it is faster to rebuild the database from scratch rather than the update.

mgallien: I have to do some research to find why it is faster to rebuild the database from scratch rather…
3171​}
3172​
2907void DatabaseInterface::checkDatabaseSchema() 3173​void DatabaseInterface::checkDatabaseSchema()
2908{ 3174​{
2909 checkAlbumsTableSchema(); 3175​ checkAlbumsTableSchema();
2910 if (d->mIsInBadState) 3176​ if (d->mIsInBadState)
2911 { 3177​ {
2912 resetDatabase(); 3178​ resetDatabase();
2913 return; 3179​ return;
2914 } 3180​ }
▲ Show 20 Lines • Show All 682 Lines • ▼ Show 20 Line(s)3767 auto selectAllTracksText = QStringLiteral("SELECT "
3597 "WHERE " 3863​ "WHERE "
3598 "tracksMapping.`FileName` = tracks.`FileName` AND " 3864​ "tracksMapping.`FileName` = tracks.`FileName` AND "
3599 "tracks.`Priority` = (" 3865​ "tracks.`Priority` = ("
3600 " SELECT " 3866​ " SELECT "
3601 " MIN(`Priority`) " 3867​ " MIN(`Priority`) "
3602 " FROM " 3868​ " FROM "
3603 " `Tracks` tracks2 " 3869​ " `Tracks` tracks2 "
3604 " WHERE " 3870​ " WHERE "
3605 " tracks.`Title` = tracks2.`Title` AND " 3871​ " (tracks.`Title` IS NULL OR tracks.`Title` = tracks2.`Title`) AND "
astippichAuthorUnsubmitted
Not Done

I could not get the current code to output some execution time values, so I've added some QElapsedTimers, which are probably not that accurate, but show the problem anyways. I've tracked it down to the actual sql query . Adding "tracks.Title IS NULL OR ..." here increases the runtime of this query from approximately 150ms to 850 ms. Any ideas?

astippich: I could not get the current code to output some execution time values, so I've added some…
mgallienUnsubmitted
Not Done

Not yet but I will spent time this week on that. I cannot promise the exact day but before Friday should be possible.

mgallien: Not yet but I will spent time this week on that. I cannot promise the exact day but before…
mgallienUnsubmitted
Not Done

This should do the job while keeping reasonable runtime duration:

((tracks.Title IS NULL AND tracks.FileName = tracks2.FileName) OR tracks.Title = tracks2.Title) AND

mgallien: This should do the job while keeping reasonable runtime duration: ((tracks.`Title` IS NULL AND…
3606 " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND " 3872​ " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND "
3607 " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND " 3873​ " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND "
3608 " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND " 3874​ " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND "
3609 " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)" 3875​ " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)"
3610 ")" 3876​ ")"
3611 ""); 3877​ "");
3612 3878​
3613 auto result = prepareQuery(d->mSelectAllTracksQuery, selectAllTracksText); 3879​ auto result = prepareQuery(d->mSelectAllTracksQuery, selectAllTracksText);
▲ Show 20 Lines • Show All 130 Lines • ▼ Show 20 Line(s)3913 auto selectAllTracksText = QStringLiteral("SELECT "
3744 "tracksMapping.`FileName` = tracks.`FileName` AND " 4010​ "tracksMapping.`FileName` = tracks.`FileName` AND "
3745 "tracksMapping.`PlayCounter` > 0 AND " 4011​ "tracksMapping.`PlayCounter` > 0 AND "
3746 "tracks.`Priority` = (" 4012​ "tracks.`Priority` = ("
3747 " SELECT " 4013​ " SELECT "
3748 " MIN(`Priority`) " 4014​ " MIN(`Priority`) "
3749 " FROM " 4015​ " FROM "
3750 " `Tracks` tracks2 " 4016​ " `Tracks` tracks2 "
3751 " WHERE " 4017​ " WHERE "
3752 " tracks.`Title` = tracks2.`Title` AND " 4018​ " (tracks.`Title` IS NULL OR tracks.`Title` = tracks2.`Title`) AND "
3753 " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND " 4019​ " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND "
3754 " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND " 4020​ " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND "
3755 " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND " 4021​ " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND "
3756 " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)" 4022​ " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)"
3757 ")" 4023​ ")"
3758 "ORDER BY tracksMapping.`LastPlayDate` DESC " 4024​ "ORDER BY tracksMapping.`LastPlayDate` DESC "
3759 "LIMIT :maximumResults"); 4025​ "LIMIT :maximumResults");
3760 4026​
▲ Show 20 Lines • Show All 108 Lines • ▼ Show 20 Line(s)4038 auto selectAllTracksText = QStringLiteral("SELECT "
3869 "tracksMapping.`FileName` = tracks.`FileName` AND " 4135​ "tracksMapping.`FileName` = tracks.`FileName` AND "
3870 "tracksMapping.`PlayCounter` > 0 AND " 4136​ "tracksMapping.`PlayCounter` > 0 AND "
3871 "tracks.`Priority` = (" 4137​ "tracks.`Priority` = ("
3872 " SELECT " 4138​ " SELECT "
3873 " MIN(`Priority`) " 4139​ " MIN(`Priority`) "
3874 " FROM " 4140​ " FROM "
3875 " `Tracks` tracks2 " 4141​ " `Tracks` tracks2 "
3876 " WHERE " 4142​ " WHERE "
3877 " tracks.`Title` = tracks2.`Title` AND " 4143​ " (tracks.`Title` IS NULL OR tracks.`Title` = tracks2.`Title`) AND "
3878 " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND " 4144​ " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND "
3879 " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND " 4145​ " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND "
3880 " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND " 4146​ " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND "
3881 " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)" 4147​ " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)"
3882 ")" 4148​ ")"
3883 "ORDER BY CAST(tracksMapping.`PlayCounter` AS REAL) / ((CAST(strftime('%s','now') as INTEGER) - CAST(tracksMapping.`FirstPlayDate` / 1000 as INTEGER)) / CAST(1000 AS REAL)) DESC " 4149​ "ORDER BY CAST(tracksMapping.`PlayCounter` AS REAL) / ((CAST(strftime('%s','now') as INTEGER) - CAST(tracksMapping.`FirstPlayDate` / 1000 as INTEGER)) / CAST(1000 AS REAL)) DESC "
3884 "LIMIT :maximumResults"); 4150​ "LIMIT :maximumResults");
3885 4151​
▲ Show 20 Lines • Show All 363 Lines • ▼ Show 20 Line(s)4417 auto selectTrackQueryText = QStringLiteral("SELECT "
4249 "tracksMapping.`FileName` = tracks.`FileName` AND " 4515​ "tracksMapping.`FileName` = tracks.`FileName` AND "
4250 "album.`ID` = :albumId AND " 4516​ "album.`ID` = :albumId AND "
4251 "tracks.`Priority` = (" 4517​ "tracks.`Priority` = ("
4252 " SELECT " 4518​ " SELECT "
4253 " MIN(`Priority`) " 4519​ " MIN(`Priority`) "
4254 " FROM " 4520​ " FROM "
4255 " `Tracks` tracks2 " 4521​ " `Tracks` tracks2 "
4256 " WHERE " 4522​ " WHERE "
4257 " tracks.`Title` = tracks2.`Title` AND " 4523​ " (tracks.`Title` IS NULL OR tracks.`Title` = tracks2.`Title`) AND "
4258 " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND " 4524​ " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND "
4259 " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND " 4525​ " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND "
4260 " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND " 4526​ " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND "
4261 " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)" 4527​ " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)"
4262 ")" 4528​ ")"
4263 "ORDER BY tracks.`DiscNumber` ASC, " 4529​ "ORDER BY tracks.`DiscNumber` ASC, "
4264 "tracks.`TrackNumber` ASC"); 4530​ "tracks.`TrackNumber` ASC");
4265 4531​
▲ Show 20 Lines • Show All 149 Lines • ▼ Show 20 Line(s)4584 auto selectTrackFromIdQueryText = QStringLiteral("SELECT "
4415 "tracks.`ID` = :trackId AND " 4681​ "tracks.`ID` = :trackId AND "
4416 "tracksMapping.`FileName` = tracks.`FileName` AND " 4682​ "tracksMapping.`FileName` = tracks.`FileName` AND "
4417 "tracks.`Priority` = (" 4683​ "tracks.`Priority` = ("
4418 " SELECT " 4684​ " SELECT "
4419 " MIN(`Priority`) " 4685​ " MIN(`Priority`) "
4420 " FROM " 4686​ " FROM "
4421 " `Tracks` tracks2 " 4687​ " `Tracks` tracks2 "
4422 " WHERE " 4688​ " WHERE "
4423 " tracks.`Title` = tracks2.`Title` AND " 4689​ " (tracks.`Title` IS NULL OR tracks.`Title` = tracks2.`Title`) AND "
4424 " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND " 4690​ " (tracks.`ArtistName` IS NULL OR tracks.`ArtistName` = tracks2.`ArtistName`) AND "
4425 " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND " 4691​ " (tracks.`AlbumTitle` IS NULL OR tracks.`AlbumTitle` = tracks2.`AlbumTitle`) AND "
4426 " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND " 4692​ " (tracks.`AlbumArtistName` IS NULL OR tracks.`AlbumArtistName` = tracks2.`AlbumArtistName`) AND "
4427 " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)" 4693​ " (tracks.`AlbumPath` IS NULL OR tracks.`AlbumPath` = tracks2.`AlbumPath`)"
4428 ")" 4694​ ")"
4429 ""); 4695​ "");
4430 4696​
4431 auto result = prepareQuery(d->mSelectTrackFromIdQuery, selectTrackFromIdQueryText); 4697​ auto result = prepareQuery(d->mSelectTrackFromIdQuery, selectTrackFromIdQueryText);
▲ Show 20 Lines • Show All 1592 Lines • ▼ Show 20 Line(s)6272{
6024 d->mUpdateTrackFileModifiedTime.finish(); 6290​ d->mUpdateTrackFileModifiedTime.finish();
6025} 6291​}
6026 6292​
6027qulonglong DatabaseInterface::internalInsertTrack(const MusicAudioTrack &oneTrack, 6293​qulonglong DatabaseInterface::internalInsertTrack(const MusicAudioTrack &oneTrack,
6028 const QHash<QString, QUrl> &covers, bool &isInserted) 6294​ const QHash<QString, QUrl> &covers, bool &isInserted)
6029{ 6295​{
6030 qulonglong resultId = 0; 6296​ qulonglong resultId = 0;
6031 6297​
6032 if (oneTrack.title().isEmpty()) { ​
6033 return resultId; ​
6034 } ​
6035 ​
6036 QUrl::FormattingOptions currentOptions = QUrl::PreferLocalFile | 6298​ QUrl::FormattingOptions currentOptions = QUrl::PreferLocalFile |
6037 QUrl::RemoveAuthority | QUrl::RemoveFilename | QUrl::RemoveFragment | 6299​ QUrl::RemoveAuthority | QUrl::RemoveFilename | QUrl::RemoveFragment |
6038 QUrl::RemovePassword | QUrl::RemovePort | QUrl::RemoveQuery | 6300​ QUrl::RemovePassword | QUrl::RemovePort | QUrl::RemoveQuery |
6039 QUrl::RemoveScheme | QUrl::RemoveUserInfo; 6301​ QUrl::RemoveScheme | QUrl::RemoveUserInfo;
6040 6302​
6041 const auto &trackPath = oneTrack.resourceURI().toString(currentOptions); 6303​ const auto &trackPath = oneTrack.resourceURI().toString(currentOptions);
6042 6304​
6043 auto albumCover = covers[oneTrack.resourceURI().toString()]; 6305​ auto albumCover = covers[oneTrack.resourceURI().toString()];
▲ Show 20 Lines • Show All 298 Lines • ▼ Show 20 Line(s)6588{
6342 } else { 6604​ } else {
6343 result[TrackDataType::key_type::IsValidAlbumArtistRole] = false; 6605​ result[TrackDataType::key_type::IsValidAlbumArtistRole] = false;
6344 if (trackRecord.value(4).toInt() == 1) { 6606​ if (trackRecord.value(4).toInt() == 1) {
6345 result[TrackDataType::key_type::AlbumArtistRole] = trackRecord.value(3); 6607​ result[TrackDataType::key_type::AlbumArtistRole] = trackRecord.value(3);
6346 } else if (trackRecord.value(4).toInt() > 1) { 6608​ } else if (trackRecord.value(4).toInt() > 1) {
6347 result[TrackDataType::key_type::AlbumArtistRole] = QStringLiteral("Various Artists"); 6609​ result[TrackDataType::key_type::AlbumArtistRole] = QStringLiteral("Various Artists");
6348 } 6610​ }
6349 } 6611​ }
6350 ​
6351 result[TrackDataType::key_type::ResourceRole] = trackRecord.value(7); 6612​ result[TrackDataType::key_type::ResourceRole] = trackRecord.value(7);
6613​ auto resourceUrl = trackRecord.value(7).toUrl();
6614​ if (resourceUrl.isLocalFile()) {
6615​ result[TrackDataType::key_type::FileNameRole] = resourceUrl.fileName();
6616​ } else {
6617​ result[TrackDataType::key_type::FileNameRole] = resourceUrl.toDisplayString();
6618​ }
6352 if (!trackRecord.value(9).isNull()) { 6619​ if (!trackRecord.value(9).isNull()) {
6353 result[TrackDataType::key_type::TrackNumberRole] = trackRecord.value(9); 6620​ result[TrackDataType::key_type::TrackNumberRole] = trackRecord.value(9);
6354 } 6621​ }
6355 if (!trackRecord.value(10).isNull()) { 6622​ if (!trackRecord.value(10).isNull()) {
6356 result[TrackDataType::key_type::DiscNumberRole] = trackRecord.value(10); 6623​ result[TrackDataType::key_type::DiscNumberRole] = trackRecord.value(10);
6357 } 6624​ }
6358 result[TrackDataType::key_type::DurationRole] = QTime::fromMSecsSinceStartOfDay(trackRecord.value(11).toInt()); 6625​ result[TrackDataType::key_type::DurationRole] = QTime::fromMSecsSinceStartOfDay(trackRecord.value(11).toInt());
6359 result[TrackDataType::key_type::MilliSecondsDurationRole] = trackRecord.value(11).toInt(); 6626​ result[TrackDataType::key_type::MilliSecondsDurationRole] = trackRecord.value(11).toInt();
▲ Show 20 Lines • Show All 1376 Lines • Show Last 20 Lines