ubuntu-touch-coreapps-reviewers team mailing list archive

[Victor Thompson <victor.thompson@xxxxxxxxx>]

Victor Thompson has proposed merging lp:~vthompson/music-app/fix-1465764 into lp:music-app.

Commit message:
Fix unicode issues

Requested reviews:
  Music App Developers (music-app-dev)
Related bugs:
  Bug #1465764 in Ubuntu Music App: "Library not always available"
  https://bugs.launchpad.net/music-app/+bug/1465764

For more details, see:
https://code.launchpad.net/~vthompson/music-app/fix-1465764/+merge/262172

Fix unicode issues
-- 
Your team Music App Developers is requested to review the proposed merge of lp:~vthompson/music-app/fix-1465764 into lp:music-app.

=== modified file 'app/logic/meta-database.js'
--- app/logic/meta-database.js	2015-06-02 05:01:05 +0000
+++ app/logic/meta-database.js	2015-06-17 02:16:47 +0000
@@ -156,8 +156,15 @@
     db.transaction( function(tx) {
         var rs = tx.executeSql("SELECT * FROM queue ORDER BY ind ASC");
         for(var i = 0; i < rs.rows.length; i++) {
-            if (musicStore.lookup(decodeURIComponent(rs.rows.item(i).filename)) != null) {
-                res.push(makeDict(musicStore.lookup(decodeURIComponent(rs.rows.item(i).filename))));
+            try {
+                if (musicStore.lookup(decodeURIComponent(rs.rows.item(i).filename)) != null) {
+                    res.push(makeDict(musicStore.lookup(decodeURIComponent(rs.rows.item(i).filename))));
+                }
+            } catch (e) {
+                console.log("Unicode Error: ", rs.rows.item(i).filename, e.message)
+                if (musicStore.lookup(rs.rows.item(i).filename) != null) {
+                    res.push(makeDict(musicStore.lookup(rs.rows.item(i).filename)));
+                }
             }
         }
     });