sha/sLogos
1
0
Fork 0
mirror of https://github.com/shadoll/sLogos.git synced 2026-02-04 11:03:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refactor PWA caching and image generation scripts

Browse Source 
- Updated `generate-pwa-cache-list.js` to include images directory and remove duplicate file entries.
- Refactored `generate-svg-variants.js` to utilize collections from a centralized source and renamed generation directory variable.
- Modified `update-data.js` to align with new directory structure for images and variants, ensuring proper paths are used.
- Adjusted `collections.js` to standardize directory naming for variants.
- Enhanced Svelte components (`Actions.svelte`, `CardFull.svelte`, `CardMiddle.svelte`, `CardSmall.svelte`, `CardTiny.svelte`) to utilize context for collection management, simplifying image URL generation.
This commit is contained in:
sHa
2025-06-18 13:18:15 +03:00
parent d7feb6db19
commit 4a32deaeb5
12 changed files with 108 additions and 1622 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
scripts/generate-pwa-cache-list.js
View File

@@ -2,11 +2,12 @@
// Node.js script to generate a list of all files in public and images for PWA caching
const fs = require('fs');
const path = require('path');
const { collections } = require('../src/collections.js');
const projectRoot = path.join(__dirname, '..');
const publicDir = path.join(projectRoot, 'public/images');
const logosDir = path.join(projectRoot, 'logos');
const logosGenDir = path.join(projectRoot, 'logos_variants');
const publicDir = path.join(projectRoot, 'public');
const imagesDir = path.join(publicDir, 'images');
const imagesVarDir = path.join(projectRoot, 'logos_variants');
// List of files to ignore
const IGNORED_FILES = ['.DS_Store', 'CNAME', 'pwa-files-to-cache.json', '.gitignore'];
@@ -31,11 +32,11 @@ function safeWalkDir(dir, baseUrl = '') {
return walkDir(dir, baseUrl);
}
const publicFiles = walkDir(publicDir, '').filter(f => !f.endsWith('sw.js'));
const logosFiles = safeWalkDir(logosDir, 'logos');
const logosGenFiles = safeWalkDir(logosGenDir, 'logos_variants');
// Recursively walk all files in public, skipping IGNORED_FILES and sw.js
let allFiles = walkDir(publicDir, '').filter(f => !f.endsWith('sw.js'));
const allFiles = Array.from(new Set([...publicFiles, ...logosFiles, ...logosGenFiles]));
// Remove duplicates
allFiles = Array.from(new Set(allFiles));
fs.writeFileSync(
path.join(publicDir, 'pwa-files-to-cache.json'),

15
scripts/generate-svg-variants.js
View File

@@ -2,19 +2,8 @@
const fs = require('fs');
const path = require('path');
const { collections } = require('../src/collections.js');
const collections = [
{ name: 'logos', label: 'Logos',
baseDir: 'logos',
genDir: 'logos_variants',
dataFile: 'data/logos.json'
},
{ name: 'flags', label: 'Flags',
baseDir: 'flags',
genDir: 'flags_variants',
dataFile: 'data/flags.json'
}
];
// Accept collection as a CLI arg or env var
const collectionArg = process.argv.find(arg => arg.startsWith('--collection='));
@@ -22,7 +11,7 @@ const collectionName = collectionArg ? collectionArg.split('=')[1] : (process.en
const collection = collections.find(c => c.name === collectionName) || collections[0];
const LOGOS_DIR = path.join(__dirname, '..', 'public', collection.baseDir);
const LOGOS_GEN_DIR = path.join(__dirname, '..', 'public', collection.genDir);
const LOGOS_GEN_DIR = path.join(__dirname, '..', 'public', collection.varDir);
// Try multiple possible locations for logos.json
const POSSIBLE_LOGOS_JSON_PATHS = [

38
scripts/update-data.js
View File

@@ -12,9 +12,9 @@ const collectionArg = process.argv.find(arg => arg.startsWith('--collection='));
const collectionName = collectionArg ? collectionArg.split('=')[1] : (process.env.COLLECTION || 'logos');
const collection = collections.find(c => c.name === collectionName) || collections[0];
const logosDir = path.join(__dirname, '..', 'public', collection.baseDir);
const imagesDir = path.join(__dirname, '..', 'public', collection.baseDir);
const outputFile = path.join(__dirname, '..', 'public', collection.dataFile);
const genDir = path.join(__dirname, '..', 'public', collection.genDir);
const imagesVarDir = path.join(__dirname, '..', 'public', collection.imagesVarDir);
// Remove old PNG/JPG folders if they exist
const pngDir = path.join(__dirname, '..', 'public', collection.baseDir + '-png');
@@ -80,15 +80,15 @@ function svgToJpg(svgBuffer, width, height) {
}
// Pregenerate PNG and JPG images for SVG files
function pregenerateImages(logoFiles, logosDir, genDir) {
cleanDir(genDir);
function pregenerateImages(logoFiles, imagesDir, imagesVarDir) {
cleanDir(imagesVarDir);
// Only process SVG files
const svgFiles = logoFiles.filter(file => /\.svg$/i.test(file));
for (const file of svgFiles) {
const base = getBaseName(file);
const svgPath = path.join(logosDir, file);
const pngPath = path.join(genDir, base + '.png');
const jpgPath = path.join(genDir, base + '.jpg');
const svgPath = path.join(imagesDir, file);
const pngPath = path.join(imagesVarDir, base + '.png');
const jpgPath = path.join(imagesVarDir, base + '.jpg');
try {
const svgBuffer = fs.readFileSync(svgPath);
const pngBuffer = svgToPng(svgBuffer, 256, 256);
@@ -103,7 +103,7 @@ function pregenerateImages(logoFiles, logosDir, genDir) {
// Scan directory and update logo objects
function scanLogos() {
console.log(`Scanning logos directory: ${logosDir}`);
console.log(`Scanning logos directory: ${imagesDir}`);
let existing = [];
if (fs.existsSync(outputFile)) {
@@ -115,12 +115,12 @@ function scanLogos() {
}
try {
if (!fs.existsSync(logosDir)) {
console.error(`Directory does not exist: ${logosDir}`);
if (!fs.existsSync(imagesDir)) {
console.error(`Directory does not exist: ${imagesDir}`);
return [];
}
const files = fs.readdirSync(logosDir);
const files = fs.readdirSync(imagesDir);
// Filter for image files (svg, png, jpg, jpeg)
const logoFiles = files.filter(file =>
/\.(svg|png|jpg|jpeg)$/i.test(file)
@@ -185,13 +185,13 @@ function main() {
// If no collection is specified, process all collections
if (!collectionArg && !process.env.COLLECTION) {
for (const col of collections) {
const logosDir = path.join(__dirname, '..', 'public', col.baseDir);
const imagesDir = path.join(__dirname, '..', 'public', col.baseDir);
const outputFile = path.join(__dirname, '..', 'public', col.dataFile);
const genDir = path.join(__dirname, '..', 'public', col.genDir);
if (!fs.existsSync(logosDir)) {
fs.mkdirSync(logosDir, { recursive: true });
const varDir = path.join(__dirname, '..', 'public', col.varDir);
if (!fs.existsSync(imagesDir)) {
fs.mkdirSync(imagesDir, { recursive: true });
}
const files = fs.readdirSync(logosDir);
const files = fs.readdirSync(imagesDir);
// Only update/disable/add, do not overwrite existing keys
let existing = [];
if (fs.existsSync(outputFile)) {
@@ -231,7 +231,7 @@ function main() {
})
.sort((a, b) => a.name.localeCompare(b.name));
let merged = [...existing, ...newLogos];
pregenerateImages(files, logosDir, genDir);
pregenerateImages(files, imagesDir, varDir);
try {
const data = JSON.stringify(merged, null, 2);
fs.writeFileSync(outputFile, data);
@@ -243,8 +243,8 @@ function main() {
} else {
// Single collection mode (as before)
const logos = scanLogos();
const files = fs.readdirSync(logosDir);
pregenerateImages(files, logosDir, genDir);
const files = fs.readdirSync(imagesDir);
pregenerateImages(files, imagesDir, varDir);
saveLogosToJson(logos);
}
}