chore: Merge branch 'test' close #3

.git-commit-template.txt

@@ -0,0 +1,16 @@
+
+
+# number: 문제 id를 숫자로 작성
+# categories : 해당 문제의 유형을 ,로 구분하여 작성
+# tags : 해당 문제의 태그를 ,로 구분하여 작성
+# time : 해당 문제 풀이에 걸린 시간을 분단위 숫자로 작성
+# try : 해당 문제에 몇번의 시도를 했는지 숫자로 작성
+# help: 해당 문제에 외부의 도움을 받았는지 true/false로 작성
+# url : 해당 문제의 url을 작성
+number:
+categories: []
+tags: []
+time: 
+try: 
+help: false
+url: 

.github/workflows/test.yml

@@ -0,0 +1,36 @@
+name: algorithmAutoSorterTest
+on:
+  push:
+    branches: [ test ]
+
+jobs:
+  uploadToNotion:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Install python
+      uses: actions/setup-python@v2
+      with:
+        python-version: 3.x
+
+    - name: Install dependency
+      run: pip install -r requirements.txt
+
+    - name: Check commit messages
+      id: check_commit
+      run: |
+        if [[ $(git log -1 --pretty=format:%s) == *"solve"* ]]; then
+          echo "is_solve=true" >> $GITHUB_ENV
+        else
+          echo "is_solve=false" >> $GITHUB_ENV
+        fi
+
+    - name: sort-and-upload-request
+      if: env.is_solve == 'true'
+      env:
+        REQUEST_URL: ${{ secrets.REQUEST_URL}}
+        COMMIT_MSG: ${{github.event.head_commit.message}}
+        COMMIT_PATTERN: ${{vars.COMMIT_PATTERN}}
+      run: python requestNotionUpload.py

requestNotionUpload.py

@@ -4,35 +4,73 @@
 import re
 import dotenv
 import json
+import sys
 
 
 class Problem:
-    def __init__(self,title,id,lan,platform,level,url="",memo=""):
+
+    def __init__(self,title,lan,platform,level):
         self.title=title
-        self.id=id
         self.lan=lan
         self.platform=platform
         self.level=level
-        self.url=url
-        self.memo=memo
 
     def __str__(self):
-        return f"Title: {self.title}, ID: {self.id}, Language: {self.lan}, Platform: {self.platform}, Level: {self.level}, Memo: {self.memo}"
+        return f"Title: {self.title}, Language: {self.lan}, Platform: {self.platform}, Level: {self.level}"
 
-def request_notion_update(problem:Problem):
+def request_notion_update(body):
 
     try:
-        print(f"\nRequest add new file to notion db : {problem.id} {problem.title}...")
-        response=requests.post(REQUEST_URL,problem.__dict__)
+        print(f"\nRequest add new file to notion db...")
+        response=requests.post(REQUEST_URL,body)
         if response.status_code==200:
             print("Successfully request\n")
+            return True
         else:
             print(f"Request fail : {response.status_code} {response.text}\n")
+            return False
 
     except Exception as e:
         print("An error occurred:", e)
 
+def parse_commit_msg(msg,pattern):
+    lines=msg.split("\n")
+    head=lines[0]
+    match=re.match(pattern,head)
+    if match:
+        _, platform, level, title,lans = match.groups()
+        problem=Problem(
+            title=title,
+            lan=[lan for lan in lans.split('_')],
+            platform=platform,
+            level=level
+        )
+        details={}
+        if len(lines)>3:
+            rest=lines[2:]
+            key_value_pattern=r"^([a-zA-Z0-9_]+)\s*:\s*(.*)$"
+
+            for str in rest:
+                key_value_match=re.match(key_value_pattern,str)
+                if key_value_match:
+                    key,value=key_value_match.groups()
+                    if not value.strip():
+                        continue
+                    if "[" in value:
+                        value=value.replace("[","").replace("]","")
+                        value=list(map(lambda x: x.strip(),value.split(",")))  
+                    if value=='true' or value=='false':
+                        value=bool(value)
+                    details[key]=value
+
+        request_body={**problem.__dict__, **details}
 
+        print("parsing success!")
+        return request_body  
+    else:
+        print("no match")
+
+
 if __name__=="__main__":
 
     local_feed_url=""
@@ -43,30 +81,15 @@ def request_notion_update(problem:Problem):
         local_request_url=os.getenv('request_url')
         local_commit_msg=os.getenv('commit_msg')
         local_pattern=os.getenv('commit_pattern')
-
 
     REQUEST_URL = os.environ['REQUEST_URL'] if os.environ.get('REQUEST_URL') != None else local_request_url
     COMMIT_MSG = os.environ['COMMIT_MSG'] if os.environ.get('COMMIT_MSG') != None else local_commit_msg
     PATTERN=os.environ['COMMIT_PATTERN'] if os.environ.get('COMMIT_PATTERN')!=None else local_pattern
 
-    match=re.match(PATTERN,COMMIT_MSG)
-
-    print("commit : ",COMMIT_MSG)
-    if match:
-        op, platform, level, id, title,lans = match.groups()
-        url=""
-        if platform=='BOJ': url='https://www.acmicpc.net/problem/'+id
-        problem=Problem(
-            title=title,
-            id=id,
-            lan=[lan for lan in lans.split('_')],
-            platform=platform,
-            level=level,
-            url=url
-        )
-        print(problem)
-        if op=="solve": request_notion_update(problem)
-
-    else:
-        print("not solve commit or parsing failed")
+    print("commit : ",COMMIT_MSG,"\n")
 
+    body=parse_commit_msg(COMMIT_MSG,PATTERN)
+    print(body)
+    result=request_notion_update(body)
+    if not result:
+        sys.exit(1)