提交 8a3bbbcc 编写于 作者: M Mars Liu

fixed odd orders

上级 e14884d6
...@@ -119,7 +119,8 @@ class TreeWalker: ...@@ -119,7 +119,8 @@ class TreeWalker:
level_path = os.path.join(self.root, level) level_path = os.path.join(self.root, level)
num, config = self.load_level_node(level_path) num, config = self.load_level_node(level_path)
levels.append((num, config)) levels.append((num, config))
levels.sort(key=lambda item: item[0])
levels = self.resort_children(self.root, levels)
root_node["children"] = [item[1] for item in levels] root_node["children"] = [item[1] for item in levels]
return root_node return root_node
...@@ -145,7 +146,7 @@ class TreeWalker: ...@@ -145,7 +146,7 @@ class TreeWalker:
num, chapter = self.load_chapter_node(full_name) num, chapter = self.load_chapter_node(full_name)
chapters.append((num, chapter)) chapters.append((num, chapter))
chapters.sort(key=lambda item: item[0]) chapters = self.resort_children(base, chapters)
level_node["children"] = [item[1] for item in chapters] level_node["children"] = [item[1] for item in chapters]
return level_node return level_node
...@@ -157,10 +158,21 @@ class TreeWalker: ...@@ -157,10 +158,21 @@ class TreeWalker:
num, section = self.load_section_node(full_name) num, section = self.load_section_node(full_name)
sections.append((num, section)) sections.append((num, section))
sections.sort(key=lambda item: item[0]) sections = self.resort_children(base, sections)
chapter_node["children"] = [item[1] for item in sections] chapter_node["children"] = [item[1] for item in sections]
return chapter_node return chapter_node
def resort_children(self, base, children):
children.sort(key=lambda item: item[0])
for index, [number, element] in enumerate(children):
title = list(element.keys())[0]
origin = os.path.join(base, f"{number}.{title}")
posted = os.path.join(base, f"{index+1}.{title}")
if origin != posted:
self.logger.info(f"rename [{origin}] to [{posted}]")
os.rename(origin, posted)
return children
def ensure_chapters(self): def ensure_chapters(self):
for subdir in os.listdir(self.root): for subdir in os.listdir(self.root):
self.ensure_level_config(subdir) self.ensure_level_config(subdir)
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册