From 7630d190f70f77010b0ab6d8abc8c1dbcdeb318d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Wed, 12 Feb 2025 18:28:23 +0900 Subject: [PATCH 01/11] =?UTF-8?q?python-app.yml=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/python-app.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/python-app.yml b/.github/workflows/python-app.yml index d61e82e..28d3595 100644 --- a/.github/workflows/python-app.yml +++ b/.github/workflows/python-app.yml @@ -71,7 +71,7 @@ jobs: - name: Start SOCKS proxy with SSH run: | - ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_ed25519 -D 9999 -f -N imnyang@imnya.ng -p5322 + ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_ed25519 -D 9999 -f -N neko@imnya.ng -p5322 echo "SOCKS proxy started" - name: Run application From c631d85522862f323c64848b2c13bae4eed6c1bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Wed, 12 Feb 2025 18:28:40 +0900 Subject: [PATCH 02/11] =?UTF-8?q?school-event.yml=20=EC=97=85=EB=8D=B0?= =?UTF-8?q?=EC=9D=B4=ED=8A=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/workflows/school-event.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/school-event.yml b/.github/workflows/school-event.yml index cc6fc40..814be8c 100644 --- a/.github/workflows/school-event.yml +++ b/.github/workflows/school-event.yml @@ -69,7 +69,7 @@ jobs: - name: Start SOCKS proxy with SSH run: | - ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_ed25519 -D 9999 -f -N imnyang@imnya.ng -p5322 + ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_ed25519 -D 9999 -f -N neko@imnya.ng -p5322 echo "SOCKS proxy started" - name: Run application From e4d99031490dd5b242a0d968aed96d2e6e616a5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:02:04 +0900 Subject: [PATCH 03/11] Update 2025.json --- app/library/event/2025.json | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/app/library/event/2025.json b/app/library/event/2025.json index 25ef144..60e0566 100644 --- a/app/library/event/2025.json +++ b/app/library/event/2025.json @@ -6,6 +6,11 @@ "start": 20250208, "end": 20250302, "data": "겨울방학 & 봄방학" + }, + "1": { + "start": 20250227, + "end": 20250227, + "data": "교과서 배부 및 반 배정 등교" } }, "03": { @@ -78,4 +83,4 @@ } } } -} \ No newline at end of file +} From dff9d9ac1853e08eb35bdcaa1ee93ad72806e97f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:03:38 +0900 Subject: [PATCH 04/11] Update gen-config.sh --- app/gen-config.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/gen-config.sh b/app/gen-config.sh index cf13f8a..b623106 100644 --- a/app/gen-config.sh +++ b/app/gen-config.sh @@ -29,4 +29,10 @@ cat > config.json << EOF } EOF +# If doesn't have temp/cookies.json, create it +if [ ! -f "./temp/auth/cookies.json" ]; then + mkdir temp/auth + python3 library/init-auth.py +fi + echo "Successfully generated config.json" From d035da6bfacbbc2b52a1f8ea1b016a7c8c1ae06c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:04:49 +0900 Subject: [PATCH 05/11] Update gen-config.sh --- app/gen-config.sh | 6 ------ 1 file changed, 6 deletions(-) diff --git a/app/gen-config.sh b/app/gen-config.sh index b623106..cf13f8a 100644 --- a/app/gen-config.sh +++ b/app/gen-config.sh @@ -29,10 +29,4 @@ cat > config.json << EOF } EOF -# If doesn't have temp/cookies.json, create it -if [ ! -f "./temp/auth/cookies.json" ]; then - mkdir temp/auth - python3 library/init-auth.py -fi - echo "Successfully generated config.json" From cd82ac9084d11015ba494f167447ea3b3c75aa75 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:05:02 +0900 Subject: [PATCH 06/11] Update gen-config.sh --- app/gen-config.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/gen-config.sh b/app/gen-config.sh index cf13f8a..b623106 100644 --- a/app/gen-config.sh +++ b/app/gen-config.sh @@ -29,4 +29,10 @@ cat > config.json << EOF } EOF +# If doesn't have temp/cookies.json, create it +if [ ! -f "./temp/auth/cookies.json" ]; then + mkdir temp/auth + python3 library/init-auth.py +fi + echo "Successfully generated config.json" From 79cb3405999c6431b2c283c89780c8be5e75d05f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:05:24 +0900 Subject: [PATCH 07/11] Update school-event.yml --- .github/workflows/school-event.yml | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/school-event.yml b/.github/workflows/school-event.yml index 814be8c..d315e25 100644 --- a/.github/workflows/school-event.yml +++ b/.github/workflows/school-event.yml @@ -56,11 +56,6 @@ jobs: run: | chmod +x app/run.sh app/gen-config.sh - - name: Generate Config - run: | - cd app - ./gen-config.sh - - name: Add SSH private key run: | mkdir -p ~/.ssh @@ -72,6 +67,11 @@ jobs: ssh -o StrictHostKeyChecking=no -i ~/.ssh/id_ed25519 -D 9999 -f -N neko@imnya.ng -p5322 echo "SOCKS proxy started" + - name: Generate Config + run: | + cd app + ./gen-config.sh + - name: Run application run: | cd app From 149353e738149067c703abc77b27c806de8f4a33 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:06:52 +0900 Subject: [PATCH 08/11] Update gen-config.sh --- app/gen-config.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/app/gen-config.sh b/app/gen-config.sh index b623106..79050a2 100644 --- a/app/gen-config.sh +++ b/app/gen-config.sh @@ -29,6 +29,13 @@ cat > config.json << EOF } EOF +if [ ! -d "temp" ]; then + mkdir temp +fi +if [ ! -d "temp/auth" ]; then + mkdir temp/auth +fi + # If doesn't have temp/cookies.json, create it if [ ! -f "./temp/auth/cookies.json" ]; then mkdir temp/auth From aed9a382adb8a57e09fe0b97c17f00651bc306a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:08:16 +0900 Subject: [PATCH 09/11] Update force-event.py --- app/force-event.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/force-event.py b/app/force-event.py index 2a5017d..a0a9df3 100644 --- a/app/force-event.py +++ b/app/force-event.py @@ -21,7 +21,7 @@ MLSV_YMD = (datetime.now() + timedelta(days=1)).strftime('%Y%m%d') print("📅 | Today is the last day of the month.") print("📆 | Uploading School Event Post") -학사일정_경로 = lib.학사일정_얻기(MLSV_YMD) +학사일정_경로 = lib.학사일정_얻기() cl.photo_upload( 학사일정_경로, caption=f"#인천상정중학교 #상정중학교 #학사일정 \n{내일.strftime("%Y")}년 {내일.strftime("%m")}월 학사일정", @@ -30,4 +30,4 @@ cl.photo_upload( print("📆 | School Event Post Uploaded") -print("🎉 | All tasks completed.") \ No newline at end of file +print("🎉 | All tasks completed.") From eb4d0890c846cd165eb6db9cf6f69bf0beba46d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:08:25 +0900 Subject: [PATCH 10/11] Update run.py --- app/run.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/run.py b/app/run.py index 7bdb96c..c568644 100644 --- a/app/run.py +++ b/app/run.py @@ -60,7 +60,7 @@ print(f"📆 | Today Date : {MLSV_YMD}") if 내일.month != 오늘.month: print("📅 | Today is the last day of the month.") print("📆 | Uploading School Event Post") - 학사일정_경로 = lib.학사일정_얻기(MLSV_YMD) + 학사일정_경로 = lib.학사일정_얻기() cl.photo_upload( 학사일정_경로, caption=f"#인천상정중학교 #상정중학교 #학사일정 \n{내일.strftime("%Y")}년 {내일.strftime("%m")}월 학사일정", From 02a0a0a8bd3469cd9658d8a06213ff596927da73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=EC=95=94=EB=83=A5?= Date: Fri, 14 Feb 2025 01:11:13 +0900 Subject: [PATCH 11/11] Update lib.py --- app/library/lib.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/library/lib.py b/app/library/lib.py index d9e41fc..59dcc22 100644 --- a/app/library/lib.py +++ b/app/library/lib.py @@ -83,7 +83,7 @@ def 학사일정_얻기(): 세부_폰트 = ImageFont.truetype(font, 24) 제목요소 = ImageDraw.Draw(사진) - for i, 일정 in enumerate(학사일정.values()): + for i, 일정 in enumerate(reversed(list(학사일정.values()))): if 일정['data']: start_date = datetime.strptime(str(일정['start']), "%Y%m%d") end_date = datetime.strptime(str(일정['end']), "%Y%m%d")