Compare commits
9 Commits
a3d89a9892
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 95bda715cb | |||
| ae2027826f | |||
| 670b97d6b1 | |||
| 4a1d2a5d9d | |||
| 8447b6009a | |||
| 62e8afebb8 | |||
| e654611bf3 | |||
| 6bf72336d0 | |||
| fd6be690da |
@@ -117,7 +117,7 @@ SendTelegramMessage(token, chatID, text := "", ParseMode := "MarkdownV2")
|
||||
json_resp := whr.ResponseText
|
||||
whr := ; free COM object
|
||||
; Msgbox % "json_resp: " json_resp
|
||||
if(InStr(json_resp, "error_code"))
|
||||
; if(InStr(json_resp, "error_code"))
|
||||
Return json_resp
|
||||
}
|
||||
|
||||
@@ -167,7 +167,7 @@ SendTelegramPhoto(token, chatID, file, caption := "", ParseMode := "MarkdownV2")
|
||||
whr := ; free COM object
|
||||
; Msgbox % "json_resp: " json_resp
|
||||
|
||||
if(InStr(json_resp, "error_code"))
|
||||
; if(InStr(json_resp, "error_code"))
|
||||
Return json_resp
|
||||
}
|
||||
|
||||
@@ -195,7 +195,7 @@ SendTelegramVideo(token, chatID, file, caption := "", ParseMode := "MarkdownV2")
|
||||
whr := ; free COM object
|
||||
; Msgbox % "json_resp: " json_resp
|
||||
|
||||
if(InStr(json_resp, "error_code"))
|
||||
; if(InStr(json_resp, "error_code"))
|
||||
Return json_resp
|
||||
}
|
||||
|
||||
@@ -224,7 +224,7 @@ SendTelegramFile(token, chatID, file, caption := "", ParseMode := "MarkdownV2")
|
||||
whr := ; free COM object
|
||||
; Msgbox % "json_resp: " json_resp
|
||||
|
||||
if(InStr(json_resp, "error_code"))
|
||||
; if(InStr(json_resp, "error_code"))
|
||||
Return json_resp
|
||||
}
|
||||
|
||||
|
||||
@@ -230,7 +230,7 @@ DownloadLatestChromium(){
|
||||
; Check if the Copy-ChromeDriver-To-Program-Files.exe file exists
|
||||
|
||||
; @todo, remove later. this is temporary to fix chromedriver-mover being broken and needing to be replaced
|
||||
FileDelete, %ChromeDriverMoverEXEFilepath%
|
||||
; FileDelete, %ChromeDriverMoverEXEFilepath%
|
||||
|
||||
Message = Checking Chromedriver-Mover.exe exists
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
@@ -351,10 +351,13 @@ GetInstalledChromeFilepath(){
|
||||
if(FileExist(ChromePortableFilepath))
|
||||
ChromeFilepath := ChromePortableFilepath
|
||||
|
||||
Message = Using Chromium Portable for Upload
|
||||
SaveOrPostProgress(Message:=Message,PostType:="ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
; Message = Using Chromium Portable for Upload
|
||||
; SaveOrPostProgress(Message:=Message,PostType:="ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
}
|
||||
else {
|
||||
Message = Chrome.exe not found in \Lib\
|
||||
SaveOrPostProgress(Message,PostType:=",ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||
|
||||
MsgBox 0x10, Chrome Not Found, Chrome for Testing not found.`nIf this is your first time running on this computer, please click the "Chrome Up-To-Date" button to download the latest chrome binaries.
|
||||
}
|
||||
}
|
||||
|
||||
@@ -109,13 +109,9 @@ Func_LogErrorsToTextFile(Text){
|
||||
|
||||
; ErrorLoggingFile := Filepath
|
||||
FormatTime, TodayDate , YYYYMMDDHH24MISS, yyyyMMdd_hhmmss
|
||||
text =
|
||||
(
|
||||
|
||||
---------------%TodayDate%---------------
|
||||
%Text%
|
||||
text =`n`n---------------%TodayDate%---------------`n%Text%
|
||||
|
||||
)
|
||||
FileAppend, %Text%, %ErrorLoggingFilePath%
|
||||
}
|
||||
; -------------------------------/LogErrorsToTextFile-------------------------------
|
||||
@@ -605,6 +601,22 @@ GetDateOrdinalSuffix(D) {
|
||||
}
|
||||
|
||||
|
||||
; Calculate the aspect ratio of a video/image using the width + height
|
||||
getAspectRatio(width, height) {
|
||||
gcd := gcdFunc(width, height)
|
||||
return round(width/gcd) ":" round(height/gcd)
|
||||
}
|
||||
|
||||
; The gcdFunc() is a helper function that calculates the GCD (greatest common divisor) of two numbers using the Euclidean algorithm.
|
||||
; Used for calculating aspect ratio of Videos
|
||||
gcdFunc(a, b) {
|
||||
while b
|
||||
t := b, b := Mod(a, b), a := t
|
||||
return a
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
; OnMsgbox - Custom Msgbox Screens
|
||||
@@ -619,16 +631,16 @@ if (ConfirmBeforeSubmit && ConfirmBeforeSubmitMsgboxFunc() != true) {
|
||||
return
|
||||
}
|
||||
*/
|
||||
OnMessage(0x44, "OnMsgBoxUserConfirmation")
|
||||
MsgBox 0x21, User Confirmation, Please check that all data was input correctly and fix any mistakes and then click PROCEED to finalize the Upload.`n`nClick STOP to cancel the rest of this Upload and move on to the next website.
|
||||
OnMessage(0x44, "")
|
||||
IfMsgBox OK, {
|
||||
return true
|
||||
} Else IfMsgBox Cancel, {
|
||||
Message = User Selected STOP button when asked for confirmation. Cancelling Rest of Site Upload.
|
||||
Return %Message%
|
||||
}
|
||||
OnMessage(0x44, "OnMsgBoxUserConfirmation")
|
||||
MsgBox 0x21, User Confirmation, Please check that all data was input correctly and fix any mistakes and then click PROCEED to finalize the Upload.`n`nClick STOP to cancel the rest of this Upload and move on to the next website.
|
||||
OnMessage(0x44, "")
|
||||
IfMsgBox OK, {
|
||||
return true
|
||||
} Else IfMsgBox Cancel, {
|
||||
Message = User Selected STOP button when asked for confirmation. Cancelling Rest of Site Upload.
|
||||
Return %Message%
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
|
||||
|
||||
47
Gitea-AttachAssetToRelease.ps1
Normal file
47
Gitea-AttachAssetToRelease.ps1
Normal file
@@ -0,0 +1,47 @@
|
||||
$apiurl=$args[0]
|
||||
$apitoken=$args[1]
|
||||
$filename=$args[2]
|
||||
$filepath=$args[3]
|
||||
|
||||
|
||||
Write-Host "apiurl: $apiurl"
|
||||
Write-Host "apitoken: $apitoken"
|
||||
Write-Host "filename: $filename"
|
||||
Write-Host "filepath: $filepath"
|
||||
|
||||
|
||||
# Load the required .NET assemblies
|
||||
Add-Type -AssemblyName System.Net.Http
|
||||
|
||||
# Create Object and Load the required .NET assemblies
|
||||
$httpClient = New-Object System.Net.Http.HttpClient
|
||||
|
||||
# $url = 'https://git.zinchuk.xyz/api/v1/repos/yuriy/TestRepo/releases/22/assets'
|
||||
# $fileName = 'TestFile58.exe'
|
||||
# $token = '2cf4a54d941'
|
||||
|
||||
$headers = @{
|
||||
'accept' = 'application/json'
|
||||
'Content-Type' = 'multipart/form-data'
|
||||
}
|
||||
|
||||
# $filePath = "C:\Users\yuriy\Syncthing\Git\TestREpo\test.exe"
|
||||
$fileBytes = [System.IO.File]::ReadAllBytes($filePath)
|
||||
$fileStream = [System.IO.MemoryStream]::new($fileBytes)
|
||||
|
||||
$httpClient = [System.Net.Http.HttpClient]::new()
|
||||
$httpClient.DefaultRequestHeaders.Add('Authorization', "Bearer $apitoken")
|
||||
|
||||
$multipartFormData = New-Object System.Net.Http.MultipartFormDataContent
|
||||
$fileContent = New-Object System.Net.Http.StreamContent -ArgumentList $fileStream
|
||||
$fileContent.Headers.ContentDisposition = New-Object System.Net.Http.Headers.ContentDispositionHeaderValue -ArgumentList "form-data"
|
||||
$fileContent.Headers.ContentDisposition.Name = "attachment"
|
||||
$fileContent.Headers.ContentDisposition.FileName = $fileName
|
||||
# $fileContent.Headers.ContentType = [System.Net.Http.Headers.MediaTypeHeaderValue]::Parse("text/plain")
|
||||
$fileContent.Headers.ContentType = [System.Net.Http.Headers.MediaTypeHeaderValue]::Parse("application/x-msdownload")
|
||||
$multipartFormData.Add($fileContent)
|
||||
|
||||
$response = $httpClient.PostAsync($apiurl, $multipartFormData).Result
|
||||
$responseContent = $response.Content.ReadAsStringAsync().Result
|
||||
|
||||
Write-Output $responseContent
|
||||
62
Gitea-CreateRelease.ps1
Normal file
62
Gitea-CreateRelease.ps1
Normal file
@@ -0,0 +1,62 @@
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Create a new release on on a Gitea site using the Gitea API
|
||||
|
||||
.DESCRIPTION
|
||||
The Add-Numbers function takes two integer parameters, $Number1 and $Number2,
|
||||
and returns the sum of those two numbers.
|
||||
|
||||
.PARAMETER APIURL
|
||||
The Repo Releases API URL of the Gitea site, including the API Key.
|
||||
Example: "https://gitea.example.com/api/v1/repos/yuriy/TESTREPO/releases?token=aaabbbcccdd"
|
||||
|
||||
.PARAMETER ReleaseName
|
||||
Name for the release that will be created
|
||||
|
||||
.PARAMETER ReleaseTag
|
||||
Tag for the release that will be created
|
||||
|
||||
.PARAMETER ReleaseBody
|
||||
Body Text for the release that will be created
|
||||
|
||||
.EXAMPLE
|
||||
Gitea-CreateRelease.ps1 "https://gitea.example.com/api/v1/repos/yuriy/TESTREPO/releases?token=aaabbbcccdd" "1.0" "1.0" "Initial Release"
|
||||
|
||||
.NOTES
|
||||
This function was created as an example for a PowerShell documentation demonstration.
|
||||
|
||||
.LINK
|
||||
https://example.com/powershell-functions
|
||||
#>
|
||||
|
||||
|
||||
$APIURL=$args[0]
|
||||
$ReleaseName=$args[1]
|
||||
$ReleaseTag=$args[2]
|
||||
$ReleaseBody=$args[3]
|
||||
|
||||
<#
|
||||
Write-Host "APIURL: $APIURL"
|
||||
Write-Host "ReleaseTag: $ReleaseTag"
|
||||
Write-Host "ReleaseName: $ReleaseName"
|
||||
Write-Host "ReleaseBody: $ReleaseBody"
|
||||
#>
|
||||
|
||||
$headers = @{
|
||||
"accept" = "application/json"
|
||||
"Content-Type" = "application/json"
|
||||
}
|
||||
$body = @{
|
||||
"body" = "${ReleaseBody}"
|
||||
"draft" = $false
|
||||
"name" = "${ReleaseTag}"
|
||||
"prerelease" = $false
|
||||
"tag_name" = "${ReleaseTag}"
|
||||
# "target_commitish" = "string"
|
||||
} | ConvertTo-Json
|
||||
|
||||
# Write-Host "body: " $body
|
||||
|
||||
$Result = Invoke-RestMethod -Uri $APIURL -Method Post -Headers $headers -Body $body
|
||||
|
||||
Write-Host $Result
|
||||
@@ -1,8 +1,7 @@
|
||||
; GITEA Functions
|
||||
;------------------------------------------------
|
||||
CheckForUpdates(GitReleasesAPIURL){
|
||||
; msgbox, checking for updates
|
||||
Message = Checking For Updates
|
||||
CheckForUpdates(GitReleasesAPIURL, CurrentVersionNumber := 0){
|
||||
Message = Checking For Updates at %GitReleasesAPIURL%
|
||||
SaveOrPostProgress(Message,PostType:="ErrorLoggingTextFile")
|
||||
|
||||
data := URLDownloadToVar(GitReleasesAPIURL)
|
||||
@@ -15,25 +14,15 @@ CheckForUpdates(GitReleasesAPIURL){
|
||||
Return
|
||||
}
|
||||
|
||||
UpdateVersionNumber := parsed.1.name
|
||||
LatestReleaseVersionNumber := parsed.1.name
|
||||
|
||||
; Message = UpdateVersionNumber: %UpdateVersionNumber%
|
||||
; DevModeMsgBox(Message)
|
||||
|
||||
|
||||
if(ScriptVersion = UpdateVersionNumber OR ScriptVersion > UpdateVersionNumber){
|
||||
ToolTip
|
||||
return 0
|
||||
}
|
||||
else, {
|
||||
if(CurrentVersionNumber >= LatestReleaseVersionNumber)
|
||||
UpdateAvailable := 0
|
||||
else,
|
||||
UpdateAvailable := 1
|
||||
; msgbox, update found!
|
||||
Message = Program Update Found
|
||||
SaveOrPostProgress(Message:=Message,PostType:="ErrorLoggingTextFile")
|
||||
; IniWrite, 1, %SettingsIniFilepath%, %ScriptSettingsSection%, UpdateAvailable
|
||||
; ToolTip
|
||||
return 1
|
||||
}
|
||||
|
||||
ToolTip
|
||||
return UpdateAvailable
|
||||
|
||||
}
|
||||
|
||||
@@ -53,19 +42,13 @@ UpdateScript(){
|
||||
exename := parsed.1.assets.1.name
|
||||
exeURL := parsed.1.assets.1.browser_download_url
|
||||
|
||||
; Msgbox % "UpdateVersionNumber: " UpdateVersionNumber
|
||||
; msgbox, Version: %Version%
|
||||
; Msgbox % "ChangeLog: " ChangeLog
|
||||
; Msgbox % "exeURL: " exeURL
|
||||
; Msgbox % "exename: " exename
|
||||
|
||||
ExeName := StrReplace(exename, ".exe", "")
|
||||
UpdateExeName = %exename% %UpdateVersionNumber%.exe
|
||||
UpdateExeFilepath = %A_ScriptDir%\%UpdateExeName%
|
||||
|
||||
if(ScriptVersion = UpdateVersionNumber){
|
||||
if(ScriptVersion =< UpdateVersionNumber){
|
||||
; IniWrite, 0, %SettingsIniFilepath%, %ScriptSettingsSection%, UpdateAvailable
|
||||
MsgBox, You are Up-To-Date
|
||||
MsgBox, You are Up-To-Date, There are no new updates to download.
|
||||
; IniRead, UpdateAvailable, %SettingsIniFilepath%, %ScriptSettingsSection%, UpdateAvailable, 0
|
||||
return
|
||||
}
|
||||
@@ -81,10 +64,12 @@ UpdateScript(){
|
||||
}
|
||||
Else IfMsgBox No, {
|
||||
SaveOrPostProgress(Message:="Downloading Update",PostType:="Tooltip,ErrorLoggingTextFile")
|
||||
; Msgbox, downloading to: %A_ScriptDir%\%UpdateExeName%
|
||||
|
||||
UrlDownloadToFile, %exeURL%, %UpdateExeFilepath%
|
||||
run, "%UpdateExeFilepath%" "%A_ScriptFullPath%"
|
||||
ExitApp
|
||||
}
|
||||
return
|
||||
}
|
||||
|
||||
|
||||
|
||||
63
Gitea-Functions.ps1
Normal file
63
Gitea-Functions.ps1
Normal file
@@ -0,0 +1,63 @@
|
||||
<#
|
||||
.SYNOPSIS
|
||||
Adds two numbers and returns the result.
|
||||
|
||||
.DESCRIPTION
|
||||
The Add-Numbers function takes two integer parameters, $Number1 and $Number2,
|
||||
and returns the sum of those two numbers.
|
||||
|
||||
.PARAMETER Number1
|
||||
The first number to add.
|
||||
|
||||
.PARAMETER Number2
|
||||
The second number to add.
|
||||
|
||||
.EXAMPLE
|
||||
$sum = Add-Numbers -Number1 5 -Number2 10
|
||||
Write-Host "The sum is: $sum"
|
||||
|
||||
.NOTES
|
||||
This function was created as an example for a PowerShell documentation demonstration.
|
||||
|
||||
.LINK
|
||||
https://example.com/powershell-functions
|
||||
#>
|
||||
|
||||
|
||||
$APIURL=$args[0]
|
||||
$ReleaseName=$args[1]
|
||||
$ReleaseTag=$args[2]
|
||||
$ReleaseBody=$args[3]
|
||||
|
||||
|
||||
function CreateRelease {
|
||||
param (
|
||||
[string]$APIURL,
|
||||
[string]$ReleaseName,
|
||||
[string]$ReleaseID,
|
||||
[string]$ReleaseBody,
|
||||
)
|
||||
|
||||
$headers = @{
|
||||
"accept" = "application/json"
|
||||
"Content-Type" = "application/json"
|
||||
}
|
||||
$body = @{
|
||||
"body" = "${ReleaseBody}"
|
||||
"draft" = $false
|
||||
"name" = "${ReleaseTag}"
|
||||
"prerelease" = $false
|
||||
"tag_name" = "${ReleaseTag}"
|
||||
"target_commitish" = "string"
|
||||
} | ConvertTo-Json
|
||||
|
||||
# Write-Host "body: " $body
|
||||
|
||||
$Result = Invoke-RestMethod -Uri $APIURL -Method Post -Headers $headers -Body $body
|
||||
|
||||
Write-Host $Result
|
||||
}
|
||||
|
||||
|
||||
|
||||
Write-FullName -FirstName "John" -LastName "Doe"
|
||||
@@ -21,6 +21,10 @@ GrabLocalsPostURLUsingTitle(PostTitle){
|
||||
try ElementInnerText := driver.findelementbyxpath(Xpath).Attribute("innerText") ;XPATH Inner Text
|
||||
Try ElementOuterHTML := driver.findelementbyxpath(Xpath).Attribute("outerHTML") ;XPATH-ID & Tag
|
||||
|
||||
if(Devmode){
|
||||
Msgbox % "ElementInnerText: " ElementInnerText "`n" "ElementOuterHTML: " ElementOuterHTML
|
||||
}
|
||||
|
||||
|
||||
if(InStr(ElementInnerText, PostTitle)){
|
||||
Message = Found Post Title in Element Number: %A_index%
|
||||
|
||||
108
Shared-GoTos.ahk
108
Shared-GoTos.ahk
@@ -1,31 +1,53 @@
|
||||
; This #include needs to be at the bottom of the parent script
|
||||
|
||||
|
||||
|
||||
CheckForUpdates:
|
||||
UpdateStartTime := A_TickCount ; start time
|
||||
|
||||
|
||||
; The GUI buttons must have variable set to vUpdateAvailable and vChromeUpdateAvailable for button to get updated
|
||||
|
||||
; The following variables need to be set in the parent script
|
||||
; GitReleasesAPIURL
|
||||
; ChromeFilepath
|
||||
|
||||
; Message = Checking for Updates
|
||||
; SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
Message = Checking for Updates
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
|
||||
if(CheckForUpdates(GitReleasesAPIURL, ScriptVersion)){
|
||||
GuiControl,,UpdateAvailable, Update Available!
|
||||
}
|
||||
|
||||
if(CheckForUpdates(GitReleasesAPIURL)){
|
||||
GuiControl,,UpdateAvailable, %ScriptAbbreviatedName% Update Available!
|
||||
; check for Post Scheduler Update
|
||||
if(ScriptNameAcronym = "FVU"){
|
||||
if(CheckForUpdates(PostSchedulerGitReleasesAPIURL, PostSchedulerVersion)){
|
||||
GuiControl,,PostSchedulerUpdateAvailable, FPS Update Available!
|
||||
}
|
||||
}
|
||||
|
||||
if(CheckForChromeUpdates(ChromeFilepath)){
|
||||
GuiControl,,ChromeUpdateAvailable, Chrome Update Available!
|
||||
; ChromeUpdateAvailable := 1
|
||||
ChromeUpdateAvailable := 1
|
||||
}
|
||||
|
||||
; calculate run time and convert to seconds
|
||||
TimeToCheckforUpdates := round(((A_TickCount - UpdateStartTime) / 1000), 2)
|
||||
|
||||
Message = Update Check took %TimeToCheckforUpdates% seconds to complete
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
; Msgbox % "TimeToCheckforUpdates: " TimeToCheckforUpdates
|
||||
; Msgbox % "URunTime: " URunTime
|
||||
|
||||
ToolTip
|
||||
Return
|
||||
|
||||
; UpdatePostScheduler:
|
||||
|
||||
|
||||
|
||||
Return
|
||||
|
||||
|
||||
UpdateChrome:
|
||||
|
||||
@@ -92,14 +114,84 @@ Return
|
||||
|
||||
OpenGiteaPage:
|
||||
if(ScriptAbbreviatedName = "FLS")
|
||||
URL = https://freedomain.dev/yuriy/livestream-scheduler
|
||||
URL = https://freedomain.dev/yuriy/livestream-scheduler
|
||||
|
||||
if(ScriptAbbreviatedName = "FVU")
|
||||
URL = https://freedomain.dev/yuriy/video-uploader
|
||||
URL = https://freedomain.dev/yuriy/video-uploader
|
||||
|
||||
if(ScriptAbbreviatedName = "FSMP")
|
||||
URL = https://freedomain.dev/yuriy/social-media-poster
|
||||
URL = https://freedomain.dev/yuriy/social-media-poster
|
||||
|
||||
|
||||
run, %URL%
|
||||
Return
|
||||
|
||||
|
||||
|
||||
|
||||
UpdatePostScheduler:
|
||||
; Close any existing instances of the Post Scheduler
|
||||
|
||||
; Kill any active intances of the Post Scheduler so the .exe file can be overwriten
|
||||
process, close, Freedomain Post Scheduler.exe
|
||||
|
||||
|
||||
; Msgbox % "PostSchedulerGitReleasesAPIURL: " PostSchedulerGitReleasesAPIURL
|
||||
data := URLDownloadToVar(PostSchedulerGitReleasesAPIURL)
|
||||
|
||||
try parsed := JSON.Load(data)
|
||||
catch e {
|
||||
Message = Failed to check for updates. Gitea Releases API returned blank or malformed data.
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||
Return
|
||||
}
|
||||
|
||||
UpdateVersionNumber := parsed.1.name
|
||||
ChangeLog := parsed.1.body
|
||||
exename := parsed.1.assets.1.name
|
||||
exeURL := parsed.1.assets.1.browser_download_url
|
||||
|
||||
|
||||
|
||||
; Msgbox % "exename: " exename
|
||||
|
||||
; ExeName := StrReplace(exename, ".exe", "")
|
||||
; UpdateExeName = %exename%.exe
|
||||
UpdateExeFilepath = %A_ScriptDir%\%ExeName%
|
||||
|
||||
if(PostSchedulerVersion =< UpdateVersionNumber){
|
||||
; IniWrite, 0, %SettingsIniFilepath%, %ScriptSettingsSection%, UpdateAvailable
|
||||
MsgBox, You are Up-To-Date, There are no new updates to download.
|
||||
; IniRead, UpdateAvailable, %SettingsIniFilepath%, %ScriptSettingsSection%, UpdateAvailable, 0
|
||||
return
|
||||
}
|
||||
|
||||
Changelog = %PostSchedulerVersion% --> %UpdateVersionNumber%`n`nChangelog:`n%Changelog%
|
||||
|
||||
OnMessage(0x44, "OnMsgBoxUpdateAvailable")
|
||||
MsgBox 0x44, Update Available For %exename%, %Changelog%
|
||||
OnMessage(0x44, "")
|
||||
|
||||
IfMsgBox Yes, {
|
||||
Return
|
||||
}
|
||||
Else IfMsgBox No, {
|
||||
SaveOrPostProgress(Message:="Downloading Update",PostType:="Tooltip,ErrorLoggingTextFile")
|
||||
|
||||
if(FileExist(UpdateExeFilepath)){
|
||||
FileDelete, %UpdateExeFilepath%
|
||||
if(ErrorLevel){
|
||||
Message = Failed to Delete %UpdateExeFilepath%. `nPlease Close the process manually and try the update again.
|
||||
MsgBox 0x10,, %Message%
|
||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,ErrorSummaryVar,DiscordErrorLogging")
|
||||
Return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
UrlDownloadToFile, %exeURL%, %UpdateExeFilepath%
|
||||
run, "%UpdateExeFilepath%" "%A_ScriptFullPath%"
|
||||
ToolTip
|
||||
; ExitApp
|
||||
}
|
||||
return
|
||||
@@ -1,12 +1,18 @@
|
||||
URLDownloadToVar(url){
|
||||
|
||||
hObject:=ComObjCreate("WinHttp.WinHttpRequest.5.1")
|
||||
hObject.Open("GET",url)
|
||||
Try, hObject.Open("GET",url)
|
||||
catch e {
|
||||
Message = Error Ocurred when trying to do GET Request using URLDownloadToVar to`n: %URL%
|
||||
SaveOrPostProgress(Message:=Message,PostType:=",ErrorLoggingTextFile,ErrorSummaryVar")
|
||||
}
|
||||
|
||||
try {
|
||||
hObject.Send()
|
||||
}
|
||||
catch e {
|
||||
Message = Error Ocurred when trying to hObject.Send() with URLDownloadToVar Function
|
||||
SaveOrPostProgress(Message:=Message,PostType:=",ErrorLoggingTextFile,ErrorSummaryVar")
|
||||
; MsgBox, 4096, Error, Failed to connect to:`n`n%url%`n`nAre you connected to the internet? Or is the website down?`n`nDisable Auto Update Check to disable this message.
|
||||
return ""
|
||||
}
|
||||
|
||||
98
WindowCredentialManager.ahk
Normal file
98
WindowCredentialManager.ahk
Normal file
@@ -0,0 +1,98 @@
|
||||
; https://www.autohotkey.com/boards/viewtopic.php?t=112391
|
||||
|
||||
; Usage:
|
||||
; cred := CredRead("CREDENTIALNAME", NewlineInPassword := 1)
|
||||
; Username := cred.username
|
||||
; Password := cred.password
|
||||
|
||||
; msgbox % cred.username
|
||||
; msgbox % cred.password
|
||||
|
||||
|
||||
; Functions
|
||||
;------------------------------------------------
|
||||
CredWrite(name, username, password)
|
||||
{
|
||||
VarSetCapacity(cred, 24 + A_PtrSize * 7, 0)
|
||||
cbPassword := StrLen(password)*2
|
||||
NumPut(1 , cred, 4+A_PtrSize*0, "UInt") ; Type = CRED_TYPE_GENERIC
|
||||
NumPut(&name , cred, 8+A_PtrSize*0, "Ptr") ; TargetName = name
|
||||
NumPut(cbPassword, cred, 16+A_PtrSize*2, "UInt") ; CredentialBlobSize
|
||||
NumPut(&password , cred, 16+A_PtrSize*3, "UInt") ; CredentialBlob
|
||||
NumPut(3 , cred, 16+A_PtrSize*4, "UInt") ; Persist = CRED_PERSIST_ENTERPRISE (roam across domain)
|
||||
NumPut(&username , cred, 24+A_PtrSize*6, "Ptr") ; UserName
|
||||
return DllCall("Advapi32.dll\CredWriteW"
|
||||
, "Ptr", &cred ; [in] PCREDENTIALW Credential
|
||||
, "UInt", 0 ; [in] DWORD Flags
|
||||
, "UInt") ; BOOL
|
||||
}
|
||||
|
||||
CredDelete(name)
|
||||
{
|
||||
return DllCall("Advapi32.dll\CredDeleteW"
|
||||
, "WStr", name ; [in] LPCWSTR TargetName
|
||||
, "UInt", 1 ; [in] DWORD Type,
|
||||
, "UInt", 0 ; [in] DWORD Flags
|
||||
, "UInt") ; BOOL
|
||||
}
|
||||
|
||||
CredRead(name,NewlineInUsername:=0, NewlineInPassword:=0)
|
||||
{
|
||||
DllCall("Advapi32.dll\CredReadW"
|
||||
, "Str", name ; [in] LPCWSTR TargetName
|
||||
, "UInt", 1 ; [in] DWORD Type = CRED_TYPE_GENERIC (https://learn.microsoft.com/en-us/windows/win32/api/wincred/ns-wincred-credentiala)
|
||||
, "UInt", 0 ; [in] DWORD Flags
|
||||
, "Ptr*", pCred ; [out] PCREDENTIALW *Credential
|
||||
, "UInt") ; BOOL
|
||||
if !pCred{
|
||||
; Username
|
||||
InputBox, Username, Input Username, Username not found. `nPlease Input Username for: `n--%name%--,,,,,,,,%Clipboard% ; , Prompt, HIDE, Width, Height, X, Y, Font, Timeout, Default]
|
||||
if(ErrorLevel)
|
||||
return
|
||||
|
||||
InputBox, Password, Input Password, Password not found. `nPlease Input Password for: `n--%name%--,,,,,,,,%Clipboard% ; , Prompt, HIDE, Width, Height, X, Y, Font, Timeout, Default]
|
||||
if(ErrorLevel)
|
||||
return
|
||||
|
||||
if !CredWrite(name, Username, Password)
|
||||
MsgBox failed to write cred
|
||||
else, { ; try reading the credential that was just saved
|
||||
DllCall("Advapi32.dll\CredReadW"
|
||||
, "Str", name ; [in] LPCWSTR TargetName
|
||||
, "UInt", 1 ; [in] DWORD Type = CRED_TYPE_GENERIC (https://learn.microsoft.com/en-us/windows/win32/api/wincred/ns-wincred-credentiala)
|
||||
, "UInt", 0 ; [in] DWORD Flags
|
||||
, "Ptr*", pCred ; [out] PCREDENTIALW *Credential
|
||||
, "UInt") ; BOOL
|
||||
}
|
||||
if !pCred{
|
||||
msgbox, Failed to read cred. after writing it to Credential Manager.
|
||||
return
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
name := StrGet(NumGet(pCred + 8 + A_PtrSize * 0, "UPtr"), 256, "UTF-16")
|
||||
|
||||
; append new line to end if requested
|
||||
if(NewlineInUsername)
|
||||
username := StrGet(NumGet(pCred + 24 + A_PtrSize * 6, "UPtr"), 256, "UTF-16") . "`n"
|
||||
else,
|
||||
username := StrGet(NumGet(pCred + 24 + A_PtrSize * 6, "UPtr"), 256, "UTF-16")
|
||||
|
||||
len := NumGet(pCred + 16 + A_PtrSize * 2, "UInt")
|
||||
|
||||
; append new line to end if requested
|
||||
if(NewlineInPassword)
|
||||
password := StrGet(NumGet(pCred + 16 + A_PtrSize * 3, "UPtr"), len/2, "UTF-16") . "`n"
|
||||
else,
|
||||
password := StrGet(NumGet(pCred + 16 + A_PtrSize * 3, "UPtr"), len/2, "UTF-16")
|
||||
|
||||
|
||||
DllCall("Advapi32.dll\CredFree", "Ptr", pCred)
|
||||
return {"name": name, "username": username, "password": password}
|
||||
}
|
||||
|
||||
|
||||
; Misc
|
||||
;------------------------------------------------
|
||||
; Escape::ExitApp
|
||||
Reference in New Issue
Block a user