🐛 Fix: clipboard image upload under win10

split 2 ps1 file for win10 and under win10

Author: Molunerfinn

src/utils/clipboard/windows.ps1

@@ -1,44 +1,26 @@
-# Adapted from https://github.com/octan3/img-clipboard-dump/blob/master/dump-clipboard-png.ps1
+
 param($imagePath)
 
-# https://github.com/PowerShell/PowerShell/issues/7233
-# fix the output encoding bug
-[console]::InputEncoding = [console]::OutputEncoding = New-Object System.Text.UTF8Encoding
+# Adapted from https://github.com/octan3/img-clipboard-dump/blob/master/dump-clipboard-png.ps1
 
 Add-Type -Assembly PresentationCore
-function main {
-    $img = [Windows.Clipboard]::GetImage()
-
-    if ($img -eq $null) {
-        "no image"
-        Exit 1
-    }
+$img = [Windows.Clipboard]::GetImage()
 
-    if (-not $imagePath) {
-        "no image"
-        Exit 1
-    }
-
-    $fcb = new-object Windows.Media.Imaging.FormatConvertedBitmap($img, [Windows.Media.PixelFormats]::Rgb24, $null, 0)
-    $stream = [IO.File]::Open($imagePath, "OpenOrCreate")
-    $encoder = New-Object Windows.Media.Imaging.PngBitmapEncoder
-    $encoder.Frames.Add([Windows.Media.Imaging.BitmapFrame]::Create($fcb)) | out-null
-    $encoder.Save($stream) | out-null
-    $stream.Dispose() | out-null
-
-    $imagePath
+if ($img -eq $null) {
+    "no image"
+    Exit 1
 }
 
-try {
-    # For WIN10
-    $file = Get-Clipboard -Format FileDropList
-    if ($file -ne $null) {
-        Convert-Path $file
-        Exit 1
-    }
-} catch {
-    # For WIN7 WIN8 WIN10
-    main
+if (-not $imagePath) {
+    "no image"
+    Exit 1
 }
 
-main
+$fcb = new-object Windows.Media.Imaging.FormatConvertedBitmap($img, [Windows.Media.PixelFormats]::Rgb24, $null, 0)
+$stream = [IO.File]::Open($imagePath, "OpenOrCreate")
+$encoder = New-Object Windows.Media.Imaging.PngBitmapEncoder
+$encoder.Frames.Add([Windows.Media.Imaging.BitmapFrame]::Create($fcb)) | out-null
+$encoder.Save($stream) | out-null
+$stream.Dispose() | out-null
+
+$imagePath

src/utils/clipboard/windows10.ps1

@@ -0,0 +1,44 @@
+# Adapted from https://github.com/octan3/img-clipboard-dump/blob/master/dump-clipboard-png.ps1
+param($imagePath)
+
+# https://github.com/PowerShell/PowerShell/issues/7233
+# fix the output encoding bug
+[console]::InputEncoding = [console]::OutputEncoding = New-Object System.Text.UTF8Encoding
+
+Add-Type -Assembly PresentationCore
+function main {
+    $img = [Windows.Clipboard]::GetImage()
+
+    if ($img -eq $null) {
+        "no image"
+        Exit 1
+    }
+
+    if (-not $imagePath) {
+        "no image"
+        Exit 1
+    }
+
+    $fcb = new-object Windows.Media.Imaging.FormatConvertedBitmap($img, [Windows.Media.PixelFormats]::Rgb24, $null, 0)
+    $stream = [IO.File]::Open($imagePath, "OpenOrCreate")
+    $encoder = New-Object Windows.Media.Imaging.PngBitmapEncoder
+    $encoder.Frames.Add([Windows.Media.Imaging.BitmapFrame]::Create($fcb)) | out-null
+    $encoder.Save($stream) | out-null
+    $stream.Dispose() | out-null
+
+    $imagePath
+}
+
+try {
+    # For WIN10
+    $file = Get-Clipboard -Format FileDropList
+    if ($file -ne $null) {
+        Convert-Path $file
+        Exit 1
+    }
+} catch {
+    # For WIN7 WIN8 WIN10
+    main
+}
+
+main

src/utils/getClipboardImage.ts

@@ -2,12 +2,27 @@ import PicGo from '../core/PicGo'
 import path from 'path'
 import { spawn } from 'child_process'
 import dayjs from 'dayjs'
+import os from 'os'
+
+const getCurrentPlatform = (): string => {
+  let platform = process.platform
+  if (platform !== 'win32') {
+    return platform
+  } else {
+    let currentOS = os.release().split('.')[0]
+    if (currentOS === '10') {
+      return 'win10'
+    } else {
+      return 'win32'
+    }
+  }
+}
 
 // Thanks to vs-picgo: https://github.com/Spades-S/vs-picgo/blob/master/src/extension.ts
 const getClipboardImage = (ctx: PicGo): Promise<any> => {
   const imagePath = path.join(ctx.baseDir, `${dayjs().format('YYYYMMDDHHmmss')}.png`)
   return new Promise((resolve: any, reject: any): any => {
-    let platform: string = process.platform
+    let platform: string = getCurrentPlatform()
     let execution = null
     // for PicGo GUI
     let env = ctx.config.PICGO_ENV === 'GUI'
@@ -16,13 +31,13 @@ const getClipboardImage = (ctx: PicGo): Promise<any> => {
     } = {
       'darwin': env ? path.join(ctx.baseDir,'./mac.applescript') : './clipboard/mac.applescript',
       'win32': env ? path.join(ctx.baseDir, 'windows.ps1') : './clipboard/windows.ps1',
+      'win10': env ? path.join(ctx.baseDir, 'windows10.ps1') : './clipboard/windows10.ps1',
       'linux': env ? path.join(ctx.baseDir, 'linux.sh') : './clipboard/linux.sh'
     }
     const scriptPath = env ? platformPaths[platform] : path.join(__dirname, platformPaths[platform])
     if (platform === 'darwin') {
       execution = spawn('osascript', [scriptPath, imagePath])
-
-    } else if (platform === 'win32') {
+    } else if (platform === 'win32' || platform === 'win10') {
       execution = spawn('powershell', [
         '-noprofile',
         '-noninteractive',