This commit is contained in:
Fabien POLLY
2026-01-24 17:56:12 +01:00
parent 2d70c1ed66
commit 9b04b1eb50

View File

@@ -1111,8 +1111,8 @@
contentCache: {}, contentCache: {},
searchIndex: [], searchIndex: [],
expandedSections: new Set(), expandedSections: new Set(),
repo: "infinition/Bjorn", // Fallback repo: "infinition/AcidWiki", // Fallback
branch: "wiki", branch: "main",
currentTitle: "", currentTitle: "",
currentFolder: "", currentFolder: "",
currentFilename: "" currentFilename: ""
@@ -1407,28 +1407,28 @@
// --- 4. WIKI CORE --- // --- 4. WIKI CORE ---
async function initWiki() { async function initWiki() {
try { try {
debugLog('[Bjorn] 🚀 Initializing wiki...'); debugLog('[AcidWiki] 🚀 Initializing wiki...');
// Try GitHub API first for production // Try GitHub API first for production
let structure = await fetchWikiStructureFromAPI(); let structure = await fetchWikiStructureFromAPI();
// If API fails, try local filesystem scanning (for local HTTP servers) // If API fails, try local filesystem scanning (for local HTTP servers)
if (!structure) { if (!structure) {
debugLog('[Bjorn] 🔄 Trying local filesystem scan...'); debugLog('[AcidWiki] 🔄 Trying local filesystem scan...');
structure = await scanLocalFilesystem(); structure = await scanLocalFilesystem();
} }
if (!structure || Object.keys(structure).length === 0) { if (!structure || Object.keys(structure).length === 0) {
if (CONFIG.features.showRootReadme) { if (CONFIG.features.showRootReadme) {
debugLog('[Bjorn] No docs found, but root README is enabled. Proceeding...'); debugLog('[AcidWiki] No docs found, but root README is enabled. Proceeding...');
structure = {}; // Empty but valid structure = {}; // Empty but valid
} else { } else {
console.error('[Bjorn] ❌ No wiki content found!'); console.error('[AcidWiki] ❌ No wiki content found!');
throw new Error("No wiki content found. Please add .md files to wiki/docs/"); throw new Error("No wiki content found. Please add .md files to wiki/docs/");
} }
} }
debugLog('[Bjorn] ✅ Wiki structure loaded successfully'); debugLog('[AcidWiki] ✅ Wiki structure loaded successfully');
STATE.wikiData = structure; STATE.wikiData = structure;
const firstFolder = Object.keys(STATE.wikiData)[0]; const firstFolder = Object.keys(STATE.wikiData)[0];
@@ -1453,44 +1453,35 @@
showErrorState(e.message); showErrorState(e.message);
} }
} }
async function fetchWikiStructureFromAPI() { async function fetchWikiStructureFromAPI() {
if (!STATE.repo) return null; // CORRECTION : On autorise l'API même en mode local, tant qu'il y a un repo configuré
if (!STATE.repo) {
// On essaie la branche configurée, puis 'wiki', puis 'main' debugLog('[AcidWiki] ⏭️ Skipping GitHub API (no repo configured)');
const branchesToTry = [CONFIG.branch, 'wiki', 'main']; return null;
}
const branchesToTry = [CONFIG.branch, 'main', 'master'];
for (const branch of branchesToTry) { for (const branch of branchesToTry) {
if (!branch) continue; if (!branch) continue;
debugLog(`[Bjorn] 🌐 Fetching structure from GitHub API: ${STATE.repo}/${branch}`); debugLog(`[AcidWiki] 🌐 Fetching structure from GitHub API: ${STATE.repo}/${branch}`);
try { try {
// API Call pour récupérer l'arbre complet (recursive)
const res = await fetch(`https://api.github.com/repos/${STATE.repo}/git/trees/${branch}?recursive=1`); const res = await fetch(`https://api.github.com/repos/${STATE.repo}/git/trees/${branch}?recursive=1`);
if (!res.ok) { if (!res.ok) {
debugLog(`[Bjorn] ⚠️ Branch "${branch}" failed (${res.status})`); debugLog(`[AcidWiki] ⚠️ Branch "${branch}" failed (${res.status})`);
continue; continue;
} }
debugLog(`[AcidWiki] ✅ GitHub API response received for branch: ${branch}`);
const data = await res.json(); const data = await res.json();
// DEBUG: Décommentez la ligne ci-dessous si ça affiche encore "Found 0 files" pour voir ce que GitHub renvoie
// console.log("GitHub Tree:", data.tree);
const structure = {}; const structure = {};
let fileCount = 0; let fileCount = 0;
data.tree.forEach(item => { data.tree.forEach(item => {
// On cherche des fichiers .md qui sont dans un dossier 'docs' (peu importe le préfixe parent) if (item.path.startsWith('wiki/docs/') && item.type === 'blob' && item.path.endsWith('.md')) {
// Cela marchera pour 'wiki/docs/File.md' ET 'docs/File.md' const relativePath = item.path.replace('wiki/docs/', '');
if (item.type === 'blob' && item.path.endsWith('.md') && (item.path.includes('/docs/') || item.path.startsWith('docs/'))) {
// On extrait la partie relative après "docs/" pour construire le menu
// Ex: "wiki/docs/01_General/Intro.md" -> "01_General/Intro.md"
const relativePath = item.path.substring(item.path.indexOf('docs/') + 5);
const parts = relativePath.split('/'); const parts = relativePath.split('/');
// Construction de l'objet de structure
let currentLevel = structure; let currentLevel = structure;
for (let i = 0; i < parts.length - 1; i++) { for (let i = 0; i < parts.length - 1; i++) {
const folder = parts[i]; const folder = parts[i];
@@ -1499,17 +1490,13 @@
} }
const filename = parts[parts.length - 1]; const filename = parts[parts.length - 1];
// On stocke le chemin COMPLET pour que le fetch plus tard puisse le trouver
// C'est la clé du fix : on garde 'item.path' qui est le vrai chemin GitHub
const title = decodeURIComponent(filename.replace(/\.md$/, '').replace(/_/g, ' ')); const title = decodeURIComponent(filename.replace(/\.md$/, '').replace(/_/g, ' '));
currentLevel[title] = filename;
// Petite astuce : on stocke le vrai chemin API dans la structure
currentLevel[title] = item.path;
fileCount++; fileCount++;
} }
}); });
// Fonction de tri (inchangée) // Sort folders and files recursively
function sortStructure(obj) { function sortStructure(obj) {
const sorted = {}; const sorted = {};
Object.keys(obj).sort().forEach(key => { Object.keys(obj).sort().forEach(key => {
@@ -1523,33 +1510,31 @@
} }
const sortedStructure = sortStructure(structure); const sortedStructure = sortStructure(structure);
debugLog(`[Bjorn] ✅ GitHub discovery complete: Found ${fileCount} files`); debugLog(`[AcidWiki] ✅ GitHub discovery complete: Found ${fileCount} files`);
return Object.keys(sortedStructure).length > 0 ? sortedStructure : null;
if (fileCount > 0) return sortedStructure;
} catch (e) { } catch (e) {
debugLog(`[Bjorn] ❌ Error fetching branch "${branch}":`, e); debugLog(`[AcidWiki] ❌ Error fetching branch "${branch}":`, e);
} }
} }
return null; return null;
} }
async function scanLocalFilesystem() { async function scanLocalFilesystem() {
debugLog('[Bjorn] 🔍 Starting local filesystem scan...'); debugLog('[AcidWiki] 🔍 Starting local filesystem scan...');
try { try {
// Try to fetch the wiki/docs/ directory listing // Try to fetch the wiki/docs/ directory listing
const res = await fetch('./wiki/docs/'); const res = await fetch('./wiki/docs/');
if (!res.ok) { if (!res.ok) {
debugLog('[Bjorn] ❌ Cannot access wiki/docs/ directory'); debugLog('[AcidWiki] ❌ Cannot access wiki/docs/ directory');
return null; return null;
} }
debugLog('[Bjorn] ✅ Successfully accessed wiki/docs/'); debugLog('[AcidWiki] ✅ Successfully accessed wiki/docs/');
const structure = {}; const structure = {};
// Recursive function to scan a folder // Recursive function to scan a folder
async function scanFolder(path = '', parentStructure = structure) { async function scanFolder(path = '', parentStructure = structure) {
debugLog(`[Bjorn] 📂 Scanning folder: wiki/docs/${path || '(root)'}`); debugLog(`[AcidWiki] 📂 Scanning folder: wiki/docs/${path || '(root)'}`);
const folderUrl = path ? `./wiki/docs/${path}/` : './wiki/docs/'; const folderUrl = path ? `./wiki/docs/${path}/` : './wiki/docs/';
const folderRes = await fetch(folderUrl); const folderRes = await fetch(folderUrl);
@@ -1563,7 +1548,7 @@
let filesFound = 0; let filesFound = 0;
let foldersFound = 0; let foldersFound = 0;
debugLog(`[Bjorn] 🔎 Found ${links.length} links in HTML`); debugLog(`[AcidWiki] 🔎 Found ${links.length} links in HTML`);
for (const link of links) { for (const link of links) {
const href = link.getAttribute('href'); const href = link.getAttribute('href');
@@ -1573,7 +1558,7 @@
// Skip navigation links // Skip navigation links
if (linkText === '..' || linkText === '~') { if (linkText === '..' || linkText === '~') {
debugLog(`[Bjorn] ⏭️ Skipped navigation link: "${linkText}"`); debugLog(`[AcidWiki] ⏭️ Skipped navigation link: "${linkText}"`);
continue; continue;
} }
@@ -1584,14 +1569,14 @@
// Only process links that contain wiki/docs in their path // Only process links that contain wiki/docs in their path
if (!href.includes(baseDocsPath)) { if (!href.includes(baseDocsPath)) {
debugLog(`[Bjorn] ⏭️ Skipped (not in wiki/docs): "${href}"`); debugLog(`[AcidWiki] ⏭️ Skipped (not in wiki/docs): "${href}"`);
continue; continue;
} }
// Extract the part after /wiki/docs/ // Extract the part after /wiki/docs/
const afterDocs = href.split(baseDocsPath)[1]; const afterDocs = href.split(baseDocsPath)[1];
if (!afterDocs) { if (!afterDocs) {
debugLog(`[Bjorn] ⏭️ Skipped (invalid path after wiki/docs): "${href}"`); debugLog(`[AcidWiki] ⏭️ Skipped (invalid path after wiki/docs): "${href}"`);
continue; continue;
} }
@@ -1600,7 +1585,7 @@
// If we're scanning '01_General', afterDocs should start with '01_General/' and next segment is the child // If we're scanning '01_General', afterDocs should start with '01_General/' and next segment is the child
const expectedPrefix = path ? `${path}/` : ''; const expectedPrefix = path ? `${path}/` : '';
if (path && !afterDocs.startsWith(expectedPrefix)) { if (path && !afterDocs.startsWith(expectedPrefix)) {
debugLog(`[Bjorn] ⏭️ Skipped (not in current path "${path}"): afterDocs="${afterDocs}"`); debugLog(`[AcidWiki] ⏭️ Skipped (not in current path "${path}"): afterDocs="${afterDocs}"`);
continue; continue;
} }
@@ -1610,7 +1595,7 @@
// Only accept direct children: should not contain additional slashes (except trailing for folders) // Only accept direct children: should not contain additional slashes (except trailing for folders)
const withoutTrailingSlash = relativePart.endsWith('/') ? relativePart.slice(0, -1) : relativePart; const withoutTrailingSlash = relativePart.endsWith('/') ? relativePart.slice(0, -1) : relativePart;
if (withoutTrailingSlash.includes('/')) { if (withoutTrailingSlash.includes('/')) {
debugLog(`[Bjorn] ⏭️ Skipped (not a direct child): relativePart="${relativePart}"`); debugLog(`[AcidWiki] ⏭️ Skipped (not a direct child): relativePart="${relativePart}"`);
continue; continue;
} }
@@ -1637,13 +1622,13 @@
} }
if (!folderName || folderName.trim() === '' || folderName === '..') { if (!folderName || folderName.trim() === '' || folderName === '..') {
debugLog(`[Bjorn] ⏭️ Skipping invalid folder name: "${folderName}"`); debugLog(`[AcidWiki] ⏭️ Skipping invalid folder name: "${folderName}"`);
continue; continue;
} }
const fullPath = path ? `${path}/${folderName}` : folderName; const fullPath = path ? `${path}/${folderName}` : folderName;
debugLog(`[Bjorn] 📁 Found folder: ${folderName} (${fullPath})`); debugLog(`[AcidWiki] 📁 Found folder: ${folderName} (${fullPath})`);
foldersFound++; foldersFound++;
if (!parentStructure[folderName]) { if (!parentStructure[folderName]) {
@@ -1653,15 +1638,15 @@
try { try {
await scanFolder(fullPath, parentStructure[folderName]); await scanFolder(fullPath, parentStructure[folderName]);
} catch (e) { } catch (e) {
console.warn(`[Bjorn] ⚠️ Failed to scan subfolder ${fullPath}:`, e); console.warn(`[AcidWiki] ⚠️ Failed to scan subfolder ${fullPath}:`, e);
} }
} else { } else {
debugLog(`[Bjorn] ⏭️ Skipped non-markdown file: "${href}"`); debugLog(`[AcidWiki] ⏭️ Skipped non-markdown file: "${href}"`);
} }
} }
debugLog(`[Bjorn] ✓ Folder scan complete: ${filesFound} files, ${foldersFound} subfolders`); debugLog(`[AcidWiki] ✓ Folder scan complete: ${filesFound} files, ${foldersFound} subfolders`);
debugLog(`[Bjorn] 📊 Structure for "${path || 'root'}":`, Object.keys(parentStructure)); debugLog(`[AcidWiki] 📊 Structure for "${path || 'root'}":`, Object.keys(parentStructure));
} }
// Start recursive scanning from root // Start recursive scanning from root
@@ -1683,12 +1668,12 @@
const sortedStructure = sortStructure(structure); const sortedStructure = sortStructure(structure);
const totalItems = JSON.stringify(sortedStructure).split('.md').length - 1; const totalItems = JSON.stringify(sortedStructure).split('.md').length - 1;
debugLog(`[Bjorn] ✅ Scan complete! Found ${totalItems} markdown files`); debugLog(`[AcidWiki] ✅ Scan complete! Found ${totalItems} markdown files`);
debugLog('[Bjorn] 📊 Structure:', sortedStructure); debugLog('[AcidWiki] 📊 Structure:', sortedStructure);
return Object.keys(sortedStructure).length > 0 ? sortedStructure : null; return Object.keys(sortedStructure).length > 0 ? sortedStructure : null;
} catch (e) { } catch (e) {
console.error('[Bjorn] ❌ Local filesystem scan failed:', e); console.error('[AcidWiki] ❌ Local filesystem scan failed:', e);
return null; return null;
} }
} }
@@ -1770,9 +1755,9 @@
content: text.toLowerCase(), content: text.toLowerCase(),
titleLower: (CONFIG.ui.rootReadmeTitle || "Project Home").toLowerCase() titleLower: (CONFIG.ui.rootReadmeTitle || "Project Home").toLowerCase()
}); });
debugLog("[Bjorn] 🔍 Root README indexed."); debugLog("[AcidWiki] 🔍 Root README indexed.");
}) })
.catch(e => console.warn("[Bjorn] Failed to index README.md", e)) .catch(e => console.warn("[AcidWiki] Failed to index README.md", e))
); );
} }
@@ -1794,7 +1779,7 @@
titleLower: CONFIG.ui.changelogTitle.toLowerCase(), titleLower: CONFIG.ui.changelogTitle.toLowerCase(),
isVirtual: true isVirtual: true
}); });
debugLog("[Bjorn] 🔍 Changelog indexed."); debugLog("[AcidWiki] 🔍 Changelog indexed.");
}) })
.catch(() => { }) .catch(() => { })
); );
@@ -2127,10 +2112,7 @@
try { try {
const path = `wiki/docs/${folder}/${filename}`; const path = `wiki/docs/${folder}/${filename}`;
// C'EST ICI QU'IL FAUT AJOUTER &sha=${STATE.branch} const res = await fetch(`https://api.github.com/repos/${STATE.repo}/commits?path=${path}&page=1&per_page=1`);
// Cette URL utilise 'commits', 'path' et 'sha'
const res = await fetch(`https://api.github.com/repos/${STATE.repo}/commits?path=${path}&sha=${STATE.branch}&page=1&per_page=1`);
if (res.ok) { if (res.ok) {
const data = await res.json(); const data = await res.json();
if (data.length > 0) { if (data.length > 0) {