From 31333d322cd3f8b89fcf3a67c2fb8a41553450b3 Mon Sep 17 00:00:00 2001
From: sctop <2094880085@qq.com>
Date: Sun, 14 Jan 2024 01:09:00 +0800
Subject: [PATCH] Bug fixes 2024/01/14

- _loader.py sort_by_int
- story.py now exports namespace
- character.used_by bug fix
- CharacterLoader auto_include added
---
 data_model/actual_data/character.py | 2 +-
 data_model/actual_data/story.py     | 2 ++
 data_model/loader/_loader.py        | 5 ++++-
 data_model/loader/folder_loader.py  | 5 +++++
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/data_model/actual_data/character.py b/data_model/actual_data/character.py
index 5db5c9d..fddf241 100644
--- a/data_model/actual_data/character.py
+++ b/data_model/actual_data/character.py
@@ -100,7 +100,7 @@ def to_json(self, no_used_by: bool = True):
             self.data_background_direct.get_counter_with_data_sorted_by_counter(),
             ["filename"])
         d["data_background_by_comm"] = counter_dict_sorter(
-            self.data_background_direct.get_counter_with_data_sorted_by_counter(),
+            self.data_background_by_comm.get_counter_with_data_sorted_by_counter(),
             ["filename"])
         d["data_character"] = counter_dict_sorter(self.data_character.get_counter_with_data_sorted_by_counter(),
                                                   [["name", "path_name"], ["name", "en"]])
diff --git a/data_model/actual_data/story.py b/data_model/actual_data/story.py
index 3d898f0..091599d 100644
--- a/data_model/actual_data/story.py
+++ b/data_model/actual_data/story.py
@@ -158,6 +158,7 @@ def to_json(self):
         t = {
             "uuid": self.uuid,
             "filetype": self.filetype,
+            "namespace": self.namespace,
 
             "name": self.name.to_json_basic(),
             "desc": [i for i in self.desc.to_json_basic()],
@@ -317,6 +318,7 @@ def to_json(self):
         t = {
             "uuid": self.uuid,
             "filetype": self.filetype,
+            "namespace": self.namespace,
 
             "name": self.name.to_json_basic(),
             "desc": [i for i in self.desc.to_json_basic()],
diff --git a/data_model/loader/_loader.py b/data_model/loader/_loader.py
index 09a1a66..4884006 100644
--- a/data_model/loader/_loader.py
+++ b/data_model/loader/_loader.py
@@ -81,7 +81,10 @@ def auto_include(self):
 
     @staticmethod
     def sort_by_int(item):
-        return int(item[:-5])
+        try:
+            return str(int(item[:-5])).rjust(3, "0")
+        except ValueError:
+            return item
 
     def process(self):
         from .loader_detect import get_loader_by_filepath
diff --git a/data_model/loader/folder_loader.py b/data_model/loader/folder_loader.py
index a32c469..1422948 100644
--- a/data_model/loader/folder_loader.py
+++ b/data_model/loader/folder_loader.py
@@ -239,6 +239,11 @@ def to_json_basic(self):
             pass
         return d
 
+    def auto_include(self):
+        temp = super().auto_include()
+        temp.sort(key=self.sort_by_int)
+        return temp
+
 
 class AlbumLoader(GenericFolder):
     def __init__(self, namespace: list, basepath, json_data=None, parent_data=None):