Merge 7dbdc490ae into 82e50c64f0

README.md

@@ -18,15 +18,22 @@ MKBSD comes in two variants! Node.js and Python.
 ### Running in Node.js
 
 1. Ensure you have Node.js installed.
-2. Run `node mkbsd.js`
-3. Wait a little.
-4. All wallpapers are now in a newly created `downloads` subfolder.
+2. Save the `images.json` file in the same directory as `mkbsd.js`.
+3. Run `node mkbsd.js`.
+4. Wait a little.
+5. All wallpapers are now in a newly created `downloads` subfolder.
+
+### Changes Made in `mkbsd.js and mkbsd.py`
+
+- **Local JSON Source**: The script was updated to read from a local `images.json` file instead of fetching data from a remote URL. This allows you to have full control over the data source.
+- **File System Operations**: The script now uses Node.js's `fs` module to read and parse the JSON file directly.
+- **Image Download Logic**: The image download logic was adapted to extract the artist's name and image URLs from the local JSON structure, ensuring the images are saved in artist-specific folders.
 
 ### Running in Python
 
 1. Ensure you have Python installed.
-2. Ensure you have the `aiohttp` Python package installed (`pip install aiohttp`).
-3. Run `python mkbsd.py`
+2. Save the `images.json` file in the same directory as `mkbsd.py`.
+3. Run `python mkbsd.py`.
 4. Wait a little.
 5. All wallpapers are now in a newly created `downloads` subfolder.
 

mkbsd.js

@@ -1,50 +1,69 @@
-// 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`);
+// Function to delay the downloads
+const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
 
 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));
-	}
+    const jsonFilePath = path.join(__dirname, 'images.json');
+    
+    // Load local JSON file
+    let jsonData;
     try {
-		const response = await fetch(url);
-		if (!response.ok) {
-			throw new Error(`⛔ Failed to fetch JSON file: ${response.statusText}`);
+        if (!fs.existsSync(jsonFilePath)) {
+            throw new Error('⛔ JSON file not found.');
         }
-		const jsonData = await response.json();
+
+        const jsonFileContent = fs.readFileSync(jsonFilePath, 'utf-8');
+        jsonData = JSON.parse(jsonFileContent);
+        console.info('📂 JSON file loaded successfully!');
+    } catch (error) {
+        console.error(`⛔ Failed to load JSON file: ${error.message}`);
+        return;
+    }
+
     const data = jsonData.data;
     if (!data) {
-			throw new Error('⛔ JSON does not have a "data" property at its root.');
+        console.error('⛔ JSON does not have a "data" property at its root.');
+        return;
     }
-		const downloadDir = path.join(__dirname, 'downloads');
-		if (!fs.existsSync(downloadDir)) {
-			fs.mkdirSync(downloadDir);
-			console.info(`📁 Created directory: ${downloadDir}`);
-		}
-		let fileIndex = 1;
+
+    // Loop through each item in the JSON
     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);
+
+            // Extract the artist name before the underscore
+            const artistNameMatch = imageUrl.match(/a~([^_/]+)/);
+            const artistName = artistNameMatch ? artistNameMatch[1] : 'unknown_artist';
+            const artistDir = path.join(__dirname, 'downloads', artistName);
+
+            // Create artist directory if it doesn't exist
+            if (!fs.existsSync(artistDir)) {
+                fs.mkdirSync(artistDir, { recursive: true });
+                console.info(`📁 Created directory: ${artistDir}`);
+            }
+
+            // Extract the filename and extension
+            const urlPath = new URL(imageUrl).pathname;
+            const fileName = path.basename(urlPath); // Filename including extension (e.g., .jpg or .png)
+            const filePath = path.join(artistDir, fileName);
+
+            // Download the image and save it to the specified path
+            try {
                 await downloadImage(imageUrl, filePath);
                 console.info(`🖼️ Saved image to ${filePath}`);
-				fileIndex++;
-				await delay(250);
+                await delay(250); // Delay between downloads
+            } catch (err) {
+                console.error(`❌ Error downloading image: ${err.message}`);
             }
         }
-	} catch (error) {
-		console.error(`Error: ${error.message}`);
     }
 }
 
+// Function to download the image from the provided URL
 async function downloadImage(url, filePath) {
     const response = await fetch(url);
     if (!response.ok) {
@@ -55,6 +74,7 @@ async function downloadImage(url, filePath) {
     await fs.promises.writeFile(filePath, buffer);
 }
 
+// ASCII art function (optional)
 function asciiArt() {
     console.info(`
  /$$      /$$ /$$   /$$ /$$$$$$$   /$$$$$$  /$$$$$$$
@@ -65,10 +85,10 @@ function asciiArt() {
 | $$\\  $ | $$| $$\\  $$ | $$  \\ $$ /$$  \\ $$| $$  | $$
 | $$ \\/  | $$| $$ \\  $$| $$$$$$$/|  $$$$$$/| $$$$$$$/
 |__/     |__/|__/  \\__/|_______/  \\______/ |_______/`);
-	console.info(``);
     console.info(`🤑 Starting downloads from your favorite sellout grifter's wallpaper app...`);
 }
 
+// Start the program with ASCII art and delay
 (() => {
     asciiArt();
     setTimeout(main, 5000);

mkbsd.py

@@ -1,11 +1,12 @@
-# Licensed under the WTFPL License
-
 import os
 import time
 import aiohttp
 import asyncio
+import json
 from urllib.parse import urlparse
-url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s'
+
+# Load the local JSON file
+json_file_path = 'images.json'
 
 async def delay(ms):
     await asyncio.sleep(ms / 1000)
@@ -23,35 +24,36 @@ async def download_image(session, image_url, file_path):
 
 async def main():
     try:
-        async with aiohttp.ClientSession() as session:
-            async with session.get(url) as response:
-                if response.status != 200:
-                    raise Exception(f"⛔ Failed to fetch JSON file: {response.status}")
-                json_data = await response.json()
+        # Load JSON data from the local file
+        with open(json_file_path, 'r') as json_file:
+            json_data = json.load(json_file)
+
         data = json_data.get('data')
         
         if not data:
             raise Exception('⛔ JSON does not have a "data" property at its root.')
 
-                download_dir = os.path.join(os.getcwd(), 'downloads')
-                if not os.path.exists(download_dir):
-                    os.makedirs(download_dir)
-                    print(f"📁 Created directory: {download_dir}")
-
-                file_index = 1
+        async with aiohttp.ClientSession() as session:
             for key, subproperty in data.items():
                 if subproperty and subproperty.get('dhd'):
                     image_url = subproperty['dhd']
                     print(f"🔍 Found image URL!")
-                        parsed_url = urlparse(image_url)
-                        ext = os.path.splitext(parsed_url.path)[-1] or '.jpg'
-                        filename = f"{file_index}{ext}"
-                        file_path = os.path.join(download_dir, filename)
+                    
+                    # Extract artist name from the URL
+                    artist_name = image_url.split('a~')[1].split('_')[0]
+                    artist_dir = os.path.join(os.getcwd(), 'downloads', artist_name)
+
+                    if not os.path.exists(artist_dir):
+                        os.makedirs(artist_dir)
+                        print(f"📁 Created directory: {artist_dir}")
+
+                    # Extract filename from the URL
+                    filename = os.path.basename(urlparse(image_url).path)  # Name including extension
+                    file_path = os.path.join(artist_dir, filename)
 
                     await download_image(session, image_url, file_path)
                     print(f"🖼️ Saved image to {file_path}")
                     
-                        file_index += 1
                     await delay(250)
 
     except Exception as e: