Fix wrong encoding for tag list field
Browse files
db.py
CHANGED
@@ -1,44 +1,12 @@
|
|
1 |
import pathlib
|
2 |
import sqlite3
|
3 |
|
|
|
4 |
from peewee import *
|
5 |
from playhouse.sqlite_ext import FTS5Model, SearchField
|
6 |
from playhouse.shortcuts import model_to_dict
|
7 |
|
8 |
|
9 |
-
class MemoryConnection(sqlite3.Connection):
|
10 |
-
def __init__(self, dbname, *args, **kwargs):
|
11 |
-
load_conn = sqlite3.connect(dbname)
|
12 |
-
super(MemoryConnection, self).__init__(":memory:", *args, **kwargs)
|
13 |
-
load_conn.backup(self)
|
14 |
-
load_conn.close()
|
15 |
-
|
16 |
-
|
17 |
-
class SqliteMemDatabase(SqliteDatabase):
|
18 |
-
def __init__(self, database, *args, **kwargs) -> None:
|
19 |
-
self.dbname = database
|
20 |
-
super().__init__(database, *args, factory=MemoryConnection, **kwargs)
|
21 |
-
|
22 |
-
def reload(self, dbname=None):
|
23 |
-
if dbname is None:
|
24 |
-
dbname = self.dbname
|
25 |
-
load_conn = sqlite3.connect(dbname)
|
26 |
-
try:
|
27 |
-
load_conn.backup(self._state.conn)
|
28 |
-
finally:
|
29 |
-
load_conn.close()
|
30 |
-
|
31 |
-
def save(self, dbname=None):
|
32 |
-
if dbname is None:
|
33 |
-
dbname = self.dbname
|
34 |
-
save_conn = sqlite3.connect(dbname)
|
35 |
-
try:
|
36 |
-
self._state.conn.backup(save_conn)
|
37 |
-
finally:
|
38 |
-
save_conn.close()
|
39 |
-
|
40 |
-
|
41 |
-
# db = SqliteMemDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
|
42 |
db = SqliteDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
|
43 |
tag_cache_map = {}
|
44 |
|
@@ -54,7 +22,10 @@ class TagListField(TextField, SearchField):
|
|
54 |
if isinstance(value, str):
|
55 |
return value
|
56 |
assert all(isinstance(tag, (Tag, int)) for tag in value)
|
57 |
-
return "".join(
|
|
|
|
|
|
|
58 |
|
59 |
def python_value(self, value):
|
60 |
if value is not None:
|
@@ -152,28 +123,10 @@ class Tag(BaseModel):
|
|
152 |
def __str__(self):
|
153 |
return f"<Tag: {self.name}>"
|
154 |
|
155 |
-
class TagWiki(Model):
|
156 |
-
id = IntegerField(primary_key=True)
|
157 |
-
title = CharField(unique=True)
|
158 |
-
body = TextField()
|
159 |
-
created_at = DateTimeField()
|
160 |
-
updated_at = DateTimeField()
|
161 |
-
is_locked = BooleanField()
|
162 |
-
is_deleted = BooleanField()
|
163 |
-
other_names = TextField()
|
164 |
-
tag_id = IntegerField(unique=True)
|
165 |
-
|
166 |
-
class Meta:
|
167 |
-
table_name = "tag_wikis"
|
168 |
-
database = db
|
169 |
|
170 |
if __name__ == "__main__":
|
171 |
-
#from objprint import objprint
|
172 |
-
|
173 |
db.connect()
|
174 |
for index in db.get_indexes("post"):
|
175 |
print(index)
|
176 |
post = Post.select().first()
|
177 |
-
|
178 |
-
# db.create_tables([Post, Tag])
|
179 |
-
# db.save()
|
|
|
1 |
import pathlib
|
2 |
import sqlite3
|
3 |
|
4 |
+
from numpy import base_repr
|
5 |
from peewee import *
|
6 |
from playhouse.sqlite_ext import FTS5Model, SearchField
|
7 |
from playhouse.shortcuts import model_to_dict
|
8 |
|
9 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
10 |
db = SqliteDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
|
11 |
tag_cache_map = {}
|
12 |
|
|
|
22 |
if isinstance(value, str):
|
23 |
return value
|
24 |
assert all(isinstance(tag, (Tag, int)) for tag in value)
|
25 |
+
return "".join(
|
26 |
+
f"${base_repr(tag.id, 36) if isinstance(tag, Tag) else tag}#"
|
27 |
+
for tag in value
|
28 |
+
)
|
29 |
|
30 |
def python_value(self, value):
|
31 |
if value is not None:
|
|
|
123 |
def __str__(self):
|
124 |
return f"<Tag: {self.name}>"
|
125 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
126 |
|
127 |
if __name__ == "__main__":
|
|
|
|
|
128 |
db.connect()
|
129 |
for index in db.get_indexes("post"):
|
130 |
print(index)
|
131 |
post = Post.select().first()
|
132 |
+
print(model_to_dict(post))
|
|
|
|