Download image

Author: bjarneo

src/cli/commands/apply-blueprint.js

@@ -1,6 +1,9 @@
+import GLib from 'gi://GLib';
+import Gio from 'gi://Gio';
 import {ConfigWriter} from '../../utils/ConfigWriter.js';
 import {BlueprintService} from '../../services/BlueprintService.js';
 import {ColorMapper} from '../utils/color-mapper.js';
+import {ensureDirectoryExists} from '../../utils/file-utils.js';
 
 /**
  * Command handler for applying a blueprint theme
@@ -11,9 +14,9 @@ export class ApplyBlueprintCommand {
      * Executes the apply-blueprint command
      *
      * @param {string} name - Name of the blueprint to apply
-     * @returns {boolean} True if successful, false otherwise
+     * @returns {Promise<boolean>} True if successful, false otherwise
      */
-    static execute(name) {
+    static async execute(name) {
         if (!name) {
             print('Error: Blueprint name is required');
             print('Usage: aether --apply-blueprint <name>');
@@ -47,6 +50,16 @@ export class ApplyBlueprintCommand {
             }
 
             const palette = foundBlueprint.palette;
+
+            // Download wallpaper if wallpaperUrl is present and wallpaper is missing
+            let wallpaperPath = palette.wallpaper;
+            if (palette.wallpaperUrl && !wallpaperPath) {
+                wallpaperPath = await this._downloadWallpaper(palette.wallpaperUrl);
+                if (!wallpaperPath) {
+                    print('Warning: Failed to download wallpaper, continuing without it');
+                }
+            }
+
             const colorRoles = ColorMapper.mapColorsToRoles(palette.colors);
 
             const settings = foundBlueprint.settings || {};
@@ -56,7 +69,7 @@ export class ApplyBlueprintCommand {
             const configWriter = new ConfigWriter();
             configWriter.applyTheme(
                 colorRoles,
-                palette.wallpaper,
+                wallpaperPath,
                 settings,
                 lightMode,
                 appOverrides,
@@ -71,4 +84,48 @@ export class ApplyBlueprintCommand {
             return false;
         }
     }
+
+    /**
+     * Downloads a wallpaper from a URL
+     * @param {string} url - URL to download from
+     * @returns {Promise<string|null>} Path to downloaded wallpaper or null on failure
+     * @private
+     */
+    static async _downloadWallpaper(url) {
+        try {
+            print(`Downloading wallpaper from: ${url}`);
+
+            const wallpapersDir = GLib.build_filenamev([
+                GLib.get_user_data_dir(),
+                'aether',
+                'wallpapers',
+            ]);
+            ensureDirectoryExists(wallpapersDir);
+
+            // Extract filename from URL
+            const urlParts = url.split('/');
+            const filename = urlParts[urlParts.length - 1] || 'imported-wallpaper.jpg';
+            const wallpaperPath = GLib.build_filenamev([
+                wallpapersDir,
+                filename,
+            ]);
+
+            // Check if already downloaded
+            const file = Gio.File.new_for_path(wallpaperPath);
+            if (file.query_exists(null)) {
+                print(`Wallpaper already downloaded: ${wallpaperPath}`);
+                return wallpaperPath;
+            }
+
+            // Download wallpaper
+            const {wallhavenService} = await import('../../services/wallhaven-service.js');
+            await wallhavenService.downloadWallpaper(url, wallpaperPath);
+
+            print(`✓ Wallpaper downloaded: ${wallpaperPath}`);
+            return wallpaperPath;
+        } catch (error) {
+            print(`Error downloading wallpaper: ${error.message}`);
+            return null;
+        }
+    }
 }

src/components/PaletteEditor.js

@@ -1,10 +1,12 @@
 import GLib from 'gi://GLib';
+import Gio from 'gi://Gio';
 import GObject from 'gi://GObject';
 import Gtk from 'gi://Gtk?version=4.0';
 import Adw from 'gi://Adw?version=1';
 
 import {extractColorsFromWallpaperIM} from '../utils/imagemagick-color-extraction.js';
 import {adjustColor} from '../utils/color-utils.js';
+import {ensureDirectoryExists} from '../utils/file-utils.js';
 import {WallpaperBrowser} from './WallpaperBrowser.js';
 import {LocalWallpaperBrowser} from './LocalWallpaperBrowser.js';
 import {FavoritesView} from './FavoritesView.js';
@@ -438,14 +440,64 @@ export const PaletteEditor = GObject.registerClass(
             this.switchToEditorTab();
         }
 
-        loadBlueprintPalette(palette) {
+        async loadBlueprintPalette(palette) {
             if (palette.colors) {
                 this._originalPalette = [...palette.colors];
                 this.setPalette(palette.colors);
             }
 
-            if (palette.wallpaper) {
+            // Download wallpaper if wallpaperUrl is present
+            if (palette.wallpaperUrl && !palette.wallpaper) {
+                try {
+                    const wallpapersDir = GLib.build_filenamev([
+                        GLib.get_user_data_dir(),
+                        'aether',
+                        'wallpapers',
+                    ]);
+                    ensureDirectoryExists(wallpapersDir);
+
+                    // Extract filename from URL
+                    const urlParts = palette.wallpaperUrl.split('/');
+                    const filename = urlParts[urlParts.length - 1] || 'imported-wallpaper.jpg';
+                    const wallpaperPath = GLib.build_filenamev([
+                        wallpapersDir,
+                        filename,
+                    ]);
+
+                    // Check if already downloaded
+                    const file = Gio.File.new_for_path(wallpaperPath);
+                    if (!file.query_exists(null)) {
+                        // Download wallpaper
+                        const {wallhavenService} = await import('../services/wallhaven-service.js');
+                        await wallhavenService.downloadWallpaper(
+                            palette.wallpaperUrl,
+                            wallpaperPath
+                        );
+                        console.log(`Downloaded wallpaper from blueprint: ${wallpaperPath}`);
+                    }
+
+                    // Load the downloaded wallpaper
+                    this.loadWallpaperWithoutExtraction(wallpaperPath);
+
+                    // Store metadata
+                    this._wallpaperMetadata = {
+                        url: palette.wallpaperUrl,
+                        source: palette.wallpaperSource || 'wallhaven',
+                    };
+                } catch (error) {
+                    console.error('Failed to download wallpaper from URL:', error);
+                    // Continue without wallpaper
+                }
+            } else if (palette.wallpaper) {
                 this.loadWallpaperWithoutExtraction(palette.wallpaper);
+
+                // Restore wallpaper metadata if available
+                if (palette.wallpaperUrl) {
+                    this._wallpaperMetadata = {
+                        url: palette.wallpaperUrl,
+                        source: palette.wallpaperSource || 'wallhaven',
+                    };
+                }
             }
 
             // Always reset additional images when loading blueprint