Merge remote-tracking branch 'track/master' into dev

CHANGELOG.rst

@@ -1,3 +1,21 @@
+v1.0.3 (2014-06-10)
+===================
+
+* Fix #14 Chinese filename problem
+
+
+v1.0.2 (2014-06-10)
+===================
+
+* Fix #13 system path separator problem on Windows
+
+
+v1.0.1 (2014-06-10)
+===================
+
+* Fix serious problem using rsync
+
+
 v1.0.0 (2014-05-28)
 ===================
 

simiki/__init__.py

@@ -1,4 +1,4 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-__version__ = "1.0.0"
+__version__ = "1.0.3"

simiki/cli.py

@@ -51,7 +51,7 @@ def param_of_create_wiki(title, category, filename):
     """Get parameters of creating wiki page"""
     if not filename:
         # `/` can't exists in filename
-        title_ = title.decode("utf-8").replace("/", " slash ")
+        title_ = title.decode("utf-8").replace(os.sep, " slash ")
         filename = "{}.md".format("-".join(title_.split()).lower())
     cur_date = datetime.datetime.now().strftime("%Y-%m-%d %H:%M")
     title = title.decode("utf-8")

simiki/generators.py

@@ -217,7 +217,8 @@ def get_content_structure_and_metadata(self):
         dct = {}
         for path, meta in self.pages.items():
             p = dct
-            for x in path.split('/'):
+            for x in path.split(os.sep):
+                x = unicode(x, "utf-8")
                 if ".md" in x:
                     meta["name"] = osp.splitext(x)[0]
                     p = p.setdefault(x, meta)