[mythtv] MythVideo and UTF-8 (again...)

Lutz Mändle lmaendle at gmx.net
Fri Sep 10 21:19:01 EDT 2004


After some more testing I've found more issues with the utf-8 stuff when 
    the videolist is edited, therefore I've updated my patch.....

-- 
Lutz Mändle         Internet: lmaendle at gmx.net
Berlin/Germany


-------------- next part --------------
diff -Naur ./orig/editmetadata.cpp ./patched/editmetadata.cpp
--- ./orig/editmetadata.cpp	2004-08-19 23:50:12.000000000 +0200
+++ ./patched/editmetadata.cpp	2004-09-10 23:56:43.000000000 +0200
@@ -350,7 +350,8 @@
 
 void EditMetadataDialog::setTitle(QString new_title)
 {
-    working_metadata->setTitle(new_title);
+//    working_metadata->setTitle(new_title);
+    working_metadata->setTitle(new_title.utf8());
 }
 
 void EditMetadataDialog::setCategory(int new_category)
diff -Naur ./orig/main.cpp ./patched/main.cpp
--- ./orig/main.cpp	2004-08-22 20:16:32.000000000 +0200
+++ ./patched/main.cpp	2004-09-10 18:53:56.000000000 +0200
@@ -368,7 +368,8 @@
             QString name = QString::fromUtf8(query.value(0).toString());
             if (name != QString::null)
             {
-                if ((iter = video_files.find(name)) != video_files.end())
+//                if ((iter = video_files.find(name)) != video_files.end())
+                if ((iter = video_files.find(name.utf8())) != video_files.end())
                     video_files.remove(iter);
                 else
                     video_files[name] = kDatabase;
@@ -408,9 +409,10 @@
             QString name(iter.key());
             name.replace(quote_regex, "\"\"");
  
-            QString querystr;
-            querystr.sprintf("DELETE FROM videometadata WHERE "
-                                       "filename=\"%s\"", name.ascii());
+	    QString querystr = QString("DELETE FROM videometadata WHERE filename = \"%1\" ;") .arg(name.utf8());
+//            QString querystr;
+//            querystr.sprintf("DELETE FROM videometadata WHERE "
+//                                       "filename=\"%s\"", name.ascii());
             query.exec(querystr);
         }
 
@@ -485,7 +487,8 @@
             }
         }
         
-        QString filename = fi->absFilePath();
+//        QString filename = fi->absFilePath();
+        QString filename = fi->absFilePath().utf8();
         if (fi->isDir())
             BuildFileList(db, filename, video_files, imageExtensions);
         else
diff -Naur ./orig/metadata.cpp ./patched/metadata.cpp
--- ./orig/metadata.cpp	2004-09-09 16:48:03.000000000 +0200
+++ ./patched/metadata.cpp	2004-09-10 23:46:57.000000000 +0200
@@ -467,7 +467,8 @@
     plot.replace(QRegExp("\""), QString("\\\""));
     rating.replace(QRegExp("\""), QString("\\\""));
     playcommand.replace(QRegExp("\""), QString("\\\""));
-    QString sqlfilename = filename;
+//    QString sqlfilename = filename;
+    QString sqlfilename = filename.utf8();
     sqlfilename.replace(QRegExp("\""), QString("\\\""));
 
     QString sqlcoverfile = coverfile;


More information about the mythtv-dev mailing list