Merge e38f3de6c8 into 82e50c64f0

README.md

@@ -18,22 +18,15 @@ MKBSD comes in two variants! Node.js and Python.
 ### Running in Node.js
 
 1. Ensure you have Node.js installed.
-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.
+2. Run `node mkbsd.js`
+3. Wait a little.
+4. All wallpapers are now in a newly created `downloads` subfolder.
 
 ### Running in Python
 
 1. Ensure you have Python installed.
-2. Save the `images.json` file in the same directory as `mkbsd.py`.
-3. Run `python mkbsd.py`.
+2. Ensure you have the `aiohttp` Python package installed (`pip install aiohttp`).
+3. Run `python mkbsd.py`
 4. Wait a little.
 5. All wallpapers are now in a newly created `downloads` subfolder.
 

mkbsd.js

@@ -1,65 +1,51 @@
 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 jsonFilePath = path.join(__dirname, 'images.json');
-    
-    // Load local JSON file
-    let jsonData;
+    const url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s';
+    const delay = (ms) => new Promise(resolve => setTimeout(resolve, ms));
+
     try {
-        if (!fs.existsSync(jsonFilePath)) {
-            throw new Error('⛔ JSON file not found.');
+        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 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;
-    }
+        for (const key in data) {
+            const subproperty = data[key];
+            if (subproperty && subproperty.dhd) {
+                const imageUrl = subproperty.dhd;
+                console.info(`🔍 Found image URL!`);
 
-    const data = jsonData.data;
-    if (!data) {
-        console.error('⛔ JSON does not have a "data" property at its root.');
-        return;
-    }
+                // 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);
 
-    // 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!`);
+                // Create artist directory if it doesn't exist
+                if (!fs.existsSync(artistDir)) {
+                    fs.mkdirSync(artistDir, { recursive: true });
+                    console.info(`📁 Created directory: ${artistDir}`);
+                }
 
-            // 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);
+                // 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);
 
-            // 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 {
+                // Download the image and save it to the specified path
                 await downloadImage(imageUrl, filePath);
                 console.info(`🖼️ Saved image to ${filePath}`);
                 await delay(250); // Delay between downloads
-            } catch (err) {
-                console.error(`❌ Error downloading image: ${err.message}`);
             }
         }
+    } catch (error) {
+        console.error(`Error: ${error.message}`);
     }
 }
 
@@ -88,7 +74,7 @@ function asciiArt() {
     console.info(`🤑 Starting downloads from your favorite sellout grifter's wallpaper app...`);
 }
 
-// Start the program with ASCII art and delay
+// Start program with ASCII art and delay
 (() => {
     asciiArt();
     setTimeout(main, 5000);

mkbsd.py

@@ -2,11 +2,9 @@ import os
 import time
 import aiohttp
 import asyncio
-import json
 from urllib.parse import urlparse
 
-# Load the local JSON file
-json_file_path = 'images.json'
+url = 'https://storage.googleapis.com/panels-api/data/20240916/media-1a-i-p~s'
 
 async def delay(ms):
     await asyncio.sleep(ms / 1000)
@@ -24,37 +22,38 @@ async def download_image(session, image_url, file_path):
 
 async def main():
     try:
-        # 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.')
-
         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!")
-                    
-                    # 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)
+            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()
+                data = json_data.get('data')
+                
+                if not data:
+                    raise Exception('⛔ JSON does not have a "data" property at its root.')
 
-                    if not os.path.exists(artist_dir):
-                        os.makedirs(artist_dir)
-                        print(f"📁 Created directory: {artist_dir}")
+                for key, subproperty in data.items():
+                    if subproperty and subproperty.get('dhd'):
+                        image_url = subproperty['dhd']
+                        print(f"🔍 Found image URL!")
+                        
+                        # Extrahiere den Künstlernamen vor dem Unterstrich
+                        parsed_url = urlparse(image_url)
+                        artist_name = image_url.split('a~')[1].split('_')[0]
+                        artist_dir = os.path.join(os.getcwd(), 'downloads', artist_name)
 
-                    # Extract filename from the URL
-                    filename = os.path.basename(urlparse(image_url).path)  # Name including extension
-                    file_path = os.path.join(artist_dir, filename)
+                        if not os.path.exists(artist_dir):
+                            os.makedirs(artist_dir)
+                            print(f"📁 Created directory: {artist_dir}")
 
-                    await download_image(session, image_url, file_path)
-                    print(f"🖼️ Saved image to {file_path}")
-                    
-                    await delay(250)
+                        # Extrahiere den Dateinamen und die Endung
+                        filename = os.path.basename(parsed_url.path)  # Name inklusive Endung
+                        file_path = os.path.join(artist_dir, filename)
+
+                        await download_image(session, image_url, file_path)
+                        print(f"🖼️ Saved image to {file_path}")
+                        
+                        await delay(250)
 
     except Exception as e:
         print(f"Error: {str(e)}")
@@ -75,4 +74,4 @@ def ascii_art():
 if __name__ == "__main__":
     ascii_art()
     time.sleep(5)
-    asyncio.run(main())
+    asyncio.run(main())