From: Oleg Broytman <phd@phdru.name>
Date: Sat, 25 Jul 2015 16:13:02 +0000 (+0300)
Subject: Decode filename to unicode, encode to utf-8 for Insert
X-Git-Tag: v5.0.0~7
X-Git-Url: https://git.phdru.name/?p=xsetbg.git;a=commitdiff_plain;h=18151a095e176678f48555b53083c96c2b995501

Decode filename to unicode, encode to utf-8 for Insert
---

diff --git a/reload_db.py b/reload_db.py
index 060b05c..9dbbd02 100755
--- a/reload_db.py
+++ b/reload_db.py
@@ -32,12 +32,12 @@ with SQLiteMassInsert() as txn:
         id, timestamp, filename = line.strip().split(None, 2)
         id = convert_str(id)
         timestamp = convert_str(timestamp)
-        if fs_encoding != 'utf-8':
-            filename = filename.decode(fs_encoding).encode('utf-8')
+        filename = filename.decode(fs_encoding)
         try:
             row = xsetbg_db.byFull_name(filename)
         except SQLObjectNotFound:
-            values = {'last_shown': timestamp, 'full_name': filename}
+            values = {'last_shown': timestamp,
+                      'full_name': filename.encode('utf-8')}
             if id:
                 values['id'] = id
             query = txn.sqlrepr(Insert(xsetbg_db.sqlmeta.table, values=values))