✨ Feature: add $extName for paste template

ISSUES CLOSED: #1000

public/i18n/en.yml

@@ -78,6 +78,7 @@ SETTINGS_MINI_WINDOW_ON_TOP: Mini Window On Top
 SETTINGS_AUTO_COPY_URL_AFTER_UPLOAD: Auto Copy URL After Upload
 SETTINGS_TIPS_PLACEHOLDER_URL: Use $url to represent url position
 SETTINGS_TIPS_PLACEHOLDER_FILENAME: Use $fileName to represent file name position
+SETTINGS_TIPS_PLACEHOLDER_EXTNAME: Use $extName to represent file's ext position
 SETTINGS_TIPS_SUCH_AS: 'Such as: $url/$fileName'
 SETTINGS_UPLOAD_PROXY: Upload Proxy
 SETTINGS_PLUGIN_INSTALL_PROXY: Proxy for Plugin Install
@@ -156,7 +157,7 @@ PLUGIN_IMPORT_LOCAL: Import Local Plugins
 
 TIPS_REMOVE_LINK: This operation will remove the picture from the album, continue?
 TIPS_WILL_REMOVE_CHOOSED_IMAGES: This operation will remove the picture from the album, continue?
-TIPS_MUST_CONTAINS_URL: Must contains $url
+TIPS_MUST_CONTAINS_URL: Must contains $url or $fileName or $extName
 TIPS_NETWORK_ERROR: Network Error
 TIPS_NEED_RELOAD: Need Reload App
 TIPS_PLEASE_CHOOSE_LOG_LEVEL: Please choose log level

public/i18n/zh-CN.yml

@@ -78,6 +78,7 @@ SETTINGS_MINI_WINDOW_ON_TOP: Mini窗口置顶
 SETTINGS_AUTO_COPY_URL_AFTER_UPLOAD: 上传后自动复制URL
 SETTINGS_TIPS_PLACEHOLDER_URL: 用占位符 $url 来表示url的位置
 SETTINGS_TIPS_PLACEHOLDER_FILENAME: 用占位符 $fileName 来表示文件名的位置
+SETTINGS_TIPS_PLACEHOLDER_EXTNAME: 用占位符 $extName 来表示文件格式的位置
 SETTINGS_TIPS_SUCH_AS: 如
 SETTINGS_UPLOAD_PROXY: 上传代理
 SETTINGS_PLUGIN_INSTALL_PROXY: 插件安装代理
@@ -156,7 +157,7 @@ PLUGIN_IMPORT_LOCAL: 导入本地插件
 
 TIPS_REMOVE_LINK: 此操作将把该图片移出相册, 是否继续?
 TIPS_WILL_REMOVE_CHOOSED_IMAGES: 将在相册中移除刚才选中的 ${m} 张图片，是否继续？
-TIPS_MUST_CONTAINS_URL: 必须含有$url
+TIPS_MUST_CONTAINS_URL: 必须含有$url 或 $fileName 或 $extName
 TIPS_NETWORK_ERROR: 网络错误暂时无法获取
 TIPS_NEED_RELOAD: 需要重启生效
 TIPS_PLEASE_CHOOSE_LOG_LEVEL: 请选择日志记录等级

public/i18n/zh-TW.yml

@@ -78,6 +78,7 @@ SETTINGS_MINI_WINDOW_ON_TOP: Mini視窗置頂
 SETTINGS_AUTO_COPY_URL_AFTER_UPLOAD: 上傳後自動複製URL
 SETTINGS_TIPS_PLACEHOLDER_URL: 用佔位符 $url 來表示URL的位置
 SETTINGS_TIPS_PLACEHOLDER_FILENAME: 用佔位符 $fileName 來表示檔案名稱的位置
+SETTINGS_TIPS_PLACEHOLDER_EXTNAME: 用佔位符 $extName 來表示檔案格式的位置
 SETTINGS_TIPS_SUCH_AS: 如
 SETTINGS_UPLOAD_PROXY: 上傳PROXY
 SETTINGS_PLUGIN_INSTALL_PROXY: 插件安裝PROXY
@@ -156,7 +157,7 @@ PLUGIN_IMPORT_LOCAL: 導入本地插件
 
 TIPS_REMOVE_LINK: 此操作將在相簿中移除該圖片，是否繼續？
 TIPS_WILL_REMOVE_CHOOSED_IMAGES: 將在相簿中移除剛才選中的 ${m} 張圖片，是否繼續？
-TIPS_MUST_CONTAINS_URL: 必須含有$url
+TIPS_MUST_CONTAINS_URL: 必須含有$url 或 $fileName 或 $extName
 TIPS_NETWORK_ERROR: 網路錯誤，暫時無法取得
 TIPS_NEED_RELOAD: 需要重新啟動生效
 TIPS_PLEASE_CHOOSE_LOG_LEVEL: 請選擇記錄等級

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