Fix typo
This commit is contained in:
Hyunchul Kim
parent
970a40c6f6
commit
89354ca1a3
4 changed files with 46 additions and 46 deletions
|
|
@ -10,7 +10,7 @@ import markdown
|
|||
|
||||
from distribusi.page_template import html_footer, html_head
|
||||
from distribusi.mappings import CODE_TYPES, FILE_TYPES, SUB_TYPES
|
||||
from distribusi import fregments
|
||||
from distribusi import fragments
|
||||
|
||||
|
||||
|
||||
|
|
@ -128,7 +128,7 @@ def distribusify(args, directory, freg): # noqa
|
|||
files.sort()
|
||||
|
||||
#
|
||||
# fregments index
|
||||
# fragments index
|
||||
# 작가 폴더 내인 경우 아티스트명 저장
|
||||
#
|
||||
path = root.split('/')
|
||||
|
|
@ -238,12 +238,12 @@ def distribusify(args, directory, freg): # noqa
|
|||
|
||||
def build_index(args, directory, freg):
|
||||
#
|
||||
# fregments index
|
||||
# fragments index
|
||||
# 임시 데이터 저장
|
||||
#
|
||||
print("--------- Build main index --------------")
|
||||
html = []
|
||||
freg_data = freg.get_fregments()
|
||||
freg_data = freg.get_fragments()
|
||||
for f in freg_data:
|
||||
index = "{}".format(f.index)
|
||||
url = "/{}/#{} ".format(f.artist, index.zfill(4))
|
||||
|
|
|
|||
|
|
@ -4,7 +4,7 @@ import json
|
|||
from operator import itemgetter
|
||||
|
||||
|
||||
class Fregment:
|
||||
class Fragment:
|
||||
def __init__(self, index, update, directory, artist, file):
|
||||
self.index = index
|
||||
self.update = update
|
||||
|
|
@ -16,19 +16,19 @@ class Fregment:
|
|||
return repr((self.index, self.update, self.directory, self.artist, self.file))
|
||||
|
||||
|
||||
class Fregments:
|
||||
class Fragments:
|
||||
def __init__(self):
|
||||
self.index = {}
|
||||
self.indextable = []
|
||||
self.timetable = []
|
||||
|
||||
self.config_file = 'config.json'
|
||||
self.index_file = 'fregments_index.json'
|
||||
self.index_file = 'fragments_index.json'
|
||||
|
||||
with open(self.index_file) as json_file:
|
||||
self.json_data = json.load(json_file)
|
||||
|
||||
self.temp_data = {"fregments":[]}
|
||||
self.temp_data = {"fragments":[]}
|
||||
self.count = len(self.json_data)
|
||||
|
||||
def creation_date(self, path_to_file):
|
||||
|
|
@ -60,7 +60,7 @@ class Fregments:
|
|||
artist = arr[1]
|
||||
else:
|
||||
artist = arr[2]
|
||||
self.index[occupation] = Fregment(occupation, date, directory, artist, file)
|
||||
self.index[occupation] = Fragment(occupation, date, directory, artist, file)
|
||||
|
||||
def is_meta(self, file):
|
||||
fa = file.split(".")
|
||||
|
|
@ -101,7 +101,7 @@ class Fregments:
|
|||
self.add_timetable(root, d)
|
||||
|
||||
def postindex(self):
|
||||
self.timetable = sorted(self.timetable, key=lambda fregment: fregment.update)
|
||||
self.timetable = sorted(self.timetable, key=lambda fragment: fragment.update)
|
||||
print("----------- INDEXING ------------")
|
||||
# indexing
|
||||
for f in self.timetable:
|
||||
|
|
@ -114,7 +114,7 @@ class Fregments:
|
|||
self.indextable = []
|
||||
for f in self.index:
|
||||
self.indextable.append(self.index[f])
|
||||
self.indextable = sorted(self.indextable, key=lambda fregment: fregment.index)
|
||||
self.indextable = sorted(self.indextable, key=lambda fragment: fragment.index)
|
||||
|
||||
def get_lastindex(self):
|
||||
last = 0
|
||||
|
|
@ -130,34 +130,34 @@ class Fregments:
|
|||
arr = directory.split("/")
|
||||
if arr.__len__() > 2:
|
||||
artist = arr[2]
|
||||
self.timetable.append(Fregment(-1, date, directory, artist, file))
|
||||
self.timetable.append(Fragment(-1, date, directory, artist, file))
|
||||
|
||||
'''
|
||||
# [deprecated] preindex 하기 전 소소
|
||||
def add(self, artist, fregment):
|
||||
def add(self, artist, fragment):
|
||||
temp = {
|
||||
"index" : 0,
|
||||
"update" : 0,
|
||||
"file" : {
|
||||
"artist": artist,
|
||||
"fregment": fregment
|
||||
"fragment": fragment
|
||||
}
|
||||
}
|
||||
|
||||
added = False
|
||||
for f in self.json_data['fregments']:
|
||||
for f in self.json_data['fragments']:
|
||||
# 기존 조각과 비교
|
||||
if f['file'] == temp['file']:
|
||||
added = True
|
||||
|
||||
if added:
|
||||
print("Already added - artist:", artist, ", fregment: ", fregment)
|
||||
print("Already added - artist:", artist, ", fragment: ", fragment)
|
||||
else:
|
||||
self.count = self.count + 1
|
||||
print("Add fregment - artist:", artist, ", fregment: ", fregment)
|
||||
print("Add fragment - artist:", artist, ", fragment: ", fragment)
|
||||
temp["index"] = self.count
|
||||
temp["update"] = int(time.time())
|
||||
self.temp_data['fregments'].append(temp)
|
||||
self.temp_data['fragments'].append(temp)
|
||||
'''
|
||||
|
||||
def save(self):
|
||||
|
|
@ -166,7 +166,7 @@ class Fregments:
|
|||
json.dump(self.indextable, outfile, indent=4, cls=CustomEncoder)
|
||||
self.count = len(self.indextable)
|
||||
|
||||
def get_fregments(self):
|
||||
def get_fragments(self):
|
||||
return self.indextable
|
||||
|
||||
def get_count(self):
|
||||
|
|
@ -184,4 +184,4 @@ class CustomEncoder(json.JSONEncoder):
|
|||
return {'__{}__'.format(o.__class__.__name__): o.__dict__}
|
||||
|
||||
if __name__ == "__main__":
|
||||
freg = Fregments()
|
||||
freg = Fragments()
|
||||
|
|
@ -1,7 +1,7 @@
|
|||
# Added by Hyunchul
|
||||
# 2020. 10. 26
|
||||
from distribusi.cli import build_argparser, distribusify
|
||||
from distribusi import fregments
|
||||
from distribusi import fragments
|
||||
from distribusi.distribusi import build_index
|
||||
|
||||
parser = build_argparser()
|
||||
|
|
@ -10,7 +10,7 @@ args = parser.parse_args()
|
|||
event_path = './events'
|
||||
data_path = './test_data'
|
||||
|
||||
freg = fregments.Fregments()
|
||||
freg = fragments.Fragments()
|
||||
freg.preindex(event_path)
|
||||
freg.preindex(data_path)
|
||||
freg.postindex()
|
||||
|
|
|
|||
|
|
@ -1,6 +1,6 @@
|
|||
[
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 0,
|
||||
"update": 1605171358.9636276,
|
||||
"directory": "./events",
|
||||
|
|
@ -9,7 +9,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 1,
|
||||
"update": 1605171365.1618817,
|
||||
"directory": "./events",
|
||||
|
|
@ -18,7 +18,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 2,
|
||||
"update": 1603870906.290785,
|
||||
"directory": "./test_data/carrot",
|
||||
|
|
@ -27,7 +27,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 3,
|
||||
"update": 1604043931.1111157,
|
||||
"directory": "./test_data/carrot",
|
||||
|
|
@ -36,7 +36,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 4,
|
||||
"update": 1604043931.1281314,
|
||||
"directory": "./test_data/carrot",
|
||||
|
|
@ -45,7 +45,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 5,
|
||||
"update": 1604043931.147918,
|
||||
"directory": "./test_data/fig",
|
||||
|
|
@ -54,7 +54,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 6,
|
||||
"update": 1604043931.1488578,
|
||||
"directory": "./test_data/fig",
|
||||
|
|
@ -63,7 +63,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 7,
|
||||
"update": 1604043931.238141,
|
||||
"directory": "./test_data/grape",
|
||||
|
|
@ -72,7 +72,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 8,
|
||||
"update": 1605171377.7292128,
|
||||
"directory": "./events",
|
||||
|
|
@ -81,7 +81,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 9,
|
||||
"update": 1604043931.259867,
|
||||
"directory": "./test_data/grape",
|
||||
|
|
@ -90,7 +90,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 10,
|
||||
"update": 1604043931.3548143,
|
||||
"directory": "./test_data/grape",
|
||||
|
|
@ -99,7 +99,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 11,
|
||||
"update": 1604043931.4324255,
|
||||
"directory": "./test_data/grape",
|
||||
|
|
@ -108,7 +108,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 12,
|
||||
"update": 1604043931.4409137,
|
||||
"directory": "./test_data/grape",
|
||||
|
|
@ -117,7 +117,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 13,
|
||||
"update": 1604050831.3844233,
|
||||
"directory": "./test_data/fig",
|
||||
|
|
@ -126,7 +126,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 14,
|
||||
"update": 1604053581.7941525,
|
||||
"directory": "./test_data/grape",
|
||||
|
|
@ -135,7 +135,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 15,
|
||||
"update": 1604054141.7061436,
|
||||
"directory": "./test_data/carrot",
|
||||
|
|
@ -144,7 +144,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 16,
|
||||
"update": 1604911149.3638797,
|
||||
"directory": "./test_data/fig",
|
||||
|
|
@ -153,7 +153,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 17,
|
||||
"update": 1604912196.730964,
|
||||
"directory": "./test_data/carrot",
|
||||
|
|
@ -162,7 +162,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 18,
|
||||
"update": 1604912200.5855331,
|
||||
"directory": "./test_data/carrot",
|
||||
|
|
@ -171,7 +171,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 19,
|
||||
"update": 1604915491.9132912,
|
||||
"directory": "./test_data/fig",
|
||||
|
|
@ -180,7 +180,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 20,
|
||||
"update": 1604915593.2194371,
|
||||
"directory": "./test_data/fig",
|
||||
|
|
@ -189,7 +189,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 21,
|
||||
"update": 1605170712.9904313,
|
||||
"directory": "./events/event_0000",
|
||||
|
|
@ -198,7 +198,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 22,
|
||||
"update": 1605170736.042438,
|
||||
"directory": "./events/event_0000",
|
||||
|
|
@ -207,7 +207,7 @@
|
|||
}
|
||||
},
|
||||
{
|
||||
"__Fregment__": {
|
||||
"__Fragment__": {
|
||||
"index": 23,
|
||||
"update": 1605170741.7326746,
|
||||
"directory": "./events/event_0000",
|
||||
Loading…
Reference in a new issue