fixed LBRY Killer sometimes killing LBRY before URL has been grabbed
This commit is contained in:
@@ -89,6 +89,8 @@ else, {
|
||||
MainButtonHeight := 30
|
||||
SecondaryButtonHeights := 35
|
||||
}
|
||||
|
||||
|
||||
Return
|
||||
|
||||
|
||||
|
||||
Binary file not shown.
@@ -21,31 +21,6 @@ CheckLBRYProcess() ; double check lbry process
|
||||
|
||||
SaveOrPostProgress(Message:="Starting Upload",PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
|
||||
|
||||
; If LBRY Killer not found, then download it
|
||||
; @todo: Add LBRY kill download functionality from gitea
|
||||
|
||||
LBRYKillerPath := LibFolder . "\LBRY Process Killer.exe"
|
||||
if(!FileExist(LBRYKillerPath)){
|
||||
|
||||
; Msgbox % "LBRYKillerPath: " LBRYKillerPath
|
||||
; Msgbox % "LBRYProcessKillerURL: " LBRYProcessKillerURL
|
||||
LBRYKillerPath = %A_ScriptDir%\Lib\LBRY Process Killer.exe
|
||||
LBRYKillerUpdateURL = https://freedomain.dev/yuriy/video-uploader/raw/branch/main/Modules/LBRY-Process-Killer.exe
|
||||
|
||||
Message = LBRY Process Killer Not Found. Automatically Downloading.
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
|
||||
UrlDownloadToFile, %LBRYKillerUpdateURL%, %LBRYKillerPath%
|
||||
if(ErrorLevel){
|
||||
Message = Failed to download the the LBRY-Killer.exe from %LBRYKillerUpdateURL%
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
Return
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
|
||||
TooltipThis("Uploading Video through API")
|
||||
; Variables of items that need to be replaced before argument is passed to API
|
||||
Apostrophe = '
|
||||
@@ -201,13 +176,6 @@ if(!InStr(UploadResult, "permanent_url")){ ; if no permanent_url is generated th
|
||||
Return
|
||||
}
|
||||
|
||||
if(KillLBRYAfterUpload){
|
||||
try run, %LBRYKillerPath%
|
||||
catch e {
|
||||
Message = LBRYKiller not found. Unable to find File.
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||
}
|
||||
}
|
||||
|
||||
; Transform the Upload Result json into the LBRY.tv link
|
||||
; PermanentURL := GetPermanentLBRYURL(UploadResult) ; get permanentURL from the upload result json
|
||||
@@ -360,7 +328,40 @@ if(LBRYUploadType = "Audio"){
|
||||
IniWrite, %OdyseeAudioURL%, %VideoLinksIniFile%, URLs, OdyseeAudioURL
|
||||
}
|
||||
|
||||
if(!LBRYKillerStarted){
|
||||
|
||||
; If LBRY Killer not found, then download it
|
||||
; @todo: Add LBRY kill download functionality from gitea
|
||||
LBRYKillerPath := LibFolder . "\LBRY Process Killer.exe"
|
||||
if(!FileExist(LBRYKillerPath)){
|
||||
|
||||
; Msgbox % "LBRYKillerPath: " LBRYKillerPath
|
||||
; Msgbox % "LBRYProcessKillerURL: " LBRYProcessKillerURL
|
||||
LBRYKillerPath = %A_ScriptDir%\Lib\LBRY Process Killer.exe
|
||||
LBRYKillerUpdateURL = https://freedomain.dev/yuriy/video-uploader/raw/branch/main/Modules/LBRY-Process-Killer.exe
|
||||
|
||||
Message = LBRY Process Killer Not Found. Automatically Downloading.
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
|
||||
UrlDownloadToFile, %LBRYKillerUpdateURL%, %LBRYKillerPath%
|
||||
if(ErrorLevel){
|
||||
Message = Failed to download the the LBRY-Killer.exe from %LBRYKillerUpdateURL%
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
Return
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
if(KillLBRYAfterUpload){
|
||||
try run, %LBRYKillerPath%
|
||||
catch e {
|
||||
Message = LBRYKiller not found. Unable to find File.
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||
}
|
||||
LBRYKillerStarted := 1
|
||||
}
|
||||
|
||||
}
|
||||
; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
; SaveDriverURL()
|
||||
AddToTotalVideosUploadedCount()
|
||||
|
||||
Reference in New Issue
Block a user