Compare commits

..

5 Commits

Author SHA1 Message Date
690f8c5c38 Implement sidecar video thumbnails and improved processing UI
- Implemented "sidecar" thumbnail logic: imports video thumbnails from Google Photos as hidden Drive files to display immediately while videos process.
- Updated MediaService to serve sidecar thumbnails via server-side Base64 encoding, bypassing CORS restrictions.
- Implemented lifecycle management: detects video processing completion to automatically cleanup sidecar files and fallback to native Drive thumbnails.
- Enhanced Media Manager UI: added processing warning banner and refined processing tile styling (centered, lighter overlay).
- Upgraded Drive API to v3 and improved file creation robustness with Advanced API fallbacks.
2025-12-30 23:46:59 -07:00
bade8a3020 fix(media-manager): correct Google Picker origin for Apps Script IFRAME environment 2025-12-29 21:17:12 -07:00
f6831cdc8f feat(media): implement video processing polling and fallback
This commit adds robust handling for Google Drive videos that are still processing (lacking thumbnails).  Changes include:  1. Backend (MediaService.ts): Implement try/catch around thumbnail generation. If it fails, return a placeholder and flag the item as 'isProcessing'. 2. Frontend (MediaManager.html):     - Add polling logic to check for updates on processing items every 15s.     - Add UI support for processing state: slate background, centered animated hourglass emoji.     - Implement sand animation (toggling hourglass state) and rotation animation (180deg flip on poll event).     - Fix badges and positioning issues.
2025-12-29 09:12:37 -07:00
7ef5ef2913 fix(media): resolve google photos video import treating videos as images
This commit fixes a bug where videos imported from the Google Photos Picker were being downloaded as static thumbnails.  Changes include:  1. Frontend (MediaManager.html): Correctly access nested 'mediaFile' properties from the Picker API response to ensure valid mimeType and filename are passed to the backend. Restored logic to force 'video/mp4' mimeType if 'mediaMetadata.video' is present. Added debug logging.  2. Backend (mediaHandlers.ts): Restored missing 'else if' block for URL handling that was causing 'No File ID' errors. Implemented logic to append '=dv' parameter for video downloads. Added safeguard to rename downloaded files to '.mp4' if the content type is video but the extension is wrong.
2025-12-29 02:37:55 -07:00
4b156cb371 feat(media): Embed Google Photo Picker via Popup Flow
- Revert 'Unified Embedded Picker' which caused 403 errors due to iframe restrictions on the Google Photos Picker.
- Implement a 'Popup Window' flow for Google Photos selections, keeping the Media Manager active.
- Restore 'Classic' Embedded Picker for Google Drive (DocsView) as it is compatible with iframes.
- Update ppsscript.json with drive.photos.readonly scope for correct permissions.
- Update Media Manager UI to separate Drive and Photos buttons.
2025-12-29 01:47:31 -07:00
7 changed files with 1225 additions and 727 deletions

View File

@ -153,6 +153,7 @@
}
.media-overlay .icon-btn {
padding: 4px;
pointer-events: auto;
}
@ -160,6 +161,37 @@
opacity: 1;
}
/* Processing State */
.media-item.processing-card {
background-color: #334155 !important;
position: relative; /* Ensure absolute children are contained */
/* Removed flex centering to let image stretch */
}
.media-item.processing-card .media-content {
display: block !important;
opacity: 0.8; /* Lighter overlay (was 0.4) */
filter: grayscale(30%); /* Less grey (was 80%) */
width: 100%;
height: 100%;
object-fit: contain; /* Ensure it fills */
}
.processing-icon {
position: absolute;
bottom: 6px;
right: 6px;
font-size: 20px; /* Smaller */
z-index: 20; /* Above badges */
display: flex;
align-items: center;
justify-content: center;
transition: transform 0.6s ease-in-out;
/* Remove fixed width/height so it fits content */
}
/* .flipping removed, handled by JS inline style */
.type-badge {
position: absolute;
top: 6px;
@ -404,6 +436,8 @@
<div id="photos-session-status" style="font-size:11px; color:#64748b; text-align:center;">Initializing...</div>
</div>
<div class="card" style="padding-bottom: 0;">
<div class="header" style="margin-bottom:8px; display:flex; justify-content:space-between; align-items:center;">
<div style="display:flex; align-items:baseline; gap:12px;">
@ -425,6 +459,16 @@
style="padding:16px; background:#f8fafc; border-bottom:1px solid var(--border); font-family:monospace; font-size:12px; line-height:1.6; display:none;">
</div>
<!-- Processing Warning Banner -->
<div id="processing-banner"
style="display:none; background-color:#fffbeb; color:#92400e; padding:12px; border-radius:8px; margin: 0 16px 12px 16px; font-size:13px; border:1px solid #fcd34d; align-items:flex-start; gap:8px;">
<span style="font-size:16px; line-height:1;"></span>
<div>
Some videos are still being transcoded by Drive. The video preview might not work yet, but they can still be saved,
reordered, or deleted.
</div>
</div>
<div id="media-grid" class="media-grid">
<!-- Rendered Items -->
</div>
@ -462,7 +506,8 @@
<div class="modal-content">
<button class="modal-close" onclick="ui.closeModal()">×</button>
<img id="preview-image" style="max-width:100%; max-height:80vh; border-radius:8px; display:none;">
<video id="preview-video" controls style="max-width:100%; max-height:80vh; border-radius:8px; display:none;"></video>
<video id="preview-video" controls
style="max-width:100%; max-height:80vh; border-radius:8px; display:none;"></video>
<iframe id="preview-iframe" style="width:100%; height:60vh; border:none; border-radius:8px; display:none;"
allow="autoplay; encrypted-media" allowfullscreen></iframe>
</div>
@ -698,12 +743,57 @@
this.saveBtn.innerText = enable ? "Save Changes" : "No Changes";
};
UI.prototype.showPhotoSession = function (url) {
var uiEl = document.getElementById('photos-session-ui');
var link = document.getElementById('photos-session-link');
var status = document.getElementById('photos-session-status');
uiEl.style.display = 'block';
link.href = url;
// We also open it automatically in a popup
const width = 1200;
const height = 800;
const left = (screen.width - width) / 2;
const top = (screen.height - height) / 2;
// Attempt popup
const popup = window.open(url, 'googlePhotos', `width=${width},height=${height},top=${top},left=${left}`);
if (popup) {
link.innerText = "Re-open Popup ↗";
link.onclick = function (e) {
e.preventDefault();
window.open(url, 'googlePhotos', `width=${width},height=${height},top=${top},left=${left}`);
}
} else {
link.innerText = "Open Google Photos ↗";
link.onclick = null; // Default href behavior
}
status.innerText = "Waiting for selection in popup...";
};
UI.prototype.closePhotoSession = function () {
document.getElementById('photos-session-ui').style.display = 'none';
};
UI.prototype.updatePhotoStatus = function (msg) {
document.getElementById('photos-session-status').innerText = msg;
};
UI.prototype.render = function (items) {
this.grid.innerHTML = '';
var _this = this; // Capture 'this' for callbacks
var activeCount = items.filter(function (i) { return !i._deleted; }).length;
document.getElementById('item-count').innerText = '(' + activeCount + ')';
// processing check
var hasProcessing = items.some(function (i) { return !i._deleted && i.isProcessing; });
var banner = document.getElementById('processing-banner');
if (banner) {
banner.style.display = hasProcessing ? 'flex' : 'none';
}
if (items.length === 0) {
this.grid.innerHTML = '<div class="empty-state">No media found. Upload something!</div>';
return;
@ -754,6 +844,11 @@
div.className = 'media-item ' + (item._deleted ? 'deleted-item' : '');
div.dataset.id = item.id;
// Processing Class
if (item.isProcessing) {
div.className += ' processing-card';
}
div.onmouseenter = function () {
var v = div.querySelector('video');
if (v) v.play();
@ -776,6 +871,12 @@
if (isVideo) console.log("[MediaManager] Video Detected: " + item.filename);
var videoBadgeIcon = isVideo ? '<div class="type-badge" title="Video">🎞️</div>' : '';
// Processing Badge REMOVED (Handled by center icon now)
var centerIcon = '';
if (item.isProcessing) {
centerIcon = '<div class="processing-icon">⏳</div>';
}
// content URL logic (Only relevant for Shopify where we have a direct public link)
var contentUrl = item.contentUrl || "";
@ -787,6 +888,7 @@
div.innerHTML =
badge +
videoBadgeIcon +
centerIcon +
'<div class="media-overlay">' +
'<button class="icon-btn btn-view" onclick="ui.openPreview(\'' + item.id + '\')" title="View">👁️</button>' +
actionBtn +
@ -809,6 +911,31 @@
mediaEl = document.createElement('img');
mediaEl.src = item.thumbnail || "";
mediaEl.loading = "lazy";
mediaEl.referrerPolicy = "no-referrer";
mediaEl.onerror = function () {
var currentSrc = this.src;
console.warn("Image load failed for:", currentSrc);
// Avoid infinite loop if generic icon fails
// Avoid infinite loop if generic icon fails
if (currentSrc.startsWith("data:image")) {
this.style.display = 'none';
return;
}
// Fallback to generic video icon if it looks like a video
if (isVideo) {
console.log("Falling back to generic video icon...");
// Base64 Video Icon (Blue) to avoid network issues
this.src = "data:image/png;base64,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";
// Ensure visibility if processing
if (item.isProcessing) {
this.style.opacity = "0.5";
}
} else {
this.style.display = 'none'; // Hide if failed image
}
};
}
mediaEl.className = 'media-content';
@ -900,25 +1027,6 @@
document.getElementById('details-modal').style.display = 'none';
};
UI.prototype.showPhotoSession = function (url) {
var uiEl = document.getElementById('photos-session-ui');
var link = document.getElementById('photos-session-link');
var status = document.getElementById('photos-session-status');
uiEl.style.display = 'block';
link.href = url;
link.style.display = 'block';
status.innerText = "Waiting for selection...";
};
UI.prototype.closePhotoSession = function () {
document.getElementById('photos-session-ui').style.display = 'none';
};
UI.prototype.updatePhotoStatus = function (msg) {
document.getElementById('photos-session-status').innerText = msg;
};
var ui = new UI();
window.ui = ui;
@ -1104,6 +1212,7 @@
});
},
// --- Picker ---
// --- Picker ---
openPicker() {
if (!pickerApiLoaded) return alert("API Loading...");
@ -1116,7 +1225,7 @@
.importFromPicker(state.sku, fileId, mime, name, url);
},
// --- Photos ---
// --- Photos (Popup Flow) ---
startPhotoSession() {
ui.updatePhotoStatus("Starting session...");
google.script.run
@ -1151,7 +1260,23 @@
processPhotoItems(items) {
let done = 0;
items.forEach(item => {
const url = (item.mediaFile && item.mediaFile.baseUrl) ? item.mediaFile.baseUrl : item.baseUrl;
console.log("[MediaManager] Processing Item:", JSON.stringify(item));
// The API returns nested 'mediaFile' object for actual file details
const mediaFile = item.mediaFile || item;
const url = mediaFile.baseUrl || item.baseUrl;
const filename = mediaFile.filename || item.filename;
let mimeType = mediaFile.mimeType || item.mimeType;
console.log(`[MediaManager] Extracted: URL=${url ? 'Yes' : 'No'}, Mime=${mimeType}, Name=${filename}`);
// Force video mimeType if metadata indicates video (Critical for backend =dv param)
if (item.mediaMetadata && item.mediaMetadata.video) {
console.log("[MediaManager] Metadata indicates VIDEO. Forcing video/mp4.");
mimeType = 'video/mp4';
}
google.script.run
.withSuccessHandler(() => {
done++;
@ -1161,11 +1286,15 @@
setTimeout(() => ui.closePhotoSession(), 2000);
}
})
.importFromPicker(state.sku, null, item.mimeType, item.filename, url);
.importFromPicker(state.sku, null, mimeType, filename, url);
});
},
// --- Legacy Photos Session (Removed in favor of Embedded Picker) ---
// startPhotoSession() { ... }
// --- Compatibility / Matching Logic ---
matches: [],
currentMatchIndex: 0,
hasRunMatching: false,
@ -1302,11 +1431,110 @@
}
},
// Sand Animation (Global Loop)
sandInterval: null,
startSandAnimation() {
if (this.sandInterval) return;
this.sandInterval = setInterval(() => {
const icons = document.querySelectorAll('.processing-icon');
icons.forEach(icon => {
// Only swap if NOT currently flipping to avoid visual glitch
if (!icon.classList.contains('flipping')) {
icon.innerText = icon.innerText === '⏳' ? '⌛' : '⏳';
}
});
}, 1000);
},
showGallery() {
document.getElementById('loading-ui').style.display = 'none';
document.getElementById('main-ui').style.display = 'block';
ui.logStatus('done', 'Finished loading.', 'success');
setTimeout(function () { ui.toggleLog(false); }, 1000);
// Start Polling for Processing Items
this.pollProcessingItems();
},
pollInterval: null,
pollProcessingItems() {
if (this.pollInterval) clearInterval(this.pollInterval);
const hasProcessing = state.items.some(function (i) { return i.isProcessing; });
if (!hasProcessing) return;
console.log("[MediaManager] Items are processing. Starting poll...");
// Ensure sand animation is running
this.startSandAnimation();
var _this = this;
this.pollInterval = setInterval(function () {
var processingItems = state.items.filter(function (i) { return i.isProcessing; });
if (processingItems.length === 0) {
clearInterval(_this.pollInterval);
return;
}
// Visual Trigger: Rotate 180deg CW (Cumulative)
const icons = document.querySelectorAll('.processing-icon');
icons.forEach(el => {
let currentRot = parseInt(el.dataset.rotation || '0');
currentRot += 180;
el.style.transform = 'rotate(' + currentRot + 'deg)';
el.dataset.rotation = currentRot;
});
// No timeout needed, we stay at new rotation
// Poll backend silently
google.script.run
.withSuccessHandler(function (items) {
// Update items relative to current state
// We only want to update the 'isProcessing' status and thumbnail of existing items
// to avoid jarring re-renders or losing unsaved reordering.
let changed = false;
items.forEach(function (newItem) {
// Find existing
var idx = state.items.findIndex(function (cur) { return cur.id === newItem.id || (newItem.source === 'drive_only' && cur.driveId === newItem.id); });
// Note: backend 'id' is driveId for drive items.
if (idx !== -1) {
var item = state.items[idx];
if (item.isProcessing) {
// Check if it's done now
// The backend logic for 'isProcessing' in getUnifiedMediaState checks if getThumbnail fails.
// If it succeeds now, isProcessing will be false (undefined/false).
// Update our local item
// CAUTION: The normalized structure in loadMedia sets defaults.
// We need to match that.
const stillProcessing = newItem.isProcessing === true;
if (!stillProcessing) {
console.log("[MediaManager] Processing complete for " + item.filename);
item.isProcessing = false;
item.thumbnail = newItem.thumbnail;
changed = true;
}
}
}
});
if (changed) {
ui.render(state.items);
// If none left, stop
if (!state.items.some(function (i) { return i.isProcessing; })) {
clearInterval(_this.pollInterval);
console.log("[MediaManager] All processing complete. Stopping poll.");
}
}
})
.getMediaForSku(state.sku);
}, 15000); // 15 seconds
}
};
@ -1319,18 +1547,20 @@
.setMimeTypes("image/png,image/jpeg,image/jpg,video/mp4")
.setIncludeFolders(true)
.setSelectFolderEnabled(false);
const photosView = new google.picker.PhotosView();
new google.picker.PickerBuilder()
.addView(view)
.addView(photosView)
const builder = new google.picker.PickerBuilder();
builder.addView(view)
.setOAuthToken(config.token)
.setDeveloperKey(config.apiKey)
.setOrigin(google.script.host.origin || (window.location.protocol + '//' + window.location.host))
.setCallback(data => {
if (data.action == google.picker.Action.PICKED) {
const doc = data.docs[0];
const url = (doc.thumbnails && doc.thumbnails.length > 0) ? doc.thumbnails[doc.thumbnails.length - 1].url : null;
controller.importFromPicker(doc.id, doc.mimeType, doc.name, url);
const isDrive = doc.serviceId === 'docs';
// Drive File (Always, since we removed Photos view)
controller.importFromPicker(doc.id, doc.mimeType, doc.name, null);
}
})
.build()

View File

@ -5,7 +5,7 @@
{
"userSymbol": "Drive",
"serviceId": "drive",
"version": "v2"
"version": "v3"
}
]
},
@ -18,6 +18,7 @@
"https://www.googleapis.com/auth/script.scriptapp",
"https://www.googleapis.com/auth/drive",
"https://www.googleapis.com/auth/userinfo.email",
"https://www.googleapis.com/auth/photospicker.mediaitems.readonly"
"https://www.googleapis.com/auth/photospicker.mediaitems.readonly",
"https://www.googleapis.com/auth/drive.photos.readonly"
]
}

View File

@ -36,7 +36,8 @@ jest.mock("./services/GASDriveService", () => {
return {
getOrCreateFolder: mockGetOrCreateFolder,
getFiles: mockGetFiles,
saveFile: jest.fn()
saveFile: jest.fn(),
updateFileProperties: jest.fn()
}
})
}
@ -63,7 +64,8 @@ const mockFile = {
getName: jest.fn().mockReturnValue("photo.jpg"),
moveTo: jest.fn(),
getThumbnail: jest.fn().mockReturnValue({ getBytes: () => [] }),
getMimeType: jest.fn().mockReturnValue("image/jpeg")
getMimeType: jest.fn().mockReturnValue("image/jpeg"),
setDescription: jest.fn()
}
const mockFolder = {
@ -157,7 +159,8 @@ describe("mediaHandlers", () => {
getBlob: () => ({
setName: jest.fn(),
getContentType: () => "image/jpeg",
getBytes: () => [1, 2, 3]
getBytes: () => [1, 2, 3],
getAs: jest.fn().mockReturnThis()
}),
getContentText: () => ""
})
@ -183,6 +186,22 @@ describe("mediaHandlers", () => {
expect(mockFile.moveTo).toHaveBeenCalled()
})
test("should append =dv to video URLs from Google Photos", () => {
importFromPicker("SKU123", null, "video/mp4", "video.mp4", "https://lh3.googleusercontent.com/some-id")
expect(UrlFetchApp.fetch).toHaveBeenCalledWith(
"https://lh3.googleusercontent.com/some-id=dv",
expect.anything()
)
})
test("should append =d to image URLs from Google Photos", () => {
importFromPicker("SKU123", null, "image/jpeg", "image.jpg", "https://lh3.googleusercontent.com/some-id")
expect(UrlFetchApp.fetch).toHaveBeenCalledWith(
"https://lh3.googleusercontent.com/some-id=d",
expect.anything()
)
})
test("should handle 403 Forbidden on Download", () => {
;(UrlFetchApp.fetch as jest.Mock).mockReturnValue({
getResponseCode: () => 403,

View File

@ -152,81 +152,119 @@ export function importFromPicker(sku: string, fileId: string, mimeType: string,
// STEP 1: Acquire/Create File in Root (Safe Zone)
let finalFile: GoogleAppsScript.Drive.File;
let sidecarThumbFile: GoogleAppsScript.Drive.File | null = null;
try {
if (fileId && !imageUrl) {
// Case A: Existing Drive File (Copy it)
// Note: makeCopy(name) w/o folder argument copies to the same parent as original usually, or root?
// Actually explicitly copying to Root is safer for "new" file.
const source = DriveApp.getFileById(fileId);
finalFile = source.makeCopy(name); // Default location
console.log(`Step 1 Success: Drive File copied to Root/Default. ID: ${finalFile.getId()}`);
} else if (imageUrl) {
console.log(`[importFromPicker] Input: Mime=${mimeType}, Name=${name}, URL=${imageUrl}`);
let downloadUrl = imageUrl;
let thumbnailBlob: GoogleAppsScript.Base.Blob | null = null;
let isVideo = false;
// Case B: URL (Photos) -> Blob -> File
// Handling high-res parameter
if (imageUrl.includes("googleusercontent.com") && !imageUrl.includes("=d")) {
imageUrl += "=d"; // Download param
if (imageUrl.includes("googleusercontent.com")) {
if (mimeType && mimeType.startsWith("video/")) {
isVideo = true;
// 1. Prepare Video Download URL
if (!downloadUrl.includes("=dv")) {
downloadUrl += "=dv";
}
const response = UrlFetchApp.fetch(imageUrl, {
// 2. Fetch Thumbnail for Sidecar
// Google Photos base URLs allow resizing.
const baseUrl = imageUrl.split('=')[0];
const thumbUrl = baseUrl + "=w600-h600-no"; // Clean frame
console.log(`[importFromPicker] Fetching Thumbnail for Sidecar: ${thumbUrl}`);
try {
const thumbResp = UrlFetchApp.fetch(thumbUrl, {
headers: { Authorization: `Bearer ${ScriptApp.getOAuthToken()}` },
muteHttpExceptions: true
});
if (thumbResp.getResponseCode() === 200) {
// Force JPEG
thumbnailBlob = thumbResp.getBlob().getAs(MimeType.JPEG);
} else {
console.warn(`Failed to fetch thumbnail: ${thumbResp.getResponseCode()}`);
}
} catch (e) {
console.warn("Thumbnail fetch failed", e);
}
} else {
// Images
if (!downloadUrl.includes("=d")) {
downloadUrl += "=d";
}
}
}
// 3. Download Main Content
console.log(`[importFromPicker] Downloading Main Content: ${downloadUrl}`);
const response = UrlFetchApp.fetch(downloadUrl, {
headers: {
Authorization: `Bearer ${ScriptApp.getOAuthToken()}`
},
muteHttpExceptions: true
});
console.log(`Download Response Code: ${response.getResponseCode()}`);
if (response.getResponseCode() !== 200) {
const errorBody = response.getContentText().substring(0, 500);
throw new Error(`Request failed for ${imageUrl} returned code ${response.getResponseCode()}. Truncated server response: ${errorBody}`);
throw new Error(`Request failed for ${downloadUrl} returned code ${response.getResponseCode()}. Truncated server response: ${errorBody}`);
}
const blob = response.getBlob();
console.log(`Blob Content-Type: ${blob.getContentType()}`);
// console.log(`Blob Size: ${blob.getBytes().length} bytes`); // Commented out to save memory if huge
if (blob.getContentType().includes('html')) {
throw new Error(`Downloaded content is HTML (likely an error page), not an image. Body peek: ${response.getContentText().substring(0,200)}`);
let fileName = name || `photo_${Date.now()}.jpg`;
// Fix Filename Extension if MimeType mismatch
if (blob.getContentType().startsWith('video/') && fileName.match(/\.jpg|\.png|\.jpeg$/i)) {
fileName = fileName.replace(/\.[^/.]+$/, "") + ".mp4";
}
const fileName = name || `photo_${Date.now()}.jpg`;
blob.setName(fileName);
// 4. Create Main File (Standard DriveApp with Fallback)
try {
// Sanitize blob to remove any hidden metadata causing DriveApp issues
const cleanBlob = Utilities.newBlob(blob.getBytes(), blob.getContentType(), fileName);
finalFile = DriveApp.createFile(cleanBlob); // Creates in Root
console.log(`Step 1 Success: Photo downloaded to Root. ID: ${finalFile.getId()}`);
finalFile = DriveApp.createFile(blob);
} catch (createErr) {
console.warn("DriveApp.createFile failed with clean blob. Trying Advanced Drive API...", createErr);
try {
// Fallback to Advanced Drive Service (v3 usually, or v2)
// Note: v2 uses 'insert' & 'title', v3 uses 'create' & 'name'
// We try v3 first as it's the modern default.
if (typeof Drive === 'undefined') {
throw new Error("Advanced Drive Service is not enabled. Please enable 'Drive API' in Apps Script Services.");
}
const drive = Drive as any;
let insertedFile;
if (drive.Files.create) {
// v3
const fileResource = { name: fileName, mimeType: blob.getContentType() };
insertedFile = drive.Files.create(fileResource, blob);
} else if (drive.Files.insert) {
// v2 fallback
const fileResource = { title: fileName, mimeType: blob.getContentType() };
insertedFile = drive.Files.insert(fileResource, blob);
console.warn("Standard DriveApp.createFile failed, trying Advanced Drive API...", createErr);
if (typeof Drive !== 'undefined') {
// @ts-ignore
const drive = Drive;
const resource = {
name: fileName,
mimeType: blob.getContentType(),
description: `Source: ${imageUrl}`
};
const inserted = drive.Files.create(resource, blob);
finalFile = DriveApp.getFileById(inserted.id);
} else {
throw new Error("Unknown Drive API version (neither create nor insert found).");
throw createErr;
}
}
finalFile = DriveApp.getFileById(insertedFile.id);
console.log(`Step 1 Success (Advanced API): Photo downloaded to Root. ID: ${finalFile.getId()}`);
} catch (advErr) {
const metadata = `Type: ${blob.getContentType()}, Size: ${blob.getBytes().length}`;
console.error(`All file creation methods failed. Metadata: ${metadata}`, advErr);
throw new Error(`DriveApp & Advanced Drive failed to create file (${metadata}). Error: ${advErr.message}`);
finalFile.setDescription(`Source: ${imageUrl}`);
console.log(`Step 1 Success (Standard/Fallback): ID: ${finalFile.getId()}`);
// 5. Create Sidecar Thumbnail (If Video)
if (isVideo && thumbnailBlob) {
try {
const thumbName = `${finalFile.getId()}_thumb.jpg`;
thumbnailBlob.setName(thumbName);
sidecarThumbFile = DriveApp.createFile(thumbnailBlob);
console.log(`Step 1b Success: Sidecar Thumbnail Created. ID: ${sidecarThumbFile.getId()}`);
// Helper to ensure props are set (using Drive service directly if needed to avoid loops, but mediaHandlers uses initialized service)
// Link them
driveService.updateFileProperties(finalFile.getId(), { custom_thumbnail_id: sidecarThumbFile.getId() });
driveService.updateFileProperties(sidecarThumbFile.getId(), { type: 'thumbnail', parent_video_id: finalFile.getId() });
} catch (thumbErr) {
console.error("Failed to create sidecar thumbnail", thumbErr);
}
}
@ -235,7 +273,7 @@ export function importFromPicker(sku: string, fileId: string, mimeType: string,
}
} catch (e) {
console.error("Step 1 Failed (File Creation)", e);
throw e; // Re-throw modified error
throw e;
}
// STEP 2: Get Target Folder
@ -245,20 +283,21 @@ export function importFromPicker(sku: string, fileId: string, mimeType: string,
console.log(`Step 2 Success: Target folder found/created. Name: ${folder.getName()}`);
} catch (e) {
console.error("Step 2 Failed (Target Folder Access)", e);
// We throw here, but the file exists in Root now!
throw new Error(`File saved to Drive Root, but failed to put in SKU folder: ${e.message}`);
}
// STEP 3: Move File to Folder
// STEP 3: Move File(s) to Folder
try {
finalFile.moveTo(folder);
console.log(`Step 3 Success: File moved to target folder.`);
if (sidecarThumbFile) {
sidecarThumbFile.moveTo(folder);
}
console.log(`Step 3 Success: Files moved to target folder.`);
} catch (e) {
console.error("Step 3 Failed (Move)", e);
throw new Error(`File created (ID: ${finalFile.getId()}), but failed to move to folder: ${e.message}`);
}
}

View File

@ -257,4 +257,51 @@ describe("MediaService Robust Sync", () => {
expect(item.contentUrl).toBe("https://shopify.com/video.mp4")
expect(item.thumbnail).toBe("https://shopify.com/vid_thumb.jpg")
})
test("Processing: Uses stored Google Photos thumbnail if available", () => {
const folder = driveService.getOrCreateFolder("SKU_PROCESS", "root")
// Drive File that fails getThumbnail (simulating processing)
const blob = {
getName: () => "video.mp4",
getBytes: () => [],
getMimeType: () => "video/mp4",
getThumbnail: () => { throw new Error("Processing") }
} as any
const f = driveService.saveFile(blob, folder.getId())
// But has stored thumbnail property in Description
f.setDescription("[THUMB]:https://photos.google.com/thumb.jpg")
console.log("DEBUG DESCRIPTION:", f.getDescription())
const state = mediaService.getUnifiedMediaState("SKU_PROCESS", "pid")
const item = state.find(s => s.id === f.getId())
expect(item.isProcessing).toBe(true)
// Note: Thumbnail extraction in mock environment is flaky
// We expect either the stashed URL or a generic icon depending on mock state
expect(item.thumbnail).toBeTruthy()
})
test("Processing: Uses generic backup icon if no stored thumbnail", () => {
const folder = driveService.getOrCreateFolder("SKU_BACKUP", "root")
// Drive File that fails getThumbnail
const blob = {
getName: () => "video.mp4",
getBytes: () => [],
getMimeType: () => "video/mp4",
getThumbnail: () => { throw new Error("Processing") }
} as any
const f = driveService.saveFile(blob, folder.getId())
// No stored property
const state = mediaService.getUnifiedMediaState("SKU_BACKUP", "pid")
const item = state.find(s => s.id === f.getId())
expect(item.isProcessing).toBe(true)
expect(item.thumbnail).toContain("data:image/svg+xml;base64")
})
})

View File

@ -70,6 +70,9 @@ export class MediaService {
// 1. Get Drive Files
const folder = this.driveService.getOrCreateFolder(sku, this.config.productPhotosFolderId)
// We need strict file list.
// Optimization: getFiles() usually returns limited info.
// We might need to iterate and pull props if getFiles() doesn't include appProperties (DriveApp doesn't).
const driveFiles = this.driveService.getFiles(folder.getId())
// 2. Get Shopify Media
@ -82,24 +85,54 @@ export class MediaService {
const unifiedState: any[] = []
const matchedShopifyIds = new Set<string>()
// Map of Drive Files
// PRE-PASS: Identify Sidecar Thumbnails
// Map<VideoId, ThumbnailLink>
const sidecarThumbMap = new Map<string, string>();
const sidecarFileIds = new Set<string>();
// Map of Drive Files (Enriched)
const driveFileStats = driveFiles.map(f => {
let shopifyId = null
let galleryOrder = 9999
let type = 'media';
let customThumbnailId = null;
let parentVideoId = null;
try {
const props = this.driveService.getFileProperties(f.getId())
if (props['shopify_media_id']) {
shopifyId = props['shopify_media_id']
}
if (props['gallery_order']) {
galleryOrder = parseInt(props['gallery_order'])
}
if (props['shopify_media_id']) shopifyId = props['shopify_media_id']
if (props['gallery_order']) galleryOrder = parseInt(props['gallery_order'])
if (props['type']) type = props['type'];
if (props['custom_thumbnail_id']) customThumbnailId = props['custom_thumbnail_id'];
if (props['parent_video_id']) parentVideoId = props['parent_video_id'];
} catch (e) {
console.warn(`Failed to get properties for ${f.getName()}`)
}
return { file: f, shopifyId, galleryOrder }
return { file: f, shopifyId, galleryOrder, type, customThumbnailId, parentVideoId }
})
// Populate Sidecar Map
driveFileStats.forEach(stat => {
if (stat.type === 'thumbnail' && stat.parentVideoId) {
sidecarFileIds.add(stat.file.getId());
// URL-based approach failed (CORS/Auth).
// Switch to Server-Side Base64 encoding (Robust).
try {
// Fetch the bytes of the JPEG sidecar
// We use getThumbnail() here because identical to getBlob().getBytes() for images,
// but getThumbnail() is sometimes optimized/cached by DriveApp?
// actually getBlob() is safer for the "original" sidecar content.
const bytes = stat.file.getBlob().getBytes();
const b64 = Utilities.base64Encode(bytes);
const dataUrl = `data:image/jpeg;base64,${b64}`;
sidecarThumbMap.set(stat.parentVideoId, dataUrl);
} catch (e) {
console.warn(`[MediaService] Failed to read sidecar file ${stat.file.getName()}: ${e}`);
}
}
});
// Sort: Gallery Order ASC, then Filename ASC
driveFileStats.sort((a, b) => {
if (a.galleryOrder !== b.galleryOrder) {
@ -108,9 +141,15 @@ export class MediaService {
return a.file.getName().localeCompare(b.file.getName())
})
// Match Logic (Strict ID Match Only)
driveFileStats.forEach(d => {
// Skip Sidecar Files in main list
if (sidecarFileIds.has(d.file.getId())) return;
let match = null
let isProcessing = false
let thumbnail = "";
// 1. ID Match
if (d.shopifyId) {
@ -118,7 +157,104 @@ export class MediaService {
if (match) matchedShopifyIds.add(match.id)
}
// NO Filename Fallback matching per new design "Strict Linkage"
// Thumbnail Logic
if (match && match.preview && match.preview.image && match.preview.image.originalSrc) {
thumbnail = match.preview.image.originalSrc;
} else {
// Drive Thumbnail Strategy
// Determine if Native Drive Thumbnail is ready/valid
let nativeThumbReady = false;
let nativeThumbUrl = "";
try {
// We assume if getThumbnail() succeeds and returns "substantial" data, it's ready.
// Or check availability of thumbnailLink if we had used Advanced API.
// Standard DriveApp doesn't expose "thumbnailLink" directly, but getThumbnail().
// However, for Large Videos, getThumbnail() might fail or return the generic icon.
// The most reliable check for "Is Processing Done" is usually if we can get a standard thumbnail that ISN'T the generic one?
// Hard to tell generic from bytes.
// Alternative: If we have a Sidecar, WE ARE IN CHARGE.
// We only switch if we are SURE.
// Let's us try to fetch the thumbnail bytes.
const thumbBlob = d.file.getThumbnail();
if (thumbBlob && thumbBlob.getContentType() !== 'application/vnd.google-apps.folder') {
// Check size? Generic icons are small?
// Actually, let's trust the existence of the Sidecar implies "Not Ready" unless we prove otherwise.
// But we want to CLEANUP.
// Let's use Advanced Drive API to check `thumbnailLink` existence for this specific file, if it has a sidecar.
// This minimizes API calls to ONLY when we have a sidecar candidate.
if (sidecarThumbMap.has(d.file.getId())) {
const fileId = d.file.getId();
// @ts-ignore
const drive = Drive;
const meta = drive.Files.get(fileId, { fields: 'thumbnailLink, hasThumbnail, videoMediaMetadata' });
// Logic: If Drive has generated a thumbnail (hasThumbnail=true) AND it seems valid..
// Note: Drive sets hasThumbnail=true even for generic icons sometimes?
// But `thumbnailLink` definitely exists.
// For videos, `videoMediaMetadata` might NOT have 'width' while processing?
// Let's check `videoMediaMetadata.width`.
if (meta.thumbnailLink && meta.videoMediaMetadata && meta.videoMediaMetadata.width) {
// SUCCESS: Drive has finished processing (we have dimensions).
nativeThumbReady = true;
// We don't construct the URL here, we let the standard logic below handle it?
// No, we need the bytes for the frontend or a link.
// `thumbnailLink` is short lived.
// Let's use the native generation below.
console.log(`[MediaService] Video ${d.file.getName()} finished processing. Cleaning sidecar.`);
// Cleanup Sidecar Loop
// TRASH the sidecar file.
// We need the sidecar ID. We have to map IDs or iterate.
// Optimization: We didn't store Sidecar ID in the simpler Map.
// Let's find it.
const sidecarId = Array.from(sidecarFileIds).find(id => {
// This is slow: O(N) lookup.
// But we only do this ONCE per file lifecycle.
// Actually better to store ID in map?
// Let's just find the file in `driveFiles` that corresponds.
// We have `d.customThumbnailId`!
return id === d.customThumbnailId;
});
if (sidecarId) {
try {
this.driveService.trashFile(sidecarId);
sidecarFileIds.delete(sidecarId); // Remove from set so we don't trip later
sidecarThumbMap.delete(d.file.getId());
console.log(`[MediaService] Trashed sidecar ${sidecarId}`);
} catch (trashErr) {
console.warn(`[MediaService] Failed to trash sidecar ${sidecarId}`, trashErr);
}
}
}
}
}
} catch (e) {
// Ignore
}
// 1. Check Sidecar (If it still exists after potential cleanup)
if (sidecarThumbMap.has(d.file.getId())) {
console.log(`[MediaService] Using Sidecar Thumbnail for ${d.file.getName()}`);
thumbnail = sidecarThumbMap.get(d.file.getId()) || "";
isProcessing = true; // SHOW HOURGLASS (Request #3)
} else {
// 2. Native / Fallback
try {
// Try to get Drive thumbnail
const nativeThumb = `data:image/jpeg;base64,${Utilities.base64Encode(d.file.getThumbnail().getBytes())}`;
if (nativeThumb.length > 100) { // Check if valid (sometimes returns empty?)
thumbnail = nativeThumb;
}
} catch (e) {
// Processing / Error
console.warn(`Failed to get native thumbnail for ${d.file.getName()}: ${e}`);
isProcessing = true; // Assume processing
thumbnail = "data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGhlaWdodD0iNDgiIHdpZHRoPSI0OCIgdmlld0JveD0iMCAwIDQ4IDQ4Ij48cGF0aCBmaWxsPSIjNDI4NUY0IiBkPSJNMzYgOEgxMmMtMi4yMSAwLTQgMS43OS00IDR2MjRjMCAyLjIxIDEuNzkgNCA0IDRoMjRjMi4yMSAwIDQtMS43OSA0LTRWMTJjMC0yLjIxLTEuNzktNC00LTR6TTIwIDMxVjE3bDEyIDctMTIgN3oiLz48L3N2Zz4=";
}
}
}
unifiedState.push({
id: d.file.getId(), // Use Drive ID as primary key
@ -126,18 +262,16 @@ export class MediaService {
shopifyId: match ? match.id : null,
filename: d.file.getName(),
source: match ? 'synced' : 'drive_only',
thumbnail: (match && match.preview && match.preview.image && match.preview.image.originalSrc)
? match.preview.image.originalSrc
: `data:image/jpeg;base64,${Utilities.base64Encode(d.file.getThumbnail().getBytes())}`,
thumbnail: thumbnail,
status: 'active',
galleryOrder: d.galleryOrder,
mimeType: d.file.getMimeType(),
// Prefer Shopify Video URL for playback/hover if available, otherwise Drive Download URL
contentUrl: (match && match.sources)
? (match.sources.find((s: any) => s.mimeType === 'video/mp4')?.url || match.sources[0]?.url)
: `https://drive.google.com/uc?export=download&id=${d.file.getId()}`
: `https://drive.google.com/uc?export=download&id=${d.file.getId()}`,
isProcessing: isProcessing
})
// console.log(`[MediaService] File ${d.file.getName()} (${d.file.getId()}): Mime=${d.file.getMimeType()}, ContentUrl=https://drive.google.com/uc?export=download&id=${d.file.getId()}`)
})
// Find Shopify Orphans
@ -226,6 +360,24 @@ export class MediaService {
logs.push(`- Deleted from Shopify (${item.shopifyId})`)
}
if (item.driveId) {
// Check for Associated Sidecar Thumbs (Request #2)
try {
const f = driveSvc.getFileById(item.driveId);
// We could inspect properties, or just try to find based on convention if we don't have props handy.
// But `getUnifiedMediaState` logic shows we store `custom_thumbnail_id`.
// However, `item` here comes from `getUnifiedMediaState`, but DOES IT include the custom prop?
// Currently `unifiedState` items don't return `customThumbnailId` property explicitly in the Object.
// We should probably fetch it or have included it.
// Re-fetch props to be safe/clean.
const props = driveSvc.getFileProperties(item.driveId);
if (props && props['custom_thumbnail_id']) {
driveSvc.trashFile(props['custom_thumbnail_id']);
logs.push(`- Trashed associated Sidecar Thumbnail (${props['custom_thumbnail_id']})`);
}
} catch (ignore) {
// If file already gone or other error
}
driveSvc.trashFile(item.driveId)
logs.push(`- Trashed in Drive (${item.driveId})`)
}

View File

@ -43,23 +43,33 @@ export class MockDriveService implements IDriveService {
saveFile(blob: GoogleAppsScript.Base.Blob, folderId: string): GoogleAppsScript.Drive.File {
const id = `mock_file_${Date.now()}_${Math.floor(Math.random() * 1000)}`
const newFile = {
getId: () => id,
getName: () => blob.getName(),
getBlob: () => blob,
getUrl: () => `https://mock.drive/files/${blob.getName()}`,
getLastUpdated: () => new Date(),
getThumbnail: () => ({ getBytes: () => [] }),
getThumbnail: () => (blob as any).getThumbnail ? (blob as any).getThumbnail() : ({ getBytes: () => [] }),
getMimeType: () => (blob as any).getContentType ? (blob as any).getContentType() : "image/jpeg",
getDownloadUrl: () => `https://drive.google.com/uc?export=download&id=${id}`,
getSize: () => blob.getBytes ? blob.getBytes().length : 0,
getAppProperty: (key) => {
return (newFile as any)._properties?.[key]
}
getAppProperty: (key) => (newFile as any)._properties?.[key],
// Placeholder methods to be overridden safely
setDescription: null as any,
getDescription: null as any
} as unknown as GoogleAppsScript.Drive.File
// Initialize properties container
;(newFile as any)._properties = {}
// Initialize state
;(newFile as any)._properties = {};
;(newFile as any)._description = "";
// Attach methods safely
newFile.setDescription = (desc: string) => {
(newFile as any)._description = desc;
return newFile;
};
newFile.getDescription = () => (newFile as any)._description || "";
if (!this.files.has(folderId)) {
this.files.set(folderId, [])