From f121a8d681c23ab6b678654664d7e658fe9a3746 Mon Sep 17 00:00:00 2001 From: Aholicknight Date: Sat, 28 Sep 2024 01:02:36 -0600 Subject: [PATCH 1/4] update gitignore to include .venu --- .gitignore | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitignore b/.gitignore index de2b2c6..64c220d 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ .DS_Store downloads +.venv \ No newline at end of file From 437f4a0302b858a9e0e79bbd95dc836cd0938170 Mon Sep 17 00:00:00 2001 From: Aholicknight Date: Sat, 28 Sep 2024 01:12:51 -0600 Subject: [PATCH 2/4] Refactor download_image function to support replacing existing files --- mkbsd.py | 32 ++++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/mkbsd.py b/mkbsd.py index 2b33310..f2b01ee 100644 --- a/mkbsd.py +++ b/mkbsd.py @@ -1,17 +1,20 @@ -# Licensed under the WTFPL License - import os import time import aiohttp import asyncio from urllib.parse import urlparse + url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s' async def delay(ms): await asyncio.sleep(ms / 1000) -async def download_image(session, image_url, file_path): +async def download_image(session, image_url, file_path, replace_existing): try: + if not replace_existing and os.path.exists(file_path): + print(f"⚠️ File {file_path} already exists. Skipping download.") + return + async with session.get(image_url) as response: if response.status != 200: raise Exception(f"Failed to download image: {response.status}") @@ -21,7 +24,7 @@ async def download_image(session, image_url, file_path): except Exception as e: print(f"Error downloading image: {str(e)}") -async def main(): +async def main(replace_existing): try: async with aiohttp.ClientSession() as session: async with session.get(url) as response: @@ -48,7 +51,7 @@ async def main(): filename = f"{file_index}{ext}" file_path = os.path.join(download_dir, filename) - await download_image(session, image_url, file_path) + await download_image(session, image_url, file_path, replace_existing) print(f"🖼️ Saved image to {file_path}") file_index += 1 @@ -70,7 +73,24 @@ def ascii_art(): print("") print("🤑 Starting downloads from your favorite sellout grifter's wallpaper app...") +def prompt_user(): + while True: + print("Files already exist in the 'downloads' directory.") + print("1. Skip existing files and download new ones.") + print("2. Replace existing files and download all.") + choice = input("Enter your choice (1 or 2): ") + if choice in ['1', '2']: + return choice == '2' + print("Invalid choice. Please enter 1 or 2.") + if __name__ == "__main__": ascii_art() time.sleep(5) - asyncio.run(main()) + + download_dir = os.path.join(os.getcwd(), 'downloads') + if os.path.exists(download_dir) and os.listdir(download_dir): + replace_existing = prompt_user() + else: + replace_existing = True + + asyncio.run(main(replace_existing)) \ No newline at end of file From 2d51a5242ea1f096ce11104e126d6500c9c29463 Mon Sep 17 00:00:00 2001 From: Aholicknight Date: Sat, 28 Sep 2024 01:14:50 -0600 Subject: [PATCH 3/4] accoidentally removed license --- mkbsd.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/mkbsd.py b/mkbsd.py index f2b01ee..2dfb0c6 100644 --- a/mkbsd.py +++ b/mkbsd.py @@ -1,3 +1,5 @@ +# Licensed under the WTFPL License + import os import time import aiohttp From d4a9423d69d0d9338f300e4ab5347956a17c8371 Mon Sep 17 00:00:00 2001 From: Aholicknight Date: Sat, 28 Sep 2024 03:07:51 -0600 Subject: [PATCH 4/4] Refactor download_image function to support replacing existing files for NodeJS --- mkbsd.js | 136 +++++++++++++++++++++++++++++++++---------------------- 1 file changed, 81 insertions(+), 55 deletions(-) diff --git a/mkbsd.js b/mkbsd.js index d02593a..15346b8 100644 --- a/mkbsd.js +++ b/mkbsd.js @@ -1,62 +1,67 @@ // Copyright 2024 Nadim Kobeissi // Licensed under the WTFPL License -const fs = require(`fs`); -const path = require(`path`); +const fs = require('fs'); +const path = require('path'); +const readline = require('readline'); -async function main() { - const url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s'; - const delay = (ms) => { - return new Promise(resolve => setTimeout(resolve, ms)); - } - try { - const response = await fetch(url); - if (!response.ok) { - throw new Error(`⛔ Failed to fetch JSON file: ${response.statusText}`); - } - const jsonData = await response.json(); - const data = jsonData.data; - if (!data) { - throw new Error('⛔ JSON does not have a "data" property at its root.'); - } - const downloadDir = path.join(__dirname, 'downloads'); - if (!fs.existsSync(downloadDir)) { - fs.mkdirSync(downloadDir); - console.info(`📁 Created directory: ${downloadDir}`); - } - let fileIndex = 1; - for (const key in data) { - const subproperty = data[key]; - if (subproperty && subproperty.dhd) { - const imageUrl = subproperty.dhd; - console.info(`🔍 Found image URL!`); - await delay(100); - const ext = path.extname(new URL(imageUrl).pathname) || '.jpg'; - const filename = `${fileIndex}${ext}`; - const filePath = path.join(downloadDir, filename); - await downloadImage(imageUrl, filePath); - console.info(`🖼️ Saved image to ${filePath}`); - fileIndex++; - await delay(250); - } - } - } catch (error) { - console.error(`Error: ${error.message}`); - } +async function main(replaceExisting) { + const url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s'; + const delay = (ms) => { + return new Promise(resolve => setTimeout(resolve, ms)); + } + try { + const response = await fetch(url); + if (!response.ok) { + throw new Error(`⛔ Failed to fetch JSON file: ${response.statusText}`); + } + const jsonData = await response.json(); + const data = jsonData.data; + if (!data) { + throw new Error('⛔ JSON does not have a "data" property at its root.'); + } + const downloadDir = path.join(__dirname, 'downloads'); + if (!fs.existsSync(downloadDir)) { + fs.mkdirSync(downloadDir); + console.info(`📁 Created directory: ${downloadDir}`); + } + let fileIndex = 1; + for (const key in data) { + const subproperty = data[key]; + if (subproperty && subproperty.dhd) { + const imageUrl = subproperty.dhd; + console.info(`🔍 Found image URL!`); + await delay(100); + const ext = path.extname(new URL(imageUrl).pathname) || '.jpg'; + const filename = `${fileIndex}${ext}`; + const filePath = path.join(downloadDir, filename); + await downloadImage(imageUrl, filePath, replaceExisting); + console.info(`🖼️ Saved image to ${filePath}`); + fileIndex++; + await delay(250); + } + } + } catch (error) { + console.error(`Error: ${error.message}`); + } } -async function downloadImage(url, filePath) { - const response = await fetch(url); - if (!response.ok) { - throw new Error(`Failed to download image: ${response.statusText}`); - } - const arrayBuffer = await response.arrayBuffer(); - const buffer = Buffer.from(arrayBuffer); - await fs.promises.writeFile(filePath, buffer); +async function downloadImage(url, filePath, replaceExisting) { + if (!replaceExisting && fs.existsSync(filePath)) { + console.info(`⚠️ File ${filePath} already exists. Skipping download.`); + return; + } + const response = await fetch(url); + if (!response.ok) { + throw new Error(`Failed to download image: ${response.statusText}`); + } + const arrayBuffer = await response.arrayBuffer(); + const buffer = Buffer.from(arrayBuffer); + await fs.promises.writeFile(filePath, buffer); } function asciiArt() { - console.info(` + console.info(` /$$ /$$ /$$ /$$ /$$$$$$$ /$$$$$$ /$$$$$$$ | $$$ /$$$| $$ /$$/| $$__ $$ /$$__ $$| $$__ $$ | $$$$ /$$$$| $$ /$$/ | $$ \\ $$| $$ \\__/| $$ \\ $$ @@ -65,11 +70,32 @@ function asciiArt() { | $$\\ $ | $$| $$\\ $$ | $$ \\ $$ /$$ \\ $$| $$ | $$ | $$ \\/ | $$| $$ \\ $$| $$$$$$$/| $$$$$$/| $$$$$$$/ |__/ |__/|__/ \\__/|_______/ \\______/ |_______/`); - console.info(``); - console.info(`🤑 Starting downloads from your favorite sellout grifter's wallpaper app...`); + console.info(``); + console.info(`🤑 Starting downloads from your favorite sellout grifter's wallpaper app...`); } -(() => { - asciiArt(); - setTimeout(main, 5000); +function promptUser() { + return new Promise((resolve) => { + const rl = readline.createInterface({ + input: process.stdin, + output: process.stdout + }); + rl.question("Files already exist in the 'downloads' directory.\n1. Skip existing files and download new ones.\n2. Replace existing files and download all.\nEnter your choice (1 or 2): ", (answer) => { + rl.close(); + resolve(answer === '2'); + }); + }); +} + +(async () => { + asciiArt(); + await new Promise(resolve => setTimeout(resolve, 5000)); + + const downloadDir = path.join(__dirname, 'downloads'); + let replaceExisting = true; + if (fs.existsSync(downloadDir) && fs.readdirSync(downloadDir).length > 0) { + replaceExisting = await promptUser(); + } + + await main(replaceExisting); })();