Self-hosted personal gallery application with online photo management and albums, supporting Live/Motion Photos, EXIF parsing, geolocation recognition, and an explore map.
TypeScript albumsexif-extractiongeocodinglive-photomotion-photophoto-galleryphoto-sharingwebgl-viewer
feat(camera): 添加相机和镜头信息格式化方法,处理型号中重复的品牌信息
Timothy Yin996a904cefae
diff --git a/app/components/masonry/PhotoItem.client.vue b/app/components/masonry/PhotoItem.client.vueindex 393b96cb..5ac6ec0a 100644--- a/app/components/masonry/PhotoItem.client.vue+++ b/app/components/masonry/PhotoItem.client.vue@@ -1,4 +1,6 @@<script setup lang="ts">+import { formatCameraInfo } from '~/utils/camera'+interface Props {photo: Photoindex: number@@ -287,9 +289,7 @@ onUnmounted(() => {><Icon name="tabler:camera" /><span class="text-xs font-medium text-ellipsis line-clamp-1">- {{- [photo.exif.Make, photo.exif.Model].filter(Boolean).join(' ')- }}+ {{ formatCameraInfo(photo.exif.Make, photo.exif.Model) }}</span></div><!-- Photo specs from EXIF -->diff --git a/app/components/photo/InfoPanel.vue b/app/components/photo/InfoPanel.vueindex 6ea839a1..8956b505 100644--- a/app/components/photo/InfoPanel.vue+++ b/app/components/photo/InfoPanel.vue@@ -3,6 +3,7 @@ import { ref, computed } from 'vue'import { motion, AnimatePresence } from 'motion-v'import type { NeededExif } from '../../../shared/types/photo'import type { KVData } from './KVRenderer.vue'+import { formatCameraInfo, formatLensInfo } from '~/utils/camera'interface Props {currentPhoto: Photo@@ -188,14 +189,14 @@ const formatedExifData = computed<Record<string, KVData[]>>(() => {props.exifData?.Make && props.exifData?.Model? {label: '相机',- value: `${props.exifData.Make} ${props.exifData.Model}`,+ value: formatCameraInfo(props.exifData.Make, props.exifData.Model),icon: 'tabler:camera',}: null,props.exifData?.LensModel? {label: '镜头',- value: props.exifData.LensModel,+ value: formatLensInfo(props.exifData.LensMake, props.exifData.LensModel),icon: 'tabler:focus',}: null,diff --git a/app/utils/camera.ts b/app/utils/camera.tsnew file mode 100644index 00000000..ccea3947--- /dev/null+++ b/app/utils/camera.ts@@ -0,0 +1,92 @@+/**+ * 处理相机品牌和型号的显示,避免品牌名称重复+ */+export function formatCameraInfo(make?: string, model?: string): string {+ if (!make && !model) return ''+ if (!make) return model || ''+ if (!model) return make++ // 常见品牌名称映射(包括各种可能的变体)+ const brandMap: Record<string, string[]> = {+ 'Canon': ['canon', 'eos'],+ 'Nikon': ['nikon'],+ 'Sony': ['sony', 'ilce', 'dsc'],+ 'Fujifilm': ['fujifilm', 'fuji', 'x-'],+ 'Olympus': ['olympus', 'om-', 'e-'],+ 'Panasonic': ['panasonic', 'lumix', 'dc-', 'dmc-'],+ 'Leica': ['leica'],+ 'Pentax': ['pentax', 'k-'],+ 'Ricoh': ['ricoh', 'gr'],+ 'Hasselblad': ['hasselblad'],+ 'Phase One': ['phase one'],+ 'Mamiya': ['mamiya'],+ 'Apple': ['apple'],+ 'Samsung': ['samsung', 'galaxy', 'sm-'],+ 'Google': ['pixel'],+ 'Xiaomi': ['xiaomi', 'mi ', 'redmi'],+ 'Huawei': ['huawei', 'p30', 'p40', 'p50', 'mate'],+ 'OnePlus': ['oneplus'],+ 'OPPO': ['oppo'],+ 'Vivo': ['vivo'],+ 'Realme': ['realme'],+ 'Honor': ['honor'],+ }++ const makeNormalized = make.toLowerCase().trim()+ const modelNormalized = model.toLowerCase().trim()++ // 检查型号中是否已经包含品牌信息+ const brandKeywords = brandMap[make] || [makeNormalized]+ const modelContainsBrand = brandKeywords.some(keyword =>+ modelNormalized.includes(keyword.toLowerCase())+ )++ if (modelContainsBrand) {+ // 如果型号已包含品牌信息,只返回型号+ return model+ } else {+ // 如果型号不包含品牌信息,返回品牌+型号+ return `${make} ${model}`+ }+}++/**+ * 格式化镜头信息,处理品牌和型号+ */+export function formatLensInfo(lensMake?: string, lensModel?: string): string {+ if (!lensMake && !lensModel) return ''+ if (!lensMake) return lensModel || ''+ if (!lensModel) return lensMake++ // 镜头品牌映射+ const lensBrandMap: Record<string, string[]> = {+ 'Canon': ['canon', 'ef', 'rf'],+ 'Nikon': ['nikon', 'nikkor'],+ 'Sony': ['sony', 'fe', 'e '],+ 'Sigma': ['sigma'],+ 'Tamron': ['tamron'],+ 'Tokina': ['tokina'],+ 'Samyang': ['samyang'],+ 'Zeiss': ['zeiss'],+ 'Voigtländer': ['voigtlander', 'voigtländer'],+ 'Leica': ['leica'],+ 'Panasonic': ['panasonic', 'lumix'],+ 'Olympus': ['olympus', 'zuiko'],+ 'Fujifilm': ['fujifilm', 'fujinon', 'xf', 'xc'],+ }++ const lensMakeNormalized = lensMake.toLowerCase().trim()+ const lensModelNormalized = lensModel.toLowerCase().trim()++ // 检查镜头型号中是否已经包含品牌信息+ const brandKeywords = lensBrandMap[lensMake] || [lensMakeNormalized]+ const modelContainsBrand = brandKeywords.some(keyword =>+ lensModelNormalized.includes(keyword.toLowerCase())+ )++ if (modelContainsBrand) {+ return lensModel+ } else {+ return `${lensMake} ${lensModel}`+ }+}