From 948da5558cea4081a9ea097319326af519567be4 Mon Sep 17 00:00:00 2001 From: Sewon Ahn Date: Tue, 17 Nov 2020 12:54:28 +0900 Subject: [PATCH 1/2] Add ignore and fix bugs --- distribusi/distribusi/fregments.py | 29 ++++++++--- distribusi/test.py | 5 +- fregments_index.json => index.json | 45 ++++-------------- test_data/.ignore | 3 ++ .../event_lecture}/event_0000.meta | 0 ...7_121248643124584_872058020963845448_n.jpg | Bin ...1_121248626457919_479957910997498417_n.jpg | Bin ..._121248659791249_2342598949363915450_n.jpg | Bin .../event_lecture}/event_0001.meta | 0 .../event_lecture/event_0001/event_0001.txt | 26 ++++++++++ .../event_workshop}/event_0008.meta | 0 11 files changed, 62 insertions(+), 46 deletions(-) rename fregments_index.json => index.json (79%) create mode 100644 test_data/.ignore rename {events => test_data/event_lecture}/event_0000.meta (100%) rename {events => test_data/event_lecture}/event_0000/124157237_121248643124584_872058020963845448_n.jpg (100%) rename {events => test_data/event_lecture}/event_0000/124469821_121248626457919_479957910997498417_n.jpg (100%) rename {events => test_data/event_lecture}/event_0000/124476076_121248659791249_2342598949363915450_n.jpg (100%) rename {events => test_data/event_lecture}/event_0001.meta (100%) create mode 100644 test_data/event_lecture/event_0001/event_0001.txt rename {events => test_data/event_workshop}/event_0008.meta (100%) diff --git a/distribusi/distribusi/fregments.py b/distribusi/distribusi/fregments.py index ab2a46f..2a5e25c 100644 --- a/distribusi/distribusi/fregments.py +++ b/distribusi/distribusi/fregments.py @@ -18,19 +18,32 @@ class Fregment: class Fregments: def __init__(self): + self.json_data = {} self.index = {} self.indextable = [] self.timetable = [] + self.ignore = ['.ignore'] - self.config_file = 'config.json' - self.index_file = 'fregments_index.json' + self.ignore_file = '.ignore' + self.index_file = 'index.json' - with open(self.index_file) as json_file: - self.json_data = json.load(json_file) + if os.path.isfile(self.index_file): + with open(self.index_file) as json_file: + self.json_data = json.load(json_file) self.temp_data = {"fregments":[]} self.count = len(self.json_data) + def add_ignore(self, directory): + ignore_path = os.path.join(directory, self.ignore_file) + if os.path.isfile(ignore_path): + ignore = open(ignore_path, 'r') + ignore_lines = ignore.readlines() + for line in ignore_lines: + stripped_line = line.rstrip() + self.ignore.append(stripped_line) + print(self.ignore) + def creation_date(self, path_to_file): """ Try to get the date that a file was created, falling back to when it was @@ -55,7 +68,9 @@ class Fregments: if occupation > -1: origin_path = os.path.join(directory, file) date = self.creation_date(origin_path) - arr = directory.split("/") + arr = directory\ + .split("/") + print(directory) if arr.__len__() == 2: artist = arr[1] else: @@ -80,6 +95,7 @@ class Fregments: def preindex(self, directory): for root, dirs, files in os.walk(directory): + self.add_ignore(root) arr = root.split("/") # 2뎁스까지만 인덱스 함. if arr.__len__() < 4: @@ -87,12 +103,13 @@ class Fregments: for f in files: if self.is_meta(f): pass - elif f == "index.html" or f == ".DS_Store": + elif f in self.ignore: pass elif self.has_meta(root, f): self.occupancy(root, f) else: self.add_timetable(root, f) + if arr.__len__() > 2 and arr[2]: # dirs index for d in dirs: if self.has_meta(root, d): diff --git a/distribusi/test.py b/distribusi/test.py index fda468f..ac224dd 100644 --- a/distribusi/test.py +++ b/distribusi/test.py @@ -7,15 +7,12 @@ from distribusi.distribusi import build_index parser = build_argparser() args = parser.parse_args() -event_path = './events' -data_path = './test_data' +data_path = args.directory freg = fregments.Fregments() -freg.preindex(event_path) freg.preindex(data_path) freg.postindex() -distribusify(args, event_path, freg) distribusify(args, data_path, freg) build_index(args, data_path, freg) \ No newline at end of file diff --git a/fregments_index.json b/index.json similarity index 79% rename from fregments_index.json rename to index.json index 7ae0cc3..6ee5f74 100644 --- a/fregments_index.json +++ b/index.json @@ -2,18 +2,18 @@ { "__Fregment__": { "index": 0, - "update": 1605171358.9636276, - "directory": "./events", - "artist": "events", + "update": 1605581893.2526722, + "directory": "./test_data/event_lecture", + "artist": "event_lecture", "file": "event_0000" } }, { "__Fregment__": { "index": 1, - "update": 1605171365.1618817, - "directory": "./events", - "artist": "events", + "update": 1605584344.6146529, + "directory": "./test_data/event_lecture", + "artist": "event_lecture", "file": "event_0001" } }, @@ -74,9 +74,9 @@ { "__Fregment__": { "index": 8, - "update": 1605171377.7292128, - "directory": "./events", - "artist": "events", + "update": 1605581893.2483907, + "directory": "./test_data/event_workshop", + "artist": "event_workshop", "file": "event_0008" } }, @@ -187,32 +187,5 @@ "artist": "fig", "file": "fig002.txt" } - }, - { - "__Fregment__": { - "index": 21, - "update": 1605170712.9904313, - "directory": "./events/event_0000", - "artist": "event_0000", - "file": "124469821_121248626457919_479957910997498417_n.jpg" - } - }, - { - "__Fregment__": { - "index": 22, - "update": 1605170736.042438, - "directory": "./events/event_0000", - "artist": "event_0000", - "file": "124157237_121248643124584_872058020963845448_n.jpg" - } - }, - { - "__Fregment__": { - "index": 23, - "update": 1605170741.7326746, - "directory": "./events/event_0000", - "artist": "event_0000", - "file": "124476076_121248659791249_2342598949363915450_n.jpg" - } } ] \ No newline at end of file diff --git a/test_data/.ignore b/test_data/.ignore new file mode 100644 index 0000000..90bb3c2 --- /dev/null +++ b/test_data/.ignore @@ -0,0 +1,3 @@ +.DS_Store +index.html +404.html \ No newline at end of file diff --git a/events/event_0000.meta b/test_data/event_lecture/event_0000.meta similarity index 100% rename from events/event_0000.meta rename to test_data/event_lecture/event_0000.meta diff --git a/events/event_0000/124157237_121248643124584_872058020963845448_n.jpg b/test_data/event_lecture/event_0000/124157237_121248643124584_872058020963845448_n.jpg similarity index 100% rename from events/event_0000/124157237_121248643124584_872058020963845448_n.jpg rename to test_data/event_lecture/event_0000/124157237_121248643124584_872058020963845448_n.jpg diff --git a/events/event_0000/124469821_121248626457919_479957910997498417_n.jpg b/test_data/event_lecture/event_0000/124469821_121248626457919_479957910997498417_n.jpg similarity index 100% rename from events/event_0000/124469821_121248626457919_479957910997498417_n.jpg rename to test_data/event_lecture/event_0000/124469821_121248626457919_479957910997498417_n.jpg diff --git a/events/event_0000/124476076_121248659791249_2342598949363915450_n.jpg b/test_data/event_lecture/event_0000/124476076_121248659791249_2342598949363915450_n.jpg similarity index 100% rename from events/event_0000/124476076_121248659791249_2342598949363915450_n.jpg rename to test_data/event_lecture/event_0000/124476076_121248659791249_2342598949363915450_n.jpg diff --git a/events/event_0001.meta b/test_data/event_lecture/event_0001.meta similarity index 100% rename from events/event_0001.meta rename to test_data/event_lecture/event_0001.meta diff --git a/test_data/event_lecture/event_0001/event_0001.txt b/test_data/event_lecture/event_0001/event_0001.txt new file mode 100644 index 0000000..eef1ee9 --- /dev/null +++ b/test_data/event_lecture/event_0001/event_0001.txt @@ -0,0 +1,26 @@ +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 +이벤트 0001 에 대한 설명문 + + diff --git a/events/event_0008.meta b/test_data/event_workshop/event_0008.meta similarity index 100% rename from events/event_0008.meta rename to test_data/event_workshop/event_0008.meta From ffa95a9d2c9ed71460f47bfcad1e748d5579327b Mon Sep 17 00:00:00 2001 From: Sewon Ahn Date: Tue, 17 Nov 2020 12:59:16 +0900 Subject: [PATCH 2/2] Remove print --- distribusi/distribusi/fregments.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/distribusi/distribusi/fregments.py b/distribusi/distribusi/fregments.py index 2a5e25c..3f0c337 100644 --- a/distribusi/distribusi/fregments.py +++ b/distribusi/distribusi/fregments.py @@ -42,7 +42,6 @@ class Fregments: for line in ignore_lines: stripped_line = line.rstrip() self.ignore.append(stripped_line) - print(self.ignore) def creation_date(self, path_to_file): """ @@ -70,7 +69,6 @@ class Fregments: date = self.creation_date(origin_path) arr = directory\ .split("/") - print(directory) if arr.__len__() == 2: artist = arr[1] else: