From 563de288ba0e9e0c46bdda8773e816fbb9a2de7f Mon Sep 17 00:00:00 2001
From: David Sansome <davidsansome@gmail.com>
Date: Tue, 14 Jun 2011 14:46:02 +0000
Subject: [PATCH] Encode URLs properly when doing the DB schema conversion to
 store filenames as URLs

---
 data/schema/schema-31.sql |  2 --
 src/core/database.cpp     | 35 ++++++++++++++++++++++++++++++++++-
 src/core/database.h       |  1 +
 3 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/data/schema/schema-31.sql b/data/schema/schema-31.sql
index fd1d9051e..8dbabbc0d 100644
--- a/data/schema/schema-31.sql
+++ b/data/schema/schema-31.sql
@@ -1,3 +1 @@
-UPDATE songs SET filename = "file://" || filename;
-
 UPDATE schema_version SET version=31;
diff --git a/src/core/database.cpp b/src/core/database.cpp
index 34f17635a..f1deb1511 100644
--- a/src/core/database.cpp
+++ b/src/core/database.cpp
@@ -29,6 +29,7 @@
 #include <QSqlQuery>
 #include <QtDebug>
 #include <QThread>
+#include <QUrl>
 #include <QVariant>
 
 const char* Database::kDatabaseFilename = "clementine.db";
@@ -506,12 +507,44 @@ void Database::UpdateDatabaseSchema(int version, QSqlDatabase &db) {
     filename = ":/schema/schema.sql";
   else
     filename = QString(":/schema/schema-%1.sql").arg(version);
-
+  
   ScopedTransaction t(&db);
+  
+  if (version == 31) {
+    // This version used to do a bad job of converting filenames in the songs
+    // table to file:// URLs.  Now we do it properly here instead.
+    
+    UrlEncodeFilenameColumn("songs", db);
+    UrlEncodeFilenameColumn("playlist_items", db);
+  }
+  
   ExecFromFile(filename, db, version - 1);
   t.Commit();
 }
 
+void Database::UrlEncodeFilenameColumn(const QString& table, QSqlDatabase& db) {
+  QSqlQuery select(QString("SELECT ROWID, filename FROM %1").arg(table), db);
+  QSqlQuery update(QString("UPDATE %1 SET filename=:filename WHERE ROWID=:id").arg(table), db);
+  
+  select.exec();
+  if (CheckErrors(select)) return;
+  while (select.next()) {
+    const int rowid = select.value(0).toInt();
+    const QString filename = select.value(1).toString();
+    
+    if (filename.isEmpty() || filename.contains("://")) {
+      continue;
+    }
+    
+    const QUrl url = QUrl::fromLocalFile(filename);
+    
+    update.bindValue(":filename", url.toEncoded());
+    update.bindValue(":id", rowid);
+    update.exec();
+    CheckErrors(update);
+  }
+}
+
 void Database::ExecFromFile(const QString &filename, QSqlDatabase &db,
                             int schema_version) {
   // Open and read the database schema
diff --git a/src/core/database.h b/src/core/database.h
index 1718291ab..85f891dd8 100644
--- a/src/core/database.h
+++ b/src/core/database.h
@@ -67,6 +67,7 @@ class Database : public QObject {
   void UpdateMainSchema(QSqlDatabase* db);
 
   void UpdateDatabaseSchema(int version, QSqlDatabase& db);
+  void UrlEncodeFilenameColumn(const QString& table, QSqlDatabase& db);
   QStringList SongsTables(QSqlDatabase& db, int schema_version) const;
 
   struct AttachedDatabase {