Merge pull request #163 from jamebal/dev

feat: 显示视频的格式码率等信息
jamebal · Jun 6, 2024 · 00a02cc · 00a02cc
2 parents 543e878 + 64620c7
commit 00a02cc
Show file tree

Hide file tree

Showing 5 changed files with 90 additions and 62 deletions.
diff --git a/src/components/ShowFile/ShowFile.vue b/src/components/ShowFile/ShowFile.vue
@@ -551,7 +551,7 @@
                     '\r\n' +
                     '路径：' +
                     item.path +
-                    '\r\n' + formatExif(item.exif)
+                    extendedInfo(item)
                 "
                 :style="{paddingTop: 100/gridColumnNum + '%'}"
               >
@@ -815,7 +815,7 @@ import { mapGetters, mapState } from 'vuex'
 import { formatSize, formatTime } from '@/utils/number'
 import { getElementToPageLeft } from '@/utils/dom'
 import { suffix } from '@/utils/file-type'
-import { formatExif } from '@/utils/image'
+import { formatExif,formatVideo } from '@/utils/media'
 import api from '@/api/file-api'
 import BreadcrumbFilePath from '@/components/Breadcrumb/BreadcrumbFilePath'
 import IconFile from '@/components/Icon/IconFile'
@@ -2204,8 +2204,11 @@ export default {
     formatSize(size) {
       return formatSize(size)
     },
-    formatExif(exifInfo) {
-      return formatExif(exifInfo)
+    extendedInfo(file) {
+      if (!file.exif && !file.video) {
+        return
+      }
+      return "\r\n" + formatExif(file.exif) + formatVideo(file.video)
     },
     upload() {
       // 打开文件选择框

diff --git a/src/components/preview/FileDetails.vue b/src/components/preview/FileDetails.vue
@@ -56,9 +56,12 @@
         <el-form-item label="修改时间:">
           <span>{{ rowContextData.updateDate }}</span>
         </el-form-item>
-        <el-form-item v-if="rowContextData.exif" label="Exif:">
+        <el-form-item v-if="rowContextData.exif" label="">
           <span style="white-space: break-spaces;">{{ formatExif(rowContextData.exif) }}</span>
         </el-form-item>
+        <el-form-item v-if="rowContextData.video" label="">
+          <span style="white-space: break-spaces;">{{ formatVideo(rowContextData.video) }}</span>
+        </el-form-item>
       </el-form>
     </el-drawer>
   </div>
@@ -68,7 +71,7 @@
 import { formatSize } from '@/utils/number'
 import IconFile from '@/components/Icon/IconFile'
 import {mapState} from "vuex";
-import {formatExif} from "@/utils/image";
+import {formatExif,formatVideo} from "@/utils/media";
 import settingApi from "@/api/setting-api";
 
 export default {
@@ -127,6 +130,9 @@ export default {
     formatExif(exifInfo) {
       return formatExif(exifInfo)
     },
+    formatVideo(videoInfo) {
+      return formatVideo(videoInfo)
+    },
     getIsSync() {
       settingApi.isSync({username: this.$store.state.user.name}).then((res) => {
         this.updateSyncStatus(res.data)

diff --git a/src/utils/image.js b/src/utils/image.js
diff --git a/src/utils/media.js b/src/utils/media.js
@@ -0,0 +1,75 @@
+export function formatExif(exifInfo) {
+  if (!exifInfo) {
+    return ''
+  }
+  let exifStr = ''
+  if (exifInfo['dateTimeOriginal']) {
+    exifStr += `内容创作时间: ${exifInfo['dateTimeOriginal']}`
+  }
+  if (exifInfo['resolution']) {
+    exifStr += `\r\n分辨率: ${exifInfo['resolution']}`
+  }
+  if (exifInfo['make']) {
+    exifStr += `\r\n设备制造商: ${exifInfo['make']}`
+  }
+  if (exifInfo['model']) {
+    exifStr += `\r\n设备型号: ${exifInfo['model']}`
+  }
+  if (exifInfo['aperture']) {
+    exifStr += `\r\n光圈值: ${exifInfo['aperture']}`
+  }
+  if (exifInfo['exposureTime']) {
+    exifStr += `\r\n曝光时间: ${exifInfo['exposureTime']}`
+  }
+  if (exifInfo['focalLength']) {
+    exifStr += `\r\n焦距: ${exifInfo['focalLength']} 毫米`
+  }
+  if (exifInfo['isoEquivalent']) {
+    exifStr += `\r\nISO感光度: ${exifInfo['isoEquivalent']}`
+  }
+  if (exifInfo['flash']) {
+    exifStr += `\r\n闪光灯: ${exifInfo['flash']}`
+  }
+  if (exifInfo['fNumber']) {
+    exifStr += `\r\n光圈数: ${exifInfo['fNumber']}`
+  }
+  if (exifInfo['exposureProgram']) {
+    exifStr += `\r\n曝光程序: ${exifInfo['exposureProgram']}`
+  }
+  if (exifInfo['meteringMode']) {
+    exifStr += `\r\n测光模式: ${exifInfo['meteringMode']}`
+  }
+  if (exifInfo['whiteBalanceMode']) {
+    exifStr += `\r\n白平衡: ${exifInfo['whiteBalanceMode']}`
+  }
+  if (exifInfo['software']) {
+    exifStr += `内容创作者: ${exifInfo['software']}`
+  }
+  if (exifInfo['longitude']) {
+    exifStr += `\r\n经度: ${exifInfo['longitude']}`
+  }
+  if (exifInfo['latitude']) {
+    exifStr += `\r\n纬度: ${exifInfo['latitude']}`
+  }
+  return exifStr
+}
+
+export function formatVideo(videoInfo) {
+  if (!videoInfo) {
+    return ''
+  }
+  let videoStr = ''
+  if (videoInfo['height'] && videoInfo['width']) {
+    videoStr += `尺寸: ${videoInfo['width']} x ${videoInfo['height']}`
+  }
+  if (videoInfo['bitrate']) {
+    videoStr += `\r\n码率: ${videoInfo['bitrate']}`
+  }
+  if (videoInfo['format']) {
+    videoStr += `\r\n格式: ${videoInfo['format']}`
+  }
+  if (videoInfo['duration']) {
+    videoStr += `\r\n时长: ${videoInfo['duration']}`
+  }
+  return videoStr
+}
diff --git a/src/views/setting/cloudManager.vue b/src/views/setting/cloudManager.vue
@@ -224,7 +224,6 @@ export default {
     }
     getTaskProgress().then(res => {
       this.taskProgressDataList = res.data
-      this.taskProgressChange(this.taskProgressDataList.length)
     })
   },
   computed: {