X-Git-Url: https://git.sur5r.net/?a=blobdiff_plain;f=src%2Fdatabase.cpp;h=4e089ff9cdc895d812aabadf81be0470e0a93f05;hb=e5ab28f93dda6e878973f57276db5edab68d13bc;hp=37e84336044234bec852cfdf1d294e29661d1e9a;hpb=7cdd5bd476021ec84d54c4ec5be02280e1e9e548;p=minitube

diff --git a/src/database.cpp b/src/database.cpp
index 37e8433..4e089ff 100644
--- a/src/database.cpp
+++ b/src/database.cpp
@@ -27,18 +27,26 @@ static const QString dbName = QLatin1String(Constants::UNIX_NAME) + ".db";
 static Database *databaseInstance = 0;
 
 Database::Database() {
-
+#if QT_VERSION >= 0x050000
+    QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+#else
     QString dataLocation = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+#endif
+
     QDir().mkpath(dataLocation);
     dbLocation = dataLocation + "/" + dbName;
 
     QMutexLocker locker(&lock);
 
-    if(QFile::exists(dbLocation)) {
+    if (QFile::exists(dbLocation)) {
         // check db version
         int databaseVersion = getAttribute("version").toInt();
-        if (databaseVersion != DATABASE_VERSION)
+        if (databaseVersion > DATABASE_VERSION)
             qWarning("Wrong database version: %d", databaseVersion);
+
+        if (!getAttribute("channelIdFix").toBool())
+            fixChannelIds();
+
     } else createDatabase();
 }
 
@@ -54,9 +62,9 @@ void Database::createDatabase() {
 
     QSqlQuery("create table subscriptions ("
               "id integer primary key autoincrement,"
-              "user_id varchar,"
-              "user_name varchar,"
-              "name varchar,"
+              "user_id varchar," // this is really channel_id
+              "user_name varchar," // obsolete yt2 username
+              "name varchar," // this is really channel_title
               "description varchar,"
               "thumb_url varchar,"
               "country varchar,"
@@ -73,13 +81,13 @@ void Database::createDatabase() {
     QSqlQuery("create table subscriptions_videos ("
               "id integer primary key autoincrement,"
               "video_id varchar,"
-              "channel_id integer,"
+              "channel_id integer," // this is really subscription_id
               "published integer,"
               "added integer,"
               "watched integer,"
               "title varchar,"
-              "author varchar,"
-              "user_id varchar,"
+              "author varchar," // this is really channel_title
+              "user_id varchar," // this is really channel_id
               "description varchar,"
               "url varchar,"
               "thumb_url varchar,"
@@ -94,8 +102,11 @@ void Database::createDatabase() {
 }
 
 QString Database::getDbLocation() {
-    static QString dataLocation = QDesktopServices::storageLocation(
-                QDesktopServices::DataLocation);
+#if QT_VERSION >= 0x050000
+    static const QString dataLocation = QStandardPaths::writableLocation(QStandardPaths::DataLocation);
+#else
+    static const QString dataLocation = QDesktopServices::storageLocation(QDesktopServices::DataLocation);
+#endif
     return dataLocation + "/" + dbName;
 }
 
@@ -149,11 +160,31 @@ QVariant Database::getAttribute(QString name) {
 
 void Database::setAttribute(QString name, QVariant value) {
     QSqlQuery query(getConnection());
-    query.prepare("update attributes set value=? where name=?");
-    query.bindValue(0, value);
-    query.bindValue(1, name);
+    query.prepare("insert or replace into attributes (name, value) values (?,?)");
+    query.bindValue(0, name);
+    query.bindValue(1, value);
     bool success = query.exec();
-    if (!success) qDebug() << query.lastError().text();
+    if (!success) qWarning() << query.lastError().text();
+}
+
+void Database::fixChannelIds() {
+    if (!getConnection().transaction())
+        qWarning() << "Transaction failed" << __PRETTY_FUNCTION__;
+
+    qWarning() << "Fixing channel ids";
+
+    QSqlQuery query(getConnection());
+    bool success = query.exec("update subscriptions set user_id='UC' || user_id where user_id not like 'UC%'");
+    if (!success) qWarning() << query.lastError().text();
+
+    query = QSqlQuery(getConnection());
+    success = query.exec("update subscriptions_videos set user_id='UC' || user_id where user_id not like 'UC%'");
+    if (!success) qWarning() << query.lastError().text();
+
+    setAttribute("channelIdFix", 1);
+
+    if (!getConnection().commit())
+        qWarning() << "Commit failed" << __PRETTY_FUNCTION__;
 }
 
 /**
@@ -173,7 +204,7 @@ void Database::drop() {
 
         while (query.next()) {
             QString tableName = query.value(0).toString();
-            if (tableName.startsWith("sqlite_") || tableName == "attributes") continue;
+            if (tableName.startsWith("sqlite_") || tableName == QLatin1String("attributes")) continue;
             QString dropSQL = "delete from " + tableName;
             QSqlQuery query2(db);
             if (!query2.exec(dropSQL))