Fix(inpx): Decode filenames to unicode

diff --git a/docs-ru/news.rst b/docs-ru/news.rst
index de42bd80f33920c4e4edd4d5dc2c5e16f129a452..c4411e52a29650c1a3ffcbf3fa732cf051aa14ed 100644 (file)
--- a/docs-ru/news.rst
+++ b/docs-ru/news.rst
@@ -1,6 +1,11 @@
 Новости
 =======
 
 Новости
 =======
 

+Version 0.1.2 (2018-05-??)
+--------------------------
+
+* Исправлен импорт INPX: сделано декодирование имён файлов в юникод.
+

 Version 0.1.1 (2018-05-17)
 --------------------------
 
 Version 0.1.1 (2018-05-17)
 --------------------------
 

diff --git a/docs/news.rst b/docs/news.rst
index cab0fb456161ba6cc2d02d9d799fe96b13a5f2fc..b69ef56bb4a1ff531e338130c71ed16caaeaa2c4 100644 (file)
--- a/docs/news.rst
+++ b/docs/news.rst
@@ -1,6 +1,11 @@
 News
 ====
 
 News
 ====
 

+Version 0.1.2 (2018-05-??)
+--------------------------
+
+* Fix inpx import: decode filenames to unicode.
+

 Version 0.1.1 (2018-05-17)
 --------------------------
 
 Version 0.1.1 (2018-05-17)
 --------------------------
 

diff --git a/m_librarian/inp.py b/m_librarian/inp.py
index 4b772aff703f050d69117e2ef1725eb575d157c8..f46bea62fe2a5270cb2075ec36fdb4ecd2f55df3 100644 (file)
--- a/m_librarian/inp.py
+++ b/m_librarian/inp.py
@@ -78,7 +78,7 @@ def import_inp(archive, inp):
     connection = sqlhub.processConnection
     for file, in connection.queryAll(connection.sqlrepr(
             Select(Book.q.file, Book.q.archive == archive))):
     connection = sqlhub.processConnection
     for file, in connection.queryAll(connection.sqlrepr(
             Select(Book.q.file, Book.q.archive == archive))):

-        files.add((archive, file))
+        files.add((archive, file.decode('utf-8')))

     for line in inp:
         line = line.decode('utf-8')
         _archive, parts = split_line(line)
     for line in inp:
         line = line.decode('utf-8')
         _archive, parts = split_line(line)


@@ -86,7 +86,7 @@ def import_inp(archive, inp):
             archives.add(_archive)
             for file, in connection.queryAll(connection.sqlrepr(
                     Select(Book.q.file, Book.q.archive == _archive))):
             archives.add(_archive)
             for file, in connection.queryAll(connection.sqlrepr(
                     Select(Book.q.file, Book.q.archive == _archive))):

-                files.add((_archive, file))
+                files.add((_archive, file.decode('utf-8')))

         file = parts[5]
         if (_archive or archive, file) not in files:
             files.add((_archive or archive, file))
         file = parts[5]
         if (_archive or archive, file) not in files:
             files.add((_archive or archive, file))