мелкие допилки

Content/imageConverter/costyl.vbs

@@ -3,5 +3,5 @@ if wscript.arguments.count<>6 then wscript.quit
 set sh = createobject("wscript.shell")
 set fs = createobject("scripting.filesystemobject")
 dir=fs.getparentfoldername(wscript.scriptfullname)
-sh.run """"&dir&"\doWork.bat"&""" """&wscript.arguments(0)&""" """&wscript.arguments(1)&""" """&wscript.arguments(2)&""" """&wscript.arguments(3)&""" """&wscript.arguments(4)&""" """&wscript.arguments(5)&"""",0
+sh.run """"&dir&"\doWork.bat"&""" """&wscript.arguments(0)&""" """&wscript.arguments(1)&""" """&wscript.arguments(2)&""" """&wscript.arguments(3)&""" """&wscript.arguments(4)&""" """&wscript.arguments(5)&""""
 rem &wscript.arguments(0)

Content/imageConverter/doWork.bat

@@ -7,17 +7,18 @@ set defpath=%1
 set shotpath=%2
 set kppath=%3
 set netpath=%4
-set mgrPath=%cd%\mogrify.exe
+set mgrPath="%cd%\mogrify.exe"
 set defvidpath=%5
 set vidpath=%6
-rem convert screenshots to jpg
-cd /d %shotpath%
-%mgrPath% -resize x1080 -quality 80 -format jpg *photo_?.png
-
 
 rem convert kp to jpg
-cd %kppath%
+cd /d %kppath%
 %mgrPath% -format jpg *.png
+
+rem convert screenshots to jpg
+cd %shotpath%
+%mgrPath% -adaptive-resize 1920 -quality 80 *photo_?.jpg
+
 del *.png
 
 rem move video to client folder
@@ -25,4 +26,4 @@ robocopy %vidpath% %defvidpath% /mov
 
 rem copy all data to network
 robocopy %defpath% %netpath% /mir
-
+pause