Release: merge dev into master (open-issue triage + thumb cache) #52

Merged
ilia merged 3 commits from dev into master 2026-07-09 14:03:17 -05:00
18 changed files with 306 additions and 230 deletions
+1
View File
@@ -136,6 +136,7 @@ export const photosApi = {
searchPhotos: async (params: {
search_type: 'name' | 'date' | 'tags' | 'no_faces' | 'no_tags' | 'processed' | 'unprocessed' | 'favorites'
person_name?: string
person_ids?: string
tag_names?: string
match_all?: boolean
date_from?: string
+21
View File
@@ -600,6 +600,21 @@ export default function Identify() {
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [currentFace?.id, compareEnabled])
// Clear loading when crop is already cached (browser may skip onLoad) — #47
useEffect(() => {
if (!currentFace || !restorationCompleteRef.current) return
const baseUrl = apiClient.defaults.baseURL || ''
const url = `${baseUrl}/api/v1/faces/${currentFace.id}/crop`
const probe = new Image()
probe.onload = () => setImageLoading(false)
probe.onerror = () => setImageLoading(false)
probe.src = url
// If already complete from cache, onload may have fired sync before handlers
if (probe.complete && probe.naturalWidth > 0) {
setImageLoading(false)
}
}, [currentFace?.id])
// Preload images for next/previous faces
useEffect(() => {
if (!currentFace || faces.length === 0) return
@@ -1293,6 +1308,12 @@ export default function Identify() {
className="max-w-full max-h-full object-contain pointer-events-none"
crossOrigin="anonymous"
loading="eager"
ref={(el) => {
// Cached images often skip onLoad — clear spinner if already complete (#47)
if (el && el.complete && el.naturalWidth > 0) {
setImageLoading(false)
}
}}
onLoad={() => setImageLoading(false)}
onError={(e) => {
const target = e.target as HTMLImageElement
+41 -1
View File
@@ -76,6 +76,8 @@ export default function Scan() {
} | null>(null)
const [selectedFiles, setSelectedFiles] = useState<File[]>([])
const fileInputRef = useRef<HTMLInputElement | null>(null)
// Keep directory handle so toggling "recursive" can re-read without re-picking the folder (#45)
const dirHandleRef = useRef<FileSystemDirectoryHandle | null>(null)
const [currentJob, setCurrentJob] = useState<JobResponse | null>(null)
const [jobProgress, setJobProgress] = useState<JobProgress | null>(null)
const [importResult, setImportResult] = useState<{
@@ -95,6 +97,36 @@ export default function Scan() {
}
}, [])
// Re-read local folder when recursive checkbox changes (#45)
useEffect(() => {
const handle = dirHandleRef.current
if (!handle || scanMode !== 'local' || isImporting) return
let cancelled = false
;(async () => {
try {
const files = await readDirectoryRecursive(handle, recursive)
if (cancelled) return
setSelectedFiles(files)
setImportResult(null)
if (files.length === 0) {
setError('No supported image or video files found with current recursive setting.')
} else {
setError(null)
}
} catch (err: any) {
if (!cancelled) {
setError(err?.message || 'Failed to re-read folder after recursive toggle')
}
}
})()
return () => {
cancelled = true
}
// eslint-disable-next-line react-hooks/exhaustive-deps
}, [recursive])
const handleFolderBrowse = () => {
setError(null)
setShowFolderBrowser(true)
@@ -215,10 +247,11 @@ export default function Scan() {
// Show directory picker
// @ts-ignore - File System Access API types may not be available
const dirHandle = await window.showDirectoryPicker()
dirHandleRef.current = dirHandle
const folderName = dirHandle.name
setFolderPath(folderName)
// Read all files from the directory
// Read all files from the directory (respects current recursive checkbox)
const files = await readDirectoryRecursive(dirHandle, recursive)
if (files.length === 0) {
@@ -246,6 +279,8 @@ export default function Scan() {
}
} else if (isWebkitDirectorySupported()) {
// Fallback: Use webkitdirectory input (Firefox, older browsers)
// webkitdirectory is always recursive — checkbox cannot re-filter without re-pick
dirHandleRef.current = null
fileInputRef.current?.click()
} else {
setError('Folder selection is not supported in your browser. Please use Chrome, Edge, Safari, or Firefox.')
@@ -542,6 +577,11 @@ export default function Scan() {
className="ml-2 block text-sm text-gray-700"
>
Scan subdirectories recursively
{scanMode === 'local' && dirHandleRef.current ? (
<span className="ml-2 text-xs text-gray-500">(re-reads folder when toggled)</span>
) : scanMode === 'network' ? (
<span className="ml-2 text-xs text-gray-500">(applies on next Start Scanning)</span>
) : null}
</label>
</div>
+13 -27
View File
@@ -239,27 +239,21 @@ export default function Search() {
}
if (currentSearchType === 'name') {
// Combine selected people names and free text input
// For selected people, use last name (most unique) or first+last if last name is empty
const selectedNames = selectedPeople.map(p => {
if (p.last_name) {
return p.last_name.trim()
} else if (p.first_name) {
return p.first_name.trim()
}
return formatPersonName(p).trim()
})
// Selected people → exact person_ids (avoids last-name substring false hits, #46)
if (selectedPeople.length > 0) {
params.person_ids = selectedPeople.map(p => p.id).join(',')
}
const freeText = inputValue.trim()
const allNames = [...selectedNames, freeText].filter(Boolean)
if (allNames.length === 0) {
if (freeText) {
params.person_name = freeText
}
if (!params.person_ids && !params.person_name) {
if (showValidationErrors) {
alert('Please enter at least one name or select a person to search.')
}
setLoading(false)
return
}
params.person_name = allNames.join(', ')
// Add tags filter if provided
if (selectedTags.length > 0) {
params.tag_names = selectedTags.join(', ')
@@ -828,20 +822,12 @@ export default function Search() {
}
if (searchType === 'name') {
// Combine selected people names and free text input
// For selected people, use last name (most unique) or first+last if last name is empty
const selectedNames = selectedPeople.map(p => {
if (p.last_name) {
return p.last_name.trim()
} else if (p.first_name) {
return p.first_name.trim()
}
return formatPersonName(p).trim()
})
if (selectedPeople.length > 0) {
baseParams.person_ids = selectedPeople.map(p => p.id).join(',')
}
const freeText = inputValue.trim()
const allNames = [...selectedNames, freeText].filter(Boolean)
if (allNames.length > 0) {
baseParams.person_name = allNames.join(', ')
if (freeText) {
baseParams.person_name = freeText
}
// Add tags filter if provided
if (selectedTags.length > 0) {
+34 -11
View File
@@ -37,7 +37,6 @@ from backend.schemas.search import (
SearchPhotosResponse,
)
from backend.services.photo_service import (
find_photos_in_folder,
import_photo_from_path,
)
from backend.services.search_service import (
@@ -63,6 +62,10 @@ def search_photos(
current_user: Annotated[dict, Depends(get_current_user)],
search_type: str = Query("name", description="Search type: name, date, tags, no_faces, no_tags, processed, unprocessed, favorites"),
person_name: Optional[str] = Query(None, description="Person name for name search"),
person_ids: Optional[str] = Query(
None,
description="Comma-separated person IDs for exact name search (preferred over substring when selecting people)",
),
tag_names: Optional[str] = Query(None, description="Comma-separated tag names for tag search"),
match_all: bool = Query(False, description="Match all tags (for tag search)"),
date_from: Optional[str] = Query(None, description="Date from (YYYY-MM-DD)"),
@@ -111,13 +114,36 @@ def search_photos(
tag_list = [t.strip() for t in tag_names.split(",") if t.strip()]
if search_type == "name":
if not person_name:
parsed_person_ids: list[int] = []
if person_ids:
for part in person_ids.split(","):
part = part.strip()
if not part:
continue
try:
parsed_person_ids.append(int(part))
except ValueError:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail=f"Invalid person_ids value: {part}",
)
if not person_name and not parsed_person_ids:
raise HTTPException(
status_code=status.HTTP_400_BAD_REQUEST,
detail="person_name is required for name search",
detail="person_name or person_ids is required for name search",
)
results, total = search_photos_by_name(
db, person_name, folder_path, media_type, df, dt, tag_list, match_all, page, page_size
db,
person_name or "",
folder_path,
media_type,
df,
dt,
tag_list,
match_all,
page,
page_size,
person_ids=parsed_person_ids or None,
)
for photo, full_name in results:
tags = get_photo_tags(db, photo.id)
@@ -360,23 +386,20 @@ def import_photos(
detail=f"Folder not found: {request.folder_path}",
)
# Estimate number of photos (quick scan)
estimated_photos = len(find_photos_in_folder(request.folder_path, request.recursive))
# Enqueue job
# Pass function as string path to avoid serialization issues
# Do NOT walk the tree on the API thread (#21) — that blocked SharePoint/SMB
# imports for minutes with no progress. Counting happens inside the RQ job.
job = queue.enqueue(
"backend.services.tasks.import_photos_task",
request.folder_path,
request.recursive,
job_timeout="1h", # Allow up to 1 hour for large imports
job_timeout="2h", # Network shares can be slow
)
return PhotoImportResponse(
job_id=job.id,
message=f"Photo import job queued for {request.folder_path}",
folder_path=request.folder_path,
estimated_photos=estimated_photos,
estimated_photos=None,
)
+10 -15
View File
@@ -2337,27 +2337,22 @@ def find_auto_match_matches(
for person_id, reference_face, person_name in person_faces_list:
reference_face_id = reference_face.id
# TEMPORARILY DISABLED: Check if reference face is too small (exclude from auto-match)
# reference_photo = db.query(Photo).filter(Photo.id == reference_face.photo_id).first()
# if reference_photo:
# ref_size_ratio = _calculate_face_size_ratio(reference_face, reference_photo)
# if ref_size_ratio < MIN_AUTO_MATCH_FACE_SIZE_RATIO:
# # Skip this person - reference face is too small
# continue
# Skip people whose reference face is too small (reduces false positives, #30/#31/#33)
reference_photo = db.query(Photo).filter(Photo.id == reference_face.photo_id).first()
if reference_photo:
ref_size_ratio = _calculate_face_size_ratio(reference_face, reference_photo)
if ref_size_ratio < MIN_AUTO_MATCH_FACE_SIZE_RATIO:
continue
# Use find_similar_faces which matches desktop _get_filtered_similar_faces logic
# Desktop: similar_faces = self.face_processor._get_filtered_similar_faces(
# reference_face_id, tolerance, include_same_photo=False, face_status=None)
# This filters by: person_id is None (unidentified), confidence >= 50% (increased from 40%), sorts by distance
# Auto-match always excludes excluded faces
# TEMPORARILY DISABLED: filter_small_faces=True to exclude small match faces
# Filters: person_id is None, confidence floor, exclude small faces, sort by distance
similar_faces_with_debug = find_similar_faces(
db, reference_face_id, tolerance=tolerance,
filter_frontal_only=filter_frontal_only,
include_excluded=False, # Auto-match always excludes excluded faces
filter_small_faces=False, # TEMPORARILY DISABLED: Exclude small faces from auto-match
filter_small_faces=True, # Exclude tiny faces that inflate false matches
min_face_size_ratio=MIN_AUTO_MATCH_FACE_SIZE_RATIO,
use_distance_based_thresholds=use_distance_based_thresholds # Use distance-based thresholds if enabled
use_distance_based_thresholds=use_distance_based_thresholds
)
# Strip debug_info for internal use
similar_faces = [(f, dist, conf) for f, dist, conf, _ in similar_faces_with_debug]
+57 -36
View File
@@ -22,57 +22,78 @@ def search_photos_by_name(
match_all: bool = False,
page: int = 1,
page_size: int = 50,
person_ids: Optional[List[int]] = None,
) -> Tuple[List[Tuple[Photo, str]], int]:
"""Search photos by person name(s) (partial, case-insensitive).
"""Search photos by person name(s) and/or exact person IDs.
Supports multiple names separated by commas (OR logic - photos matching any name).
Matches desktop behavior exactly:
When person_ids is provided, those people are included exactly (no substring match).
Matches desktop behavior for free-text:
- Searches first_name, last_name, middle_name, maiden_name
- Returns (photo, full_name) tuples
- Filters by folder_path if provided
- Filters by media_type if provided ("image" or "video", None/"all" for all)
- Multiple names: comma-separated, searches for photos with ANY matching person
"""
search_name = (person_name or "").strip()
if not search_name:
return [], 0
explicit_ids = [int(pid) for pid in (person_ids or []) if pid is not None]
# Split by comma and clean up names
search_names = [name.strip().lower() for name in search_name.split(',') if name.strip()]
if not search_names:
search_names = [name.strip().lower() for name in search_name.split(',') if name.strip()] if search_name else []
if not search_names and not explicit_ids:
return [], 0
# Build OR conditions for each search name
name_conditions = []
for search_name_lower in search_names:
name_conditions.append(
or_(
func.lower(Person.first_name).contains(search_name_lower),
func.lower(Person.last_name).contains(search_name_lower),
func.lower(Person.middle_name).contains(search_name_lower),
func.lower(Person.maiden_name).contains(search_name_lower),
)
matching_people: List[Person] = []
if explicit_ids:
matching_people.extend(
db.query(Person).filter(Person.id.in_(explicit_ids)).all()
)
# Find matching people (any of the search names)
matching_people = (
db.query(Person)
.filter(or_(*name_conditions))
.all()
)
if not matching_people:
if search_names:
# Build OR conditions for each search name
name_conditions = []
for search_name_lower in search_names:
# Multi-word "First Last" → require first AND last (reduces false hits, #46)
parts = [p for p in search_name_lower.split() if p]
if len(parts) >= 2:
first, last = parts[0], parts[-1]
name_conditions.append(
(func.lower(Person.first_name).contains(first))
& (func.lower(Person.last_name).contains(last))
)
else:
name_conditions.append(
or_(
func.lower(Person.first_name).contains(search_name_lower),
func.lower(Person.last_name).contains(search_name_lower),
func.lower(Person.middle_name).contains(search_name_lower),
func.lower(Person.maiden_name).contains(search_name_lower),
)
)
matching_people.extend(
db.query(Person).filter(or_(*name_conditions)).all()
)
# Deduplicate people by id
seen = set()
unique_people: List[Person] = []
for p in matching_people:
if p.id not in seen:
seen.add(p.id)
unique_people.append(p)
if not unique_people:
return [], 0
person_ids = [p.id for p in matching_people]
person_ids_resolved = [p.id for p in unique_people]
# Query photos with faces linked to matching people
query = (
db.query(Photo, Person)
.join(Face, Photo.id == Face.photo_id)
.join(Person, Face.person_id == Person.id)
.filter(Face.person_id.in_(person_ids))
.filter(Face.person_id.in_(person_ids_resolved))
.distinct()
)
+51
View File
@@ -0,0 +1,51 @@
# PunimTag fixes — 2026-07-09
Branch: `fix/open-issues-triage` · PR: https://git.levkin.ca/ilia/punimtag/pulls/51
Dev URLs: https://punimtagdev.levkin.ca · https://punimtagadmindev.levkin.ca
(`punimtag.levkin.ca` is **not** live — no DNS.)
## Infra (homelab)
| Item | Detail |
|------|--------|
| Outage | App `.env` pointed at dead Postgres `10.0.10.181` |
| Fix | Retarget to live `postgresQA` **`10.0.10.179`** (pve201 VM 109) |
| Hosts | LXC **9101** `punimTagFE-dev` @ `10.0.10.121` |
Ansible inventory/docs updated in the ansible repo (`main.yml`, `vault.example.yml`, `host-list.md`).
## Ticket fixes (code)
| Issue | Status | Change |
|-------|--------|--------|
| **#45** Recursive scan checkbox | Closed | Keep directory handle; re-read files when checkbox toggles (`Scan.tsx`) |
| **#46** Person search wrong people | Closed | Selected people use exact `person_ids`; free-text `"First Last"` uses AND (`Search.tsx`, `search_service.py`) |
| **#47** Identify Next/Prev blank image | Closed | Clear loading when crop is already browser-cached (`Identify.tsx`) |
| **#21** SharePoint/network scan hang | Open (needs QA) | Stop blocking API on full folder walk before enqueue; 2h job timeout (`photos.py`) |
| **#26** Slow main-page images | Open (needs QA) | Grid requests `?thumbnail=true`; API resizes + **disk-caches** thumbs under `.cache/photo-thumbnails/` |
| **#30/#31/#33** Auto-match false positives | Open (needs QA) | Re-enable small-face / tiny-reference filters (`face_service.py`) |
## Still blocked on client
| Issue | Need |
|-------|------|
| **#44** JRCC watermark | SVG/PNG + placement/opacity |
| **#43** Tag without account | Product rules (approval, PII, ToS) |
| **#21** path confirm | Exact SharePoint/network path Noam used + mount status on LXC |
## Performance notes (#26)
**Why it felt slow (before deploy):** grid loaded **full-resolution** photos (and watermarked them for guests). Thumbnail resize existed only on the PR branch until deploy.
**What we do now:**
1. Grid always requests `?thumbnail=true`
2. Server resizes to max **360px** JPEG (~quality 68)
3. Writes result to `.cache/photo-thumbnails/` keyed by photo id + mtime (first hit slow, later hits fast)
4. Long browser cache (`max-age=604800`)
5. Fewer `priority` images above the fold (4 instead of 9)
**Further options (not done):** pre-generate thumbs at Process time; CDN; reduce SSR face payload on `page.tsx`.
## Cleanup
Removed unused viewer assets: default Next SVGs, unused `jam-watermark.svg`, `test-image-detection.ts`.
@@ -3,7 +3,7 @@ import { fastApiV1Url } from '@/lib/server/fastapi-backend';
import { prisma } from '@/lib/db';
import { readFile } from 'fs/promises';
import { createReadStream } from 'fs';
import { existsSync, statSync } from 'fs';
import { existsSync, statSync, mkdirSync, writeFileSync, readFileSync } from 'fs';
import path from 'path';
// Conditionally import sharp - handle case where libvips is not installed
@@ -18,6 +18,21 @@ try {
const WATERMARK_BUCKET_SIZE = 200;
const watermarkCache = new Map<string, Buffer>();
const THUMB_CACHE_DIR = path.join(process.cwd(), '.cache', 'photo-thumbnails');
const THUMB_MAX = 360; // grid cells are small; keep bytes down (#26)
function ensureThumbCacheDir() {
if (!existsSync(THUMB_CACHE_DIR)) {
mkdirSync(THUMB_CACHE_DIR, { recursive: true });
}
}
function thumbCachePath(photoId: number, watermark: boolean, mtimeMs: number) {
const tag = watermark ? 'wm' : 'plain';
return path.join(THUMB_CACHE_DIR, `${photoId}-${tag}-${THUMB_MAX}-${mtimeMs}.jpg`);
}
async function getWatermarkOverlay(baseWidth: number, baseHeight: number) {
if (!sharp) {
throw new Error('Sharp library not available');
@@ -260,6 +275,58 @@ export async function GET(
},
});
// Grid thumbnails: resize + disk cache (videos handled above) — #26
if (thumbnail && sharp) {
try {
ensureThumbCacheDir();
const mtimeMs = statSync(filePath).mtimeMs;
const cacheFile = thumbCachePath(photoId, watermark, mtimeMs);
if (existsSync(cacheFile)) {
const cached = readFileSync(cacheFile);
return new NextResponse(cached, {
headers: {
'Content-Type': 'image/jpeg',
'Cache-Control': 'public, max-age=604800, immutable',
'X-Thumb-Cache': 'HIT',
},
});
}
let pipeline = sharp(imageBuffer).rotate().resize({
width: THUMB_MAX,
height: THUMB_MAX,
fit: 'inside',
withoutEnlargement: true,
});
if (watermark) {
const metadata = await pipeline.metadata();
const baseWidth = metadata.width ?? THUMB_MAX;
const baseHeight = metadata.height ?? THUMB_MAX;
const overlayBuffer = await getWatermarkOverlay(baseWidth, baseHeight);
pipeline = sharp(imageBuffer)
.rotate()
.resize({ width: THUMB_MAX, height: THUMB_MAX, fit: 'inside', withoutEnlargement: true })
.composite([{ input: overlayBuffer, gravity: 'center', blend: 'hard-light' }]);
}
const result = await pipeline.jpeg({ quality: 68, mozjpeg: true }).toBuffer();
try {
writeFileSync(cacheFile, result);
} catch (e) {
console.warn('thumb cache write failed', e);
}
return new NextResponse(result as unknown as BodyInit, {
headers: {
'Content-Type': 'image/jpeg',
'Cache-Control': 'public, max-age=604800, immutable',
'X-Thumb-Cache': 'MISS',
},
});
} catch (error) {
console.error('Error generating image thumbnail:', error);
// fall through to original / watermarked full image
}
}
if (!watermark) {
return createOriginalResponse();
}
+2 -2
View File
@@ -620,12 +620,12 @@ export function PhotoGrid({
onMouseLeave={() => setHoveredFace(null)}
>
<Image
src={getImageSrc(photo, { watermark: !isLoggedIn, thumbnail: isVideoPhoto })}
src={getImageSrc(photo, { watermark: !isLoggedIn, thumbnail: true })}
alt={photo.filename}
fill
className="object-contain bg-black/5 transition-transform duration-300 group-hover:scale-105"
sizes="(max-width: 640px) 50vw, (max-width: 1024px) 33vw, 20vw"
priority={index < 9}
priority={index < 4}
unoptimized={!isUrl(photo.path)}
onLoad={(e) => !isVideoPhoto && handleImageLoad(photo.id, e.currentTarget)}
/>
+8 -3
View File
@@ -22,9 +22,14 @@ export function isVideo(photo: Photo): boolean {
* - Videos → use thumbnail endpoint (for grid display)
*/
export function getImageSrc(photo: Photo, options?: { watermark?: boolean; thumbnail?: boolean }): string {
// For videos, use thumbnail endpoint if requested (for grid display)
if (options?.thumbnail && isVideo(photo)) {
return `/api/photos/${photo.id}/image?thumbnail=true`;
// Grid thumbnails: resize on server (images) or video poster (#26)
if (options?.thumbnail) {
const params = new URLSearchParams();
params.set('thumbnail', 'true');
if (options.watermark) {
params.set('watermark', 'true');
}
return `/api/photos/${photo.id}/image?${params.toString()}`;
}
if (isUrl(photo.path)) {
-1
View File
@@ -1 +0,0 @@
<svg fill="none" viewBox="0 0 16 16" xmlns="http://www.w3.org/2000/svg"><path d="M14.5 13.5V5.41a1 1 0 0 0-.3-.7L9.8.29A1 1 0 0 0 9.08 0H1.5v13.5A2.5 2.5 0 0 0 4 16h8a2.5 2.5 0 0 0 2.5-2.5m-1.5 0v-7H8v-5H3v12a1 1 0 0 0 1 1h8a1 1 0 0 0 1-1M9.5 5V2.12L12.38 5zM5.13 5h-.62v1.25h2.12V5zm-.62 3h7.12v1.25H4.5zm.62 3h-.62v1.25h7.12V11z" clip-rule="evenodd" fill="#666" fill-rule="evenodd"/></svg>

Before

Width:  |  Height:  |  Size: 391 B

-1
View File
@@ -1 +0,0 @@
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><g clip-path="url(#a)"><path fill-rule="evenodd" clip-rule="evenodd" d="M10.27 14.1a6.5 6.5 0 0 0 3.67-3.45q-1.24.21-2.7.34-.31 1.83-.97 3.1M8 16A8 8 0 1 0 8 0a8 8 0 0 0 0 16m.48-1.52a7 7 0 0 1-.96 0H7.5a4 4 0 0 1-.84-1.32q-.38-.89-.63-2.08a40 40 0 0 0 3.92 0q-.25 1.2-.63 2.08a4 4 0 0 1-.84 1.31zm2.94-4.76q1.66-.15 2.95-.43a7 7 0 0 0 0-2.58q-1.3-.27-2.95-.43a18 18 0 0 1 0 3.44m-1.27-3.54a17 17 0 0 1 0 3.64 39 39 0 0 1-4.3 0 17 17 0 0 1 0-3.64 39 39 0 0 1 4.3 0m1.1-1.17q1.45.13 2.69.34a6.5 6.5 0 0 0-3.67-3.44q.65 1.26.98 3.1M8.48 1.5l.01.02q.41.37.84 1.31.38.89.63 2.08a40 40 0 0 0-3.92 0q.25-1.2.63-2.08a4 4 0 0 1 .85-1.32 7 7 0 0 1 .96 0m-2.75.4a6.5 6.5 0 0 0-3.67 3.44 29 29 0 0 1 2.7-.34q.31-1.83.97-3.1M4.58 6.28q-1.66.16-2.95.43a7 7 0 0 0 0 2.58q1.3.27 2.95.43a18 18 0 0 1 0-3.44m.17 4.71q-1.45-.12-2.69-.34a6.5 6.5 0 0 0 3.67 3.44q-.65-1.27-.98-3.1" fill="#666"/></g><defs><clipPath id="a"><path fill="#fff" d="M0 0h16v16H0z"/></clipPath></defs></svg>

Before

Width:  |  Height:  |  Size: 1.0 KiB

-27
View File
@@ -1,27 +0,0 @@
<svg width="360" height="120" viewBox="0 0 360 120" xmlns="http://www.w3.org/2000/svg" role="img" aria-labelledby="title desc">
<title id="title">JAM Jewish and Modern watermark</title>
<desc id="desc">Stylized JAM logo with Star of David and the words Jewish and Modern</desc>
<defs>
<linearGradient id="watermarkGradient" x1="0%" y1="0%" x2="0%" y2="100%">
<stop offset="0%" stop-color="#154592" />
<stop offset="100%" stop-color="#0d2b54" />
</linearGradient>
</defs>
<rect width="360" height="120" fill="url(#watermarkGradient)" rx="12" ry="12" opacity="0.92" />
<g fill="#ffffff">
<text x="30" y="82" font-family="'Inter', 'Segoe UI', sans-serif" font-size="72" font-weight="700">J</text>
<text x="144" y="82" font-family="'Inter', 'Segoe UI', sans-serif" font-size="72" font-weight="700">M</text>
<g transform="translate(80,20) scale(0.7)">
<polygon points="60,0 80,35 120,35 90,57 100,95 60,75 20,95 30,57 0,35 40,35" fill="none" stroke="#ffffff" stroke-width="12" stroke-linejoin="round" />
</g>
<text x="214" y="50" font-family="'Inter', 'Segoe UI', sans-serif" font-size="24" font-weight="600">Jewish</text>
<text x="214" y="78" font-family="'Inter', 'Segoe UI', sans-serif" font-size="24" font-weight="600">and Modern</text>
</g>
</svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

-1
View File
@@ -1 +0,0 @@
<svg xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 394 80"><path fill="#000" d="M262 0h68.5v12.7h-27.2v66.6h-13.6V12.7H262V0ZM149 0v12.7H94v20.4h44.3v12.6H94v21h55v12.6H80.5V0h68.7zm34.3 0h-17.8l63.8 79.4h17.9l-32-39.7 32-39.6h-17.9l-23 28.6-23-28.6zm18.3 56.7-9-11-27.1 33.7h17.8l18.3-22.7z"/><path fill="#000" d="M81 79.3 17 0H0v79.3h13.6V17l50.2 62.3H81Zm252.6-.4c-1 0-1.8-.4-2.5-1s-1.1-1.6-1.1-2.6.3-1.8 1-2.5 1.6-1 2.6-1 1.8.3 2.5 1a3.4 3.4 0 0 1 .6 4.3 3.7 3.7 0 0 1-3 1.8zm23.2-33.5h6v23.3c0 2.1-.4 4-1.3 5.5a9.1 9.1 0 0 1-3.8 3.5c-1.6.8-3.5 1.3-5.7 1.3-2 0-3.7-.4-5.3-1s-2.8-1.8-3.7-3.2c-.9-1.3-1.4-3-1.4-5h6c.1.8.3 1.6.7 2.2s1 1.2 1.6 1.5c.7.4 1.5.5 2.4.5 1 0 1.8-.2 2.4-.6a4 4 0 0 0 1.6-1.8c.3-.8.5-1.8.5-3V45.5zm30.9 9.1a4.4 4.4 0 0 0-2-3.3 7.5 7.5 0 0 0-4.3-1.1c-1.3 0-2.4.2-3.3.5-.9.4-1.6 1-2 1.6a3.5 3.5 0 0 0-.3 4c.3.5.7.9 1.3 1.2l1.8 1 2 .5 3.2.8c1.3.3 2.5.7 3.7 1.2a13 13 0 0 1 3.2 1.8 8.1 8.1 0 0 1 3 6.5c0 2-.5 3.7-1.5 5.1a10 10 0 0 1-4.4 3.5c-1.8.8-4.1 1.2-6.8 1.2-2.6 0-4.9-.4-6.8-1.2-2-.8-3.4-2-4.5-3.5a10 10 0 0 1-1.7-5.6h6a5 5 0 0 0 3.5 4.6c1 .4 2.2.6 3.4.6 1.3 0 2.5-.2 3.5-.6 1-.4 1.8-1 2.4-1.7a4 4 0 0 0 .8-2.4c0-.9-.2-1.6-.7-2.2a11 11 0 0 0-2.1-1.4l-3.2-1-3.8-1c-2.8-.7-5-1.7-6.6-3.2a7.2 7.2 0 0 1-2.4-5.7 8 8 0 0 1 1.7-5 10 10 0 0 1 4.3-3.5c2-.8 4-1.2 6.4-1.2 2.3 0 4.4.4 6.2 1.2 1.8.8 3.2 2 4.3 3.4 1 1.4 1.5 3 1.5 5h-5.8z"/></svg>

Before

Width:  |  Height:  |  Size: 1.3 KiB

-1
View File
@@ -1 +0,0 @@
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1155 1000"><path d="m577.3 0 577.4 1000H0z" fill="#fff"/></svg>

Before

Width:  |  Height:  |  Size: 128 B

-1
View File
@@ -1 +0,0 @@
<svg fill="none" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 16 16"><path fill-rule="evenodd" clip-rule="evenodd" d="M1.5 2.5h13v10a1 1 0 0 1-1 1h-11a1 1 0 0 1-1-1zM0 1h16v11.5a2.5 2.5 0 0 1-2.5 2.5h-11A2.5 2.5 0 0 1 0 12.5zm3.75 4.5a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5M7 4.75a.75.75 0 1 1-1.5 0 .75.75 0 0 1 1.5 0m1.75.75a.75.75 0 1 0 0-1.5.75.75 0 0 0 0 1.5" fill="#666"/></svg>

Before

Width:  |  Height:  |  Size: 385 B

-102
View File
@@ -1,102 +0,0 @@
/**
* Test script to verify image source detection logic
* Run with: npx tsx test-image-detection.ts
*/
/**
* Determines if a path is a URL (http/https) or a file system path
*/
function isUrl(path: string): boolean {
return path.startsWith('http://') || path.startsWith('https://');
}
/**
* Gets the appropriate image source URL
*/
function getImageSrc(photoId: number, path: string): string {
if (isUrl(path)) {
return path; // Direct access
} else {
return `/api/photos/${photoId}/image`; // API proxy
}
}
// Test cases
const testCases = [
{
id: 1,
path: 'https://picsum.photos/800/600',
expected: 'direct',
description: 'HTTPS URL (SharePoint, CDN)',
},
{
id: 2,
path: 'http://example.com/image.jpg',
expected: 'direct',
description: 'HTTP URL',
},
{
id: 3,
path: '/path/to/photos/image.jpg',
expected: 'proxy',
description: 'Unix file system path',
},
{
id: 4,
path: 'C:\\Photos\\image.jpg',
expected: 'proxy',
description: 'Windows file system path',
},
{
id: 5,
path: 'https://yourcompany.sharepoint.com/sites/Photos/image.jpg',
expected: 'direct',
description: 'SharePoint Online URL',
},
{
id: 6,
path: 'https://sharepoint.company.com/sites/Photos/image.jpg',
expected: 'direct',
description: 'SharePoint Server URL',
},
];
console.log('🧪 Testing Image Source Detection Logic\n');
console.log('=' .repeat(60));
let passed = 0;
let failed = 0;
testCases.forEach((testCase) => {
const result = getImageSrc(testCase.id, testCase.path);
const isDirect = isUrl(testCase.path);
const actual = isDirect ? 'direct' : 'proxy';
const success = actual === testCase.expected;
if (success) {
passed++;
console.log(`✅ Test ${testCase.id}: PASSED`);
} else {
failed++;
console.log(`❌ Test ${testCase.id}: FAILED`);
}
console.log(` Description: ${testCase.description}`);
console.log(` Path: ${testCase.path}`);
console.log(` Detected as: ${actual} (expected: ${testCase.expected})`);
console.log(` Image src: ${result}`);
console.log('');
});
console.log('=' .repeat(60));
console.log(`Results: ${passed} passed, ${failed} failed`);
if (failed === 0) {
console.log('🎉 All tests passed!');
process.exit(0);
} else {
console.log('⚠️ Some tests failed');
process.exit(1);
}