From 1786b77f3cf37a83433c9c7de3a5c30607d09d44 Mon Sep 17 00:00:00 2001 From: imnyang Date: Fri, 2 May 2025 23:09:57 +0900 Subject: [PATCH] =?UTF-8?q?=EC=9D=B4=EA=B2=8C=20=EB=A7=9E=EB=82=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Dockerfile | 6 +++--- app/library/init-auth.py | 2 +- app/library/lib.py | 12 +++++++----- app/run.py | 4 ++-- app/run.sh | 3 +-- app/temp.py | 9 +++------ crontab-new | 1 + 7 files changed, 18 insertions(+), 19 deletions(-) create mode 100644 crontab-new diff --git a/Dockerfile b/Dockerfile index a6e2dd5..4bd46c2 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,16 +1,16 @@ FROM python:3.12 +# Setup System RUN sed -i 's@deb.debian.org@ftp.kaist.ac.kr@g' /etc/apt/sources.list.d/debian.sources +RUN pip install --upgrade pip +RUN apt update -y && apt upgrade -y && apt install -y cron # Setup Crontab - WORKDIR /code COPY crontab /code/crontab COPY requirements.txt /code/requirements.txt COPY app /code/app -RUN apt update && apt -y install cron - COPY crontab /etc/cron.d/crontab RUN chmod 0644 /etc/cron.d/crontab RUN echo "" >> /etc/cron.d/crontab # Ensure newline at end of file diff --git a/app/library/init-auth.py b/app/library/init-auth.py index 5afcec6..7203583 100644 --- a/app/library/init-auth.py +++ b/app/library/init-auth.py @@ -13,7 +13,7 @@ with open('./config.json') as json_file: cl = Client() -cl.set_proxy("socks5h://localhost:9999") +#cl.set_proxy("socks5h://localhost:9999") code = cl.totp_generate_code(INSTAGRAM_AUTH[2]) cl.login(INSTAGRAM_AUTH[0], INSTAGRAM_AUTH[1], verification_code=code) cl.set_user_agent('Instagram 361.0.0.46.88 Android (35/15; 394dpi; 1084x2412; Nothing; A065; Pong; qcom; ko_KR_#u-fw-sun-mu-celsius; 674675147)') diff --git a/app/library/lib.py b/app/library/lib.py index a99b35c..8f567f3 100644 --- a/app/library/lib.py +++ b/app/library/lib.py @@ -43,6 +43,8 @@ def 급식_칼로리_얻기(MLSV_YMD:str): return 답장.json()['mealServiceDietInfo'][1]['row'][0]['CAL_INFO'] def 얻기(MLSV_YMD:str): + if MLSV_YMD == "20250401": + return print("집가고싶다발동") 급식 = 급식_정보_얻기(MLSV_YMD) # print(f"{ROOT}/library/skeleton.png") @@ -72,10 +74,10 @@ def 학사일정_얻기(): print("서코가고싶다발동") 오늘 = datetime.now() + timedelta(days=1) print("오늘은 사실", 오늘, "이였다") - with open(f"{ROOT}/library/event/{오늘.strftime("%Y")}.json") as json_file: + with open(f"{ROOT}/library/event/{오늘.strftime('%Y')}.json") as json_file: json_data = json.load(json_file) 마지막_업데이트 = json_data["last_update"] - 학사일정 = json_data["event"][str(오늘.strftime("%m"))] + 학사일정 = json_data["event"][str(오늘.strftime('%m'))] # print(f"{ROOT}/library/skeleton.png") 사진 = Image.open(f"{ROOT}/library/skeleton_schoolevent.png") @@ -102,15 +104,15 @@ def 학사일정_얻기(): 제목요소.text((75, 930 - i * 60), f"{date_text} : {일정['data']}", font=학사일정_폰트, anchor="ls", fill=(255, 255, 255)) 세부요소 = ImageDraw.Draw(사진) - 세부요소.text((810, 80), f"{오늘.strftime("%Y")}년 {오늘.strftime("%m")}월", font=세부_폰트, fill=(255, 255, 255)) + 세부요소.text((810, 80), f"{오늘.strftime('%Y')}년 {오늘.strftime('%m')}월", font=세부_폰트, fill=(255, 255, 255)) def 포맷팅된_날짜(날짜:str): return f"{날짜[:4]}년 {날짜[4:6]}월 {날짜[6:8]}일" 세부요소.text((591, 200), f"마지막 업데이트 : {포맷팅된_날짜(마지막_업데이트)}", font=세부_폰트, fill=(137, 202, 255)) - 사진.save(f'{ROOT}/temp/{오늘.strftime("%Y")}_{오늘.strftime("%m")}.png') + 사진.save(f"{ROOT}/temp/{오늘.strftime('%Y')}_{오늘.strftime('%m')}.png") print("🍲 | Meal Info Image Saved") - return f'{ROOT}/temp/{오늘.strftime("%Y")}_{오늘.strftime("%m")}.png' + return f"{ROOT}/temp/{오늘.strftime('%Y')}_{오늘.strftime('%m')}.png" def 스토리_얻기(MLSV_YMD:str): print("이건 왜?") diff --git a/app/run.py b/app/run.py index a8e9ea5..c36b626 100644 --- a/app/run.py +++ b/app/run.py @@ -21,7 +21,7 @@ else: print("🍪 | Retrieving saved account information.") cl = Client(json.load(open('./temp/auth/cookies.json'))) -cl.set_proxy("socks5h://localhost:9999") +#cl.set_proxy("socks5h://localhost:9999") print("🍪 | Account information was successfully retrieved.") @@ -42,7 +42,7 @@ if 내일.month != 오늘.month: 학사일정_경로 = lib.학사일정_얻기() cl.photo_upload( 학사일정_경로, - caption=f"#인천상정중학교 #상정중학교 #학사일정 \n{내일.strftime("%Y")}년 {내일.strftime("%m")}월 학사일정", + caption=f"#인천상정중학교 #상정중학교 #학사일정 \n{내일.strftime('%Y')}년 {내일.strftime('%m')}월 학사일정", extra_data={'is_paid_partnership': False} ) print("📆 | School Event Post Uploaded") diff --git a/app/run.sh b/app/run.sh index d6e628f..394b323 100644 --- a/app/run.sh +++ b/app/run.sh @@ -1,4 +1,5 @@ #!/bin/bash +cd /root/today.isangjeong/app # If doesn't have temp folder, create it if [ ! -d "temp" ]; then @@ -13,8 +14,6 @@ echo "Debug: User is $(whoami)" >> ./temp/debug.log echo "Debug: Environment variables:" >> ./temp/debug.log env >> ./temp/debug.log -cd ${BOT_ROOT} - # If doesn't have temp/cookies.json, create it diff --git a/app/temp.py b/app/temp.py index 79f0792..63ac2ac 100644 --- a/app/temp.py +++ b/app/temp.py @@ -1,13 +1,10 @@ -#import library.lib as 라이브러리 +import library.lib as 라이브러리 -#라이브러리.얻기("20250307") +#라이브러리.얻기("20250314") #라이브러리.스토리_얻기("20250307") #라이브러리.얻기("20250306") #라이브러리.스토리_얻기("20250306") import library.lib as lib -lib.디스코드("20250304") -lib.디스코드("20250305") -lib.디스코드("20250306") -lib.디스코드("20250307") +lib.얻기("20250401") diff --git a/crontab-new b/crontab-new new file mode 100644 index 0000000..3fb681a --- /dev/null +++ b/crontab-new @@ -0,0 +1 @@ +0 22 * * * /root/today.isangjeong/app/run.sh