diff --git a/app/run.py b/app/run.py index cbbe7b1..c52ac9a 100644 --- a/app/run.py +++ b/app/run.py @@ -1,28 +1,38 @@ +import argparse from instagrapi import Client import json, os from datetime import datetime, timedelta import library.lib as lib +# Start timing the script start_time = datetime.now() +# Argument parser for command-line options +parser = argparse.ArgumentParser(description="Upload meal information to Instagram and Discord.") +parser.add_argument('--today', action='store_true', help="Use today's date instead of tomorrow's date for the MLSV_YMD timestamp.") +args = parser.parse_args() + +# Set MLSV_YMD date based on the --today option +if args.today: + MLSV_YMD = datetime.now().strftime('%Y%m%d') +else: + MLSV_YMD = (datetime.now() + timedelta(days=1)).strftime('%Y%m%d') + print("πŸͺ | Retrieving saved account information.") cl = Client(json.load(open('./temp/cookies.json'))) print("πŸͺ | Account information was successfully retrieved.") print("πŸ“… | Getting MLSV_YMD Timestamp") -MLSV_YMD = str((datetime.now() + timedelta(days=1)).strftime('%Y%m%d')) print("πŸ“… | Date:", MLSV_YMD) print("🍲 | Getting Meal Info Image") lib.μ–»κΈ°(MLSV_YMD) -#lib.μ–»κΈ°(MLSV_YMD) - print("πŸ“Έ | Uploading Story") cl.photo_upload_to_story( path=f"temp/{MLSV_YMD}-story.png", caption=f"#μΈμ²œμƒμ •μ€‘ν•™κ΅ #상정쀑학ꡐ #급식 \n{MLSV_YMD}일자 급식", - extra_data = {'is_paid_partnership' : False} + extra_data={'is_paid_partnership': False} ) print("πŸ“Έ | Story Uploaded") @@ -31,7 +41,7 @@ print("πŸ–ΌοΈ | Uploading Post") cl.photo_upload( f"temp/{MLSV_YMD}.png", caption=f"#μΈμ²œμƒμ •μ€‘ν•™κ΅ #상정쀑학ꡐ #급식 \n{MLSV_YMD}일자 급식", - extra_data = {'is_paid_partnership' : False} + extra_data={'is_paid_partnership': False} ) print("πŸ–ΌοΈ | Post Uploaded") @@ -40,5 +50,5 @@ lib.λ””μŠ€μ½”λ“œ(MLSV_YMD) print("πŸ—¨οΈ | Uploaded at Discord") print("πŸŽ‰ | All tasks completed.") -# calculate running time +# Calculate running time print("πŸ•’ | Running Time:", datetime.now() - start_time) diff --git a/app/run.sh b/app/run.sh index 2e50b03..a04fd45 100644 --- a/app/run.sh +++ b/app/run.sh @@ -1,16 +1,21 @@ cd /code/app -#rm -rf 20*.png - -#rm -rf /etc/localtime -#ln -sf /usr/share/zoneinfo/Asia/Seoul /etc/localtime # If doesn't have temp folder, create it if [ ! -d "temp" ]; then mkdir temp fi + # If doesn't have temp/cookies.json, create it if [ ! -f "temp/cookies.json" ]; then python3 library/init-auth.py fi -python3 run.py > temp/$(date +%Y%m%d-%H%M%S).log 2>&1 +# Set the log file name with the current date and time +log_file="temp/$(date +%Y%m%d-%H%M%S).log" + +# Run the Python script with or without --today and output to both the console and log file +if [[ "$1" == "--today" ]]; then + python3 run.py --today | tee "$log_file" +else + python3 run.py | tee "$log_file" +fi