fix: skip model size comparison in diff check (Blender compression changes size)
Models are always re-pushed server-side since Draco compression changes the file size, making client/remote size comparison unreliable. Textures are still compared by size (not compressed, reliable). Client-side diff now only flags models as 'new' if absent from remote, and never as 'changed' (server handles the actual push decision).
This commit is contained in:
@@ -7,7 +7,7 @@ import { parseMultiUpload } from '@/lib/parse-upload'
|
|||||||
import { compressWithBlender } from '@/lib/blender'
|
import { compressWithBlender } from '@/lib/blender'
|
||||||
import { getRemoteFolder, pushAllToGitHub } from '@/lib/github'
|
import { getRemoteFolder, pushAllToGitHub } from '@/lib/github'
|
||||||
import { buildCommitMessage } from '@/lib/commit-message'
|
import { buildCommitMessage } from '@/lib/commit-message'
|
||||||
import { TMP_DIR } from '@/lib/constants'
|
import { TMP_DIR, MODEL_EXTENSIONS } from '@/lib/constants'
|
||||||
import type { FileChange } from '@/lib/types'
|
import type { FileChange } from '@/lib/types'
|
||||||
|
|
||||||
export const runtime = 'nodejs'
|
export const runtime = 'nodejs'
|
||||||
@@ -84,7 +84,9 @@ export async function POST(req: NextRequest) {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
// --- Detect existing files and compare size to classify changes (LFS-compatible) ---
|
// --- Detect existing files and classify changes ---
|
||||||
|
// Models: always re-push (compression changes size, can't compare with LFS remote)
|
||||||
|
// Textures: compare by size (not compressed, reliable)
|
||||||
const folderPath = `public/models/${destination}/${folderName}`
|
const folderPath = `public/models/${destination}/${folderName}`
|
||||||
let remoteFileMap: Map<string, number>
|
let remoteFileMap: Map<string, number>
|
||||||
|
|
||||||
@@ -97,12 +99,21 @@ export async function POST(req: NextRequest) {
|
|||||||
|
|
||||||
const isReplace = remoteFileMap.size > 0
|
const isReplace = remoteFileMap.size > 0
|
||||||
|
|
||||||
// Classify each file: changed, new, or unchanged
|
|
||||||
const fileChanges = new Map<string, FileChange>()
|
const fileChanges = new Map<string, FileChange>()
|
||||||
const changedFilesToPush: { path: string; contentBase64: string }[] = []
|
const changedFilesToPush: { path: string; contentBase64: string }[] = []
|
||||||
|
|
||||||
for (const f of filesToPush) {
|
for (const f of filesToPush) {
|
||||||
const filename = f.path.split('/').pop() ?? ''
|
const filename = f.path.split('/').pop() ?? ''
|
||||||
|
const ext = filename.slice(filename.lastIndexOf('.')).toLowerCase()
|
||||||
|
const isModel = MODEL_EXTENSIONS.has(ext)
|
||||||
|
|
||||||
|
if (isModel) {
|
||||||
|
// Model: always re-push since compression makes size comparison unreliable
|
||||||
|
const remoteSize = remoteFileMap.get(filename.toLowerCase())
|
||||||
|
fileChanges.set(filename.toLowerCase(), remoteSize === undefined ? 'new' : 'changed')
|
||||||
|
changedFilesToPush.push(f)
|
||||||
|
} else {
|
||||||
|
// Texture: compare by size
|
||||||
const localSize = Buffer.from(f.contentBase64, 'base64').length
|
const localSize = Buffer.from(f.contentBase64, 'base64').length
|
||||||
const remoteSize = remoteFileMap.get(filename.toLowerCase())
|
const remoteSize = remoteFileMap.get(filename.toLowerCase())
|
||||||
|
|
||||||
@@ -116,6 +127,7 @@ export async function POST(req: NextRequest) {
|
|||||||
fileChanges.set(filename.toLowerCase(), 'unchanged')
|
fileChanges.set(filename.toLowerCase(), 'unchanged')
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Files on remote not in the new upload → deleted (orphans)
|
// Files on remote not in the new upload → deleted (orphans)
|
||||||
const newFileNames = new Set(filesToPush.map((f) => (f.path.split('/').pop() ?? '').toLowerCase()))
|
const newFileNames = new Set(filesToPush.map((f) => (f.path.split('/').pop() ?? '').toLowerCase()))
|
||||||
|
|||||||
+16
-18
@@ -44,33 +44,31 @@ async function checkFolderDiffs(
|
|||||||
const remoteFiles: { name: string; size: number }[] = data.files || []
|
const remoteFiles: { name: string; size: number }[] = data.files || []
|
||||||
const remoteMap = new Map(remoteFiles.map((f) => [f.name.toLowerCase(), f.size]))
|
const remoteMap = new Map(remoteFiles.map((f) => [f.name.toLowerCase(), f.size]))
|
||||||
|
|
||||||
// Build local file list with sizes
|
|
||||||
const localFiles: { name: string; size: number }[] = []
|
|
||||||
localFiles.push({
|
|
||||||
name: folder.modelFile.name,
|
|
||||||
size: folder.modelFile.size,
|
|
||||||
})
|
|
||||||
for (const tex of folder.textures) {
|
|
||||||
localFiles.push({
|
|
||||||
name: tex.name,
|
|
||||||
size: tex.file.size,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
const diffs: FileDiff[] = []
|
const diffs: FileDiff[] = []
|
||||||
const localNames = new Set<string>()
|
const localNames = new Set<string>()
|
||||||
|
|
||||||
for (const local of localFiles) {
|
// Model: skip size comparison (compression changes the size).
|
||||||
const key = local.name.toLowerCase()
|
// We only check if it exists on remote or not.
|
||||||
|
const modelKey = folder.modelFile.name.toLowerCase()
|
||||||
|
localNames.add(modelKey)
|
||||||
|
if (!remoteMap.has(modelKey)) {
|
||||||
|
diffs.push({ name: folder.modelFile.name, status: 'new' })
|
||||||
|
}
|
||||||
|
// If model exists on remote → don't add to diffs (we can't know if it changed)
|
||||||
|
|
||||||
|
// Textures: compare by size (not compressed, so size is reliable)
|
||||||
|
for (const tex of folder.textures) {
|
||||||
|
const key = tex.name.toLowerCase()
|
||||||
localNames.add(key)
|
localNames.add(key)
|
||||||
const remoteSize = remoteMap.get(key)
|
const remoteSize = remoteMap.get(key)
|
||||||
if (remoteSize === undefined) {
|
if (remoteSize === undefined) {
|
||||||
diffs.push({ name: local.name, status: 'new' })
|
diffs.push({ name: tex.name, status: 'new' })
|
||||||
} else if (remoteSize !== local.size) {
|
} else if (remoteSize !== tex.file.size) {
|
||||||
diffs.push({ name: local.name, status: 'changed' })
|
diffs.push({ name: tex.name, status: 'changed' })
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Files on remote but not in local → deleted
|
||||||
for (const [name] of remoteMap) {
|
for (const [name] of remoteMap) {
|
||||||
if (!localNames.has(name)) {
|
if (!localNames.has(name)) {
|
||||||
diffs.push({ name, status: 'deleted' })
|
diffs.push({ name, status: 'deleted' })
|
||||||
|
|||||||
Reference in New Issue
Block a user