Merge pull request #22 from mlipok/patch-1

fixing _NetWebView2_ExportPageData

Author: ioa747

NetWebView2Lib.au3

@@ -99,7 +99,7 @@ Func _NetWebView2_CreateManager($sUserAgent = '', $s_fnEventPrefix = "", $s_AddB
 ;~ 	__NetWebView2_ObjName_FlagsValue($oWebV2M)
 	If @error Then __NetWebView2_Log(@ScriptLineNumber, "! [NetWebView2Lib]: Manager Creation ERROR", 1)
 	If $sUserAgent Then $oWebV2M.SetUserAgent($sUserAgent)
-	If $s_AddBrowserArgs Then $oWebV2M.AdditionalBrowserArguments= $s_AddBrowserArgs
+	If $s_AddBrowserArgs Then $oWebV2M.AdditionalBrowserArguments = $s_AddBrowserArgs
 	If $s_fnEventPrefix Then $_g_sNetWebView2_User_WebViewEvents = $s_fnEventPrefix
 	ObjEvent($oWebV2M, "__NetWebView2_WebViewEvents__", "IWebViewEvents")
 	Return SetError(@error, @extended, $oWebV2M)
@@ -252,16 +252,16 @@ EndFunc   ;==>_NetWebView2_LoadWait
 ; Example .......: No
 ; ===============================================================================================================================
 Func _NetWebView2_Navigate(ByRef $oWebV2M, $sURL, $b_LoadWait = True)
-	Local Const $s_Prefix = "[_NetWebView2_LoadWait]: URL:" & $sURL & " WAIT:" &$b_LoadWait
+	Local Const $s_Prefix = "[_NetWebView2_LoadWait]: URL:" & $sURL & " WAIT:" & $b_LoadWait
 	Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc) ; Local COM Error Handler
 	#forceref $oMyError
 
 	Local $iNavigation = $oWebV2M.Navigate($sURL)
-	If @error Then 	__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
+	If @error Then __NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
 	If @error Then Return SetError(@error, @extended, $iNavigation)
 
 	If $b_LoadWait Then _NetWebView2_LoadWait($oWebV2M, $WEBVIEW2__NAVSTATUS__TITLE_CHANGED)
-	If @error Then 	__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
+	If @error Then __NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
 	Return SetError(@error, @extended, '')
 EndFunc   ;==>_NetWebView2_Navigate
 
@@ -284,7 +284,7 @@ Func _NetWebView2_GetSource(ByRef $oWebV2M)
 	#forceref $oMyError
 
 	Local $sSource = $oWebV2M.GetSource()
-	If @error Then 	__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
+	If @error Then __NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
 	Return SetError(@error, @extended, $sSource)
 EndFunc   ;==>_NetWebView2_GetSource
 
@@ -338,12 +338,12 @@ Func _NetWebView2_ExportPageData(ByRef $oWebV2M, $iFormat, $sFilePath = '')
 	#TODO https://github.com/ioa747/NetWebView2Lib/issues/15
 	#TODO https://github.com/ioa747/NetWebView2Lib/pull/16
 
-	Local Const $s_Prefix = "[_NetWebView2_ExportPageData]:" & " Format:" & $iFormat & " FilePath:" & $sFilePath
+	Local Const $s_Prefix = "[_NetWebView2_ExportPageData]:" & " Format:" & $iFormat & " FilePath:" & (($sFilePath) ? ($sFilePath) : ('"EMPTY"'))
 	Local $oMyError = ObjEvent("AutoIt.Error", __NetWebView2_COMErrFunc) ; Local COM Error Handler
 	#forceref $oMyError
 
 	Local $s_Result = $oWebV2M.ExportPageData($iFormat, $sFilePath)
-	If StringInStr($s_Result, 'ERROR:') Then SetError(1)
+	If StringLeft($s_Result, 6) = 'ERROR:' Then SetError(1)
 	__NetWebView2_Log(@ScriptLineNumber, $s_Prefix & " RESULT:" & ((@error) ? ($s_Result) : ("SUCCESS")), 1)
 	Return SetError(@error, @extended, $s_Result)
 EndFunc   ;==>_NetWebView2_ExportPageData
@@ -397,7 +397,7 @@ Func _NetWebView2_DecodeB64(ByRef $oWebV2M, $sData)
 	Local $vResult = $oWebV2M.DecodeB64($sData)
 	__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
 	Return SetError(@error, @extended, $vResult)
-EndFunc
+EndFunc   ;==>_NetWebView2_DecodeB64
 
 ; #FUNCTION# ====================================================================================================================
 ; Name ..........: _NetWebView2_EncodeB64
@@ -421,7 +421,7 @@ Func _NetWebView2_EncodeB64(ByRef $oWebV2M, $sData)
 	Local $vResult = $oWebV2M.EncodeB64($sData)
 	__NetWebView2_Log(@ScriptLineNumber, $s_Prefix, 1)
 	Return SetError(@error, @extended, $vResult)
-EndFunc
+EndFunc   ;==>_NetWebView2_EncodeB64
 
 #EndRegion ; NetWebView2Lib UDF - core function