From f9005f7cddd9c81d66355b5d8ce5b0e70d0970bd Mon Sep 17 00:00:00 2001
From: kdh8219 <kdh8219@firemail.cc>
Date: Fri, 22 Dec 2023 22:03:06 +0900
Subject: [PATCH] =?UTF-8?q?feat(choose=5Fsentence):=20=EB=94=94=EB=A0=89?=
 =?UTF-8?q?=ED=86=A0=EB=A6=AC=20=EB=8B=A8=EC=9C=84=20sentence=20=ED=8C=8C?=
 =?UTF-8?q?=EC=9D=BC=20=EC=B6=94=EA=B0=80=20=EA=B8=B0=EB=8A=A5=20add(sente?=
 =?UTF-8?q?nces):=20sentence=20=EC=B6=94=EA=B0=80(=ED=85=8C=EB=A7=88?=
 =?UTF-8?q?=EB=B3=84=EB=A1=9C=20=EB=B6=84=EB=A6=AC,=20=EC=89=AC=EC=9A=B4?=
 =?UTF-8?q?=20=EC=BB=A4=EC=8A=A4=ED=85=80.)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .example.env                                  |  2 +-
 data/{sentences.txt => sentences/default.txt} |  2 ++
 data/sentences/hylasuwon.txt                  |  1 +
 data/sentences/worldcone_custom_emoji.txt     |  2 ++
 docker-compose.example.yml                    |  3 ++-
 src/choose_sentence.py                        | 27 ++++++++++++++-----
 6 files changed, 29 insertions(+), 8 deletions(-)
 rename data/{sentences.txt => sentences/default.txt} (94%)
 create mode 100644 data/sentences/hylasuwon.txt
 create mode 100644 data/sentences/worldcone_custom_emoji.txt

diff --git a/.example.env b/.example.env
index f12b746..05bc03b 100644
--- a/.example.env
+++ b/.example.env
@@ -1,4 +1,4 @@
 MISSKEY_INSTANCE_ADDRESS="worldc.one"
 MISSKEY_ACCESS_TOKEN="BWbGlK6lWuUgXQpFM7igtmbZ30g6BOIc" # it is just a sample
 
-SENTENCES_FILE="./data/sentences.txt" # Putting an absolute path is recommended
\ No newline at end of file
+SENTENCES_FILE="./data/sentences/sentences.txt" # Putting an absolute path is recommended
\ No newline at end of file
diff --git a/data/sentences.txt b/data/sentences/default.txt
similarity index 94%
rename from data/sentences.txt
rename to data/sentences/default.txt
index 88c6ebe..7d5d4df 100644
--- a/data/sentences.txt
+++ b/data/sentences/default.txt
@@ -1,3 +1,4 @@
+발 닦고 잠이나 쭉 자고 싶어요
 집에 가고 싶나요? 저도요...
 월드콘은 맛있습니다.
 오늘도 힘내세요!
@@ -11,6 +12,7 @@
 좋은 하루 입니다!
 좋은 하루 보내고 계신가요?
 ㅁㄴㅇㄹ
+asdf
 무슨 말을 할지 생각 중이에요.
 인간 시대의 끝이 도래했다.
 키보드 바꾸고 싶어요.
diff --git a/data/sentences/hylasuwon.txt b/data/sentences/hylasuwon.txt
new file mode 100644
index 0000000..839966e
--- /dev/null
+++ b/data/sentences/hylasuwon.txt
@@ -0,0 +1 @@
+수원청개구리는 멸종 위기에요!
\ No newline at end of file
diff --git a/data/sentences/worldcone_custom_emoji.txt b/data/sentences/worldcone_custom_emoji.txt
new file mode 100644
index 0000000..db97454
--- /dev/null
+++ b/data/sentences/worldcone_custom_emoji.txt
@@ -0,0 +1,2 @@
+:dlcool:
+:ablobcatdundundun:
\ No newline at end of file
diff --git a/docker-compose.example.yml b/docker-compose.example.yml
index 645a0ee..6a3a3bb 100644
--- a/docker-compose.example.yml
+++ b/docker-compose.example.yml
@@ -8,6 +8,7 @@ services:
     environment:
       - MISSKEY_INSTANCE_ADDRESS=worldc.one
       - MISSKEY_ACCESS_TOKEN=BWbGlK6lWuUgXQpFM7igtmbZ30g6BOIc
-      - SENTENCES_FILE=/data/sentences.txt
+      # - SENTENCES_FILE=/data/sentences.txt
+      - SENTENCES_DIRECTORY=/data/sentences/
     volumes:
       - ./data:/data
diff --git a/src/choose_sentence.py b/src/choose_sentence.py
index 99a2380..93a0bd3 100644
--- a/src/choose_sentence.py
+++ b/src/choose_sentence.py
@@ -1,17 +1,32 @@
 import random
 import os
 import sys
+from glob import glob
 
 from dotenv import load_dotenv
 
 load_dotenv() 
 
-try:
-    with open(os.environ["SENTENCES_FILE"], "r") as f:
-        _sentences = f.readlines()
-except:
-    e = sys.exc_info()[1]
-    _sentences = [f"에러발생(진짜임): {e}"]
+_sentences=[]
+# try:
+sentence_files=[]
+if os.environ.get("SENTENCES_FILE") and os.path.isfile(os.environ["SENTENCES_FILE"]):
+    sentence_files.append(os.environ["SENTENCE_FILES"])
+    
+if os.environ.get("SENTENCES_DIRECTORY") and os.path.isdir(os.environ["SENTENCES_DIRECTORY"]):
+    sentence_files.extend(glob(f'{os.environ["SENTENCES_DIRECTORY"]}*.txt'))
+    # for (dirpath, dirnames, filenames) in os.walk(os.environ["SENTENCES_DIRECTORY"]):
+    #     for filename in filenames:
+    #         sentence_files.append(filename)
+
+print(sentence_files)
+
+for sentence_file in sentence_files:
+    with open(sentence_file, "r") as f:
+        _sentences.extend(f.readlines())
+# except:
+#     e = sys.exc_info()[1]
+#     _sentences = [f"에러발생(진짜임): {e}"]
 
 # choose random sentence in google spread sheet
 def chooseSentence() -> str: