✨ Feature: add $extName for paste template

ISSUES CLOSED: #1000

src/main/server/index.ts

@@ -45,7 +45,7 @@ class Server {
       })
       return
     }
-    
+
     if (request.method === 'POST') {
       if (!routers.getHandler(request.url!)) {
         logger.warn(`[PicGo Server] don't support [${request.url}] url`)

src/main/utils/pasteTemplate.ts

@@ -4,11 +4,13 @@ import { handleUrlEncode } from '#/utils/common'
 const formatCustomLink = (customLink: string, item: ImgInfo) => {
   const fileName = item.fileName!.replace(new RegExp(`\\${item.extname}$`), '')
   const url = item.url || item.imgUrl
+  const extName = item.extname
   const formatObj = {
     url,
-    fileName
+    fileName,
+    extName
   }
-  const keys = Object.keys(formatObj) as ['url', 'fileName']
+  const keys = Object.keys(formatObj) as ['url', 'fileName', 'extName']
   keys.forEach(item => {
     if (customLink.indexOf(`$${item}`) !== -1) {
       const reg = new RegExp(`\\$${item}`, 'g')

src/renderer/pages/PicGoSetting.vue

@@ -201,6 +201,9 @@
           <div class="custom-title">
             {{ $T('SETTINGS_TIPS_PLACEHOLDER_FILENAME') }}
           </div>
+          <div class="custom-title">
+            {{ $T('SETTINGS_TIPS_PLACEHOLDER_EXTNAME') }}
+          </div>
           <el-input
             class="align-center"
             v-model="customLink.value"
@@ -226,7 +229,6 @@
         label-position="right"
         :model="customLink"
         ref="customLink"
-        :rules="rules"
         label-width="120px"
       >
         <el-form-item
@@ -397,7 +399,7 @@ import { getLatestVersion } from '#/utils/getLatestVersion'
 import { compare } from 'compare-versions'
 import { STABLE_RELEASE_URL, BETA_RELEASE_URL } from '#/utils/static'
 const customLinkRule = (rule: string, value: string, callback: (arg0?: Error) => void) => {
-  if (!/\$url/.test(value)) {
+  if (!/\$url/.test(value) && !/\$fileName/.test(value) && !/\$extName/.test(value)) {
     return callback(new Error(T('TIPS_MUST_CONTAINS_URL')))
   } else {
     return callback()

src/universal/types/i18n.d.ts

@@ -73,6 +73,7 @@ interface ILocales {
   SETTINGS_AUTO_COPY_URL_AFTER_UPLOAD: string
   SETTINGS_TIPS_PLACEHOLDER_URL: string
   SETTINGS_TIPS_PLACEHOLDER_FILENAME: string
+  SETTINGS_TIPS_PLACEHOLDER_EXTNAME: string
   SETTINGS_TIPS_SUCH_AS: string
   SETTINGS_UPLOAD_PROXY: string
   SETTINGS_PLUGIN_INSTALL_PROXY: string