math-pixel/upload-gltf
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: prevent duplicate uploads and group asset commits

Browse Source
This commit is contained in:
Tom Boullay
2026-04-24 16:58:49 +02:00
parent fe8a6f0f54
commit 53c4c0ed60
15 changed files with 329 additions and 152 deletions
Download Patch File Download Diff File Expand all files Collapse all files
app/api/upload/drive/route.ts
+10
View File
@@ -7,6 +7,7 @@ import {
uploadFile,
findNextVersion,
} from '@/lib/nextcloud'
import { acquireUploadLock, releaseUploadLock } from '@/lib/upload-lock'
export const runtime = 'nodejs'
export const dynamic = 'force-dynamic'
@@ -56,6 +57,13 @@ export async function POST(req: NextRequest) {
return NextResponse.json({ success: false, error: message }, { status: 400 })
}
if (!acquireUploadLock(folderName)) {
return NextResponse.json(
{ success: false, error: 'Un upload est deja en cours pour ce dossier. Patientez quelques secondes.' },
{ status: 409 },
)
}
const basePath = process.env.NEXTCLOUD_BASE_PATH || 'Models'
const vfFolderPath = `${basePath}/VF/${folderName}`
@@ -95,5 +103,7 @@ export async function POST(req: NextRequest) {
{ success: false, error: `Drive echoue: ${message}` },
{ status: 500 },
)
} finally {
releaseUploadLock(folderName)
}
}
app/api/upload/git/route.ts
+76 -60
View File
@@ -5,6 +5,7 @@ import { getRemoteFolder, pushAllToGitHub } from '@/lib/github'
import { buildCommitMessage } from '@/lib/commit-message'
import { classifyFileChanges } from '@/lib/diff-files'
import { prepareGitAssets } from '@/lib/prepare-git-assets'
import { acquireUploadLock, releaseUploadLock } from '@/lib/upload-lock'
export const runtime = 'nodejs'
export const dynamic = 'force-dynamic'
@@ -31,67 +32,82 @@ export async function POST(req: NextRequest) {
return NextResponse.json({ success: false, error: message }, { status: 400 })
}
// --- Process files (compress model + textures for Git) ---
const {
filesToPush,
modelFilename,
compressed,
compressionError,
textureNames,
} = await prepareGitAssets({ folderName, parsedFiles })
// --- Detect existing files and classify changes ---
const folderPath = `public/models/${folderName}`
let remoteFileMap: Map<string, number>
try {
const remote = await getRemoteFolder(folderPath)
remoteFileMap = new Map(remote.files.map((f) => [f.name.toLowerCase(), f.size]))
} catch {
remoteFileMap = new Map()
}
const isReplace = remoteFileMap.size > 0
const { fileChanges, changedFilesToPush, deletedFileNames, deletePaths } =
classifyFileChanges(filesToPush, remoteFileMap, folderPath)
// If nothing changed, don't create an empty commit
if (changedFilesToPush.length === 0 && deletePaths.length === 0) {
return NextResponse.json({
success: true,
folderName,
filesCount: 0,
compressed,
compressionError: compressionError || undefined,
message: 'Aucun fichier modifie — rien a envoyer.',
})
}
// --- Build commit message ---
const commitMessage = buildCommitMessage(
folderName, modelFilename, textureNames,
compressed, isReplace, fileChanges, deletedFileNames,
)
// --- Push all in one commit ---
try {
const { commitUrl } = await pushAllToGitHub(changedFilesToPush, deletePaths, commitMessage)
return NextResponse.json({
success: true,
folderName,
filesCount: changedFilesToPush.length,
compressed,
compressionError: compressionError || undefined,
message: `${changedFilesToPush.length} fichier(s) modifie(s) envoye(s) sur GitHub en un seul commit.`,
commitUrl,
})
} catch (err) {
const message = err instanceof Error ? err.message : 'Erreur GitHub inconnue'
if (!acquireUploadLock(folderName)) {
return NextResponse.json(
{ success: false, error: `Push GitHub echoue: ${message}` },
{ status: 500 },
{ success: false, error: 'Un upload est deja en cours pour ce dossier. Patientez quelques secondes.' },
{ status: 409 },
)
}
try {
// --- Process files (compress model + textures for Git) ---
const {
filesToPush,
modelFilename,
compressed,
compressionError,
assetSummaries,
} = await prepareGitAssets({ folderName, parsedFiles })
// --- Detect existing files and classify changes ---
const folderPath = `public/models/${folderName}`
let remoteFileMap: Map<string, number>
try {
const remote = await getRemoteFolder(folderPath)
remoteFileMap = new Map(remote.files.map((f) => [f.name.toLowerCase(), f.size]))
} catch {
remoteFileMap = new Map()
}
const isReplace = remoteFileMap.size > 0
const { fileChanges, changedFilesToPush, deletedFileNames, deletePaths } =
classifyFileChanges(filesToPush, remoteFileMap, folderPath)
// If nothing changed, don't create an empty commit
if (changedFilesToPush.length === 0 && deletePaths.length === 0) {
return NextResponse.json({
success: true,
folderName,
filesCount: 0,
compressed,
compressionError: compressionError || undefined,
message: 'Aucun fichier modifie — rien a envoyer.',
})
}
// --- Build commit message ---
const commitMessage = buildCommitMessage(
folderName,
modelFilename,
assetSummaries,
isReplace,
fileChanges,
deletedFileNames,
)
// --- Push all in one commit ---
try {
const { commitUrl } = await pushAllToGitHub(changedFilesToPush, deletePaths, commitMessage)
return NextResponse.json({
success: true,
folderName,
filesCount: changedFilesToPush.length,
compressed,
compressionError: compressionError || undefined,
message: `${changedFilesToPush.length} fichier(s) modifie(s) envoye(s) sur GitHub en un seul commit.`,
commitUrl,
})
} catch (err) {
const message = err instanceof Error ? err.message : 'Erreur GitHub inconnue'
return NextResponse.json(
{ success: false, error: `Push GitHub echoue: ${message}` },
{ status: 500 },
)
}
} finally {
releaseUploadLock(folderName)
}
}
app/page.tsx
+1 -1
View File
@@ -15,7 +15,7 @@ export default function Home() {
<UploadZone />
<footer className="text-gray-500 text-xs text-center">
<footer className="mt-3 text-gray-500 text-xs text-center">
Modeles : <span className="font-mono text-gray-400">.glb</span>
<span className="mx-2">·</span>
Textures : <span className="font-mono text-gray-400">.png · .jpg · .webp</span>