KBlueLeaf commited on
Commit
0974aba
1 Parent(s): 81fb9bf

Update database

Browse files
Files changed (2) hide show
  1. danbooru2023.db +2 -2
  2. db.py +17 -7
danbooru2023.db CHANGED
@@ -1,3 +1,3 @@
1
  version https://git-lfs.github.com/spec/v1
2
- oid sha256:11b517386a6a1c46d3a0dbf2c6241f40df8a3a1e5fd35eda428958b88276f852
3
- size 6053670912
 
1
  version https://git-lfs.github.com/spec/v1
2
+ oid sha256:f1f5a70ad1d6c49e048c8ede2cc0b257e462197876fefb2edd05f92484458d34
3
+ size 9802588160
db.py CHANGED
@@ -1,4 +1,3 @@
1
- import json
2
  import pathlib
3
  import sqlite3
4
  from peewee import *
@@ -38,18 +37,27 @@ class SqliteMemDatabase(SqliteDatabase):
38
 
39
  # db = SqliteMemDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
40
  db = SqliteDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
 
 
 
 
 
 
 
41
 
42
 
43
  class TagListField(TextField):
44
  def db_value(self, value):
 
 
45
  assert all(isinstance(tag, (Tag, int)) for tag in value)
46
- return json.dumps([tag.id if isinstance(tag, Tag) else tag for tag in value])
47
 
48
  def python_value(self, value):
49
  if value is not None:
50
- id_list = json.loads(value)
51
- tags = Tag.select().where(Tag.id << id_list)
52
- return [tag for tag in tags]
53
 
54
 
55
  class BaseModel(Model):
@@ -112,5 +120,7 @@ class Tag(BaseModel):
112
 
113
  if __name__ == "__main__":
114
  db.connect()
115
- db.create_tables([Post, Tag])
116
- db.save()
 
 
 
 
1
  import pathlib
2
  import sqlite3
3
  from peewee import *
 
37
 
38
  # db = SqliteMemDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
39
  db = SqliteDatabase(pathlib.Path(__file__).parent.resolve() / "danbooru2023.db")
40
+ tag_cache_map = {}
41
+
42
+
43
+ def get_tag_by_id(id):
44
+ if id not in tag_cache_map:
45
+ tag_cache_map[id] = Tag.get_by_id(id)
46
+ return tag_cache_map[id]
47
 
48
 
49
  class TagListField(TextField):
50
  def db_value(self, value):
51
+ if isinstance(value, str):
52
+ return value
53
  assert all(isinstance(tag, (Tag, int)) for tag in value)
54
+ return "".join(f"${tag.id if isinstance(tag, Tag) else tag}#" for tag in value)
55
 
56
  def python_value(self, value):
57
  if value is not None:
58
+ return [
59
+ get_tag_by_id(int(tag, 36)) for tag in value[1:-1].split("#$") if tag
60
+ ]
61
 
62
 
63
  class BaseModel(Model):
 
120
 
121
  if __name__ == "__main__":
122
  db.connect()
123
+ for index in db.get_indexes("post"):
124
+ print(index)
125
+ # db.create_tables([Post, Tag])
126
+ # db.save()