Compare commits
5 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| c4b2eeea8e | |||
| 723dec3fac | |||
| c60a45445c | |||
| fa43716ebe | |||
| ef3cb41e9c |
@@ -46,6 +46,7 @@ UStartTime := A_TickCount ; start time
|
|||||||
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\StdOutToVar.ahk
|
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\StdOutToVar.ahk
|
||||||
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\Zip.ahk
|
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\Zip.ahk
|
||||||
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\URLDownloadToVar.ahk
|
#include %A_ScriptDir%\Lib\Freedomain-Posters-Shared-Functions\URLDownloadToVar.ahk
|
||||||
|
#Include %A_ScriptDir%\Modules\Miscellaneous-Functions.ahk ; Misc functions for video uploading specifically
|
||||||
|
|
||||||
|
|
||||||
;---Global Variables---
|
;---Global Variables---
|
||||||
@@ -80,7 +81,6 @@ global ErrorLoggingFilePath
|
|||||||
global ErrorLogVar
|
global ErrorLogVar
|
||||||
ErrorLogVar :=
|
ErrorLogVar :=
|
||||||
|
|
||||||
global ReuseTabs ; reuse tabs variable
|
|
||||||
global DevMode
|
global DevMode
|
||||||
|
|
||||||
global LBRYNetFilepath
|
global LBRYNetFilepath
|
||||||
@@ -140,7 +140,6 @@ IniRead, MouseClicksSaved, %SettingsIniFilepath%, General, MouseClicksSaved, 0
|
|||||||
IniRead, ShowTooltipProgress, %SettingsIniFilepath%, General, ShowTooltipProgress, 1
|
IniRead, ShowTooltipProgress, %SettingsIniFilepath%, General, ShowTooltipProgress, 1
|
||||||
(ShowTooltipProgress)?(ShowTooltipProgressCheckStatus := 1) : (ShowTooltipProgressCheckStatus := 0)
|
(ShowTooltipProgress)?(ShowTooltipProgressCheckStatus := 1) : (ShowTooltipProgressCheckStatus := 0)
|
||||||
|
|
||||||
ReuseTabs := 1 ; ReuseTabs is permanantly on. There is never a time where you want to create new tabs for every website
|
|
||||||
|
|
||||||
IniRead, AutoUpdateCheck, %SettingsIniFilepath%, General, AutoUpdateCheck, 1
|
IniRead, AutoUpdateCheck, %SettingsIniFilepath%, General, AutoUpdateCheck, 1
|
||||||
(AutoUpdateCheck)?(AutoUpdateCheckCheckStatus := 1) : (AutoUpdateCheckCheckStatus := 0)
|
(AutoUpdateCheck)?(AutoUpdateCheckCheckStatus := 1) : (AutoUpdateCheckCheckStatus := 0)
|
||||||
@@ -378,6 +377,7 @@ if(FileExist(VideoLinksIniFile)){
|
|||||||
IniRead, PodcastNumber, %VideoLinksIniFile%, Misc, PodcastNumber, %A_Space%
|
IniRead, PodcastNumber, %VideoLinksIniFile%, Misc, PodcastNumber, %A_Space%
|
||||||
IniRead, LocalsURL, %VideoLinksIniFile%, URLs, LocalsURL, %A_Space%
|
IniRead, LocalsURL, %VideoLinksIniFile%, URLs, LocalsURL, %A_Space%
|
||||||
IniRead, PodcastTranscriptURL, %VideoLinksIniFile%, URLs, PodcastTranscriptURL, %A_Space%
|
IniRead, PodcastTranscriptURL, %VideoLinksIniFile%, URLs, PodcastTranscriptURL, %A_Space%
|
||||||
|
IniRead, UnauthorizedTVURL, %VideoLinksIniFile%, URLs, UnauthorizedTVURL, %A_Space%
|
||||||
|
|
||||||
|
|
||||||
; MISC
|
; MISC
|
||||||
@@ -742,7 +742,6 @@ if(VideoDescription != OriginalVideoDescription){
|
|||||||
; -------------------------------/Save Video Info-------------------------------
|
; -------------------------------/Save Video Info-------------------------------
|
||||||
|
|
||||||
; Save settings to config file
|
; Save settings to config file
|
||||||
IniWrite, %ReuseTabs%, %SettingsIniFilepath%, General, ReuseTabs
|
|
||||||
IniWrite, %ShowTooltipProgress%, %SettingsIniFilepath%, General, ShowTooltipProgress
|
IniWrite, %ShowTooltipProgress%, %SettingsIniFilepath%, General, ShowTooltipProgress
|
||||||
IniWrite, %AutoUpdateCheck%, %SettingsIniFilepath%, General, AutoUpdateCheck
|
IniWrite, %AutoUpdateCheck%, %SettingsIniFilepath%, General, AutoUpdateCheck
|
||||||
IniWrite, %AutoLogin%, %SettingsIniFilepath%, General, AutoLogin
|
IniWrite, %AutoLogin%, %SettingsIniFilepath%, General, AutoLogin
|
||||||
@@ -1110,6 +1109,7 @@ Return
|
|||||||
; @todo: Add thumbnail status to this
|
; @todo: Add thumbnail status to this
|
||||||
; @todo: add podcast tags to this
|
; @todo: add podcast tags to this
|
||||||
UpdateINI:
|
UpdateINI:
|
||||||
|
IniWrite, %UnauthorizedTVURL%, %VideoLinksIniFile%, URLs, UnauthorizedTVURL
|
||||||
IniWrite, %PodcastTranscriptURL%, %VideoLinksIniFile%, URLs, PodcastTranscriptURL
|
IniWrite, %PodcastTranscriptURL%, %VideoLinksIniFile%, URLs, PodcastTranscriptURL
|
||||||
IniWrite, %VideoTitle%, %VideoLinksIniFile%, Misc, VideoTitle
|
IniWrite, %VideoTitle%, %VideoLinksIniFile%, Misc, VideoTitle
|
||||||
IniWrite, %LocalsURL%, %VideoLinksIniFile%, URLs, LocalsURL
|
IniWrite, %LocalsURL%, %VideoLinksIniFile%, URLs, LocalsURL
|
||||||
@@ -1204,6 +1204,3 @@ Return
|
|||||||
;------------------------------------------------
|
;------------------------------------------------
|
||||||
#Include %A_ScriptDir%\Modules\Podcast-Upload.ahk
|
#Include %A_ScriptDir%\Modules\Podcast-Upload.ahk
|
||||||
|
|
||||||
; Miscellaneous-Functions
|
|
||||||
;------------------------------------------------
|
|
||||||
#Include %A_ScriptDir%\Modules\Miscellaneous-Functions.ahk
|
|
||||||
|
|||||||
Submodule Lib/Freedomain-Posters-Shared-Functions updated: e32fe026e9...f625e782eb
@@ -325,4 +325,32 @@ Gui, Show,, %FullScriptName% - Upload Settings - %BodyTextFilePath%
|
|||||||
ControlFocus, Edit4, %FullScriptName%
|
ControlFocus, Edit4, %FullScriptName%
|
||||||
ToolTip
|
ToolTip
|
||||||
|
|
||||||
|
|
||||||
|
; calculate run time and convert to seconds
|
||||||
|
URunTime1 := round(((A_TickCount - UStartTime) / 1000), 2)
|
||||||
|
|
||||||
|
;---Check for Updates---
|
||||||
|
;------------------------------------------------
|
||||||
|
if(AutoUpdateCheck AND !UpdateAvailable){
|
||||||
|
Message = Checking for Updates
|
||||||
|
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile,DiscordErrorLogging")
|
||||||
|
|
||||||
|
if(CheckForUpdates(GitReleasesAPIURL))
|
||||||
|
GuiControl,,UpdateAvailable, Uploader Update Available!
|
||||||
|
|
||||||
|
if(CheckForChromeUpdates(ChromeFilepath)){
|
||||||
|
GuiControl,,ChromeUpdateAvailable, Chrome Update Available!
|
||||||
|
ChromeUpdateAvailable := 1
|
||||||
|
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
; calculate run time and convert to seconds
|
||||||
|
URunTime2 := round(((A_TickCount - UStartTime) / 1000), 2)
|
||||||
|
|
||||||
|
Return
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
Return
|
Return
|
||||||
@@ -40,6 +40,11 @@ Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths%, Locals
|
|||||||
Gui, Font, Normal
|
Gui, Font, Normal
|
||||||
Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vLocalsURL w%ResultEditBoxWidths% gUpdateVars, %LocalsURL%
|
Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vLocalsURL w%ResultEditBoxWidths% gUpdateVars, %LocalsURL%
|
||||||
|
|
||||||
|
Gui, Font, Bold
|
||||||
|
Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths%, Unauthorized
|
||||||
|
Gui, Font, Normal
|
||||||
|
Gui, Add, Edit, x+5 yp+0 h%ButtonHeights% vUnauthorizedTVURL w%ResultEditBoxWidths% gUpdateVars, %UnauthorizedTVURL%
|
||||||
|
|
||||||
Gui, Font, Bold
|
Gui, Font, Bold
|
||||||
Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoTags vVideoTagsEdit, Video Tags
|
Gui, Add, Button, x10 y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoTags vVideoTagsEdit, Video Tags
|
||||||
Gui, Font, Normal
|
Gui, Font, Normal
|
||||||
@@ -59,7 +64,7 @@ Gui, Font, s%GuiFontSize%
|
|||||||
Gui, Font, Bold
|
Gui, Font, Bold
|
||||||
|
|
||||||
Gui, Add, Button, x%ResultEditBoxXPos% w%ResultEditBoxHalfWidths% gUpdateINI, Save Modified Links
|
Gui, Add, Button, x%ResultEditBoxXPos% w%ResultEditBoxHalfWidths% gUpdateINI, Save Modified Links
|
||||||
Gui, Add, Button, x+%MarginSpace% w%ResultEditBoxHalfWidths% gUploadPodcast, Upload Podcast
|
Gui, Add, Button, x+%MarginSpace% w%ResultEditBoxHalfWidths% gUploadPodcast vUploadPodcast, Upload Podcast
|
||||||
|
|
||||||
Gui, Add, Button, x%ResultEditBoxXPos% y+%MarginSpace% w%ResultEditBoxThirdsWidths% gPostToDiscord vPostToDiscordButton, Post to Discord
|
Gui, Add, Button, x%ResultEditBoxXPos% y+%MarginSpace% w%ResultEditBoxThirdsWidths% gPostToDiscord vPostToDiscordButton, Post to Discord
|
||||||
Gui, Add, Button, x+5 w%ResultEditBoxThirdsWidths% gPostToTelegram vPostToTelegramButton, Post to Telegram
|
Gui, Add, Button, x+5 w%ResultEditBoxThirdsWidths% gPostToTelegram vPostToTelegramButton, Post to Telegram
|
||||||
|
|||||||
@@ -216,6 +216,9 @@ Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength
|
|||||||
Xpath = //input[@id='url-rumble']
|
Xpath = //input[@id='url-rumble']
|
||||||
Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=RumbleURL)
|
Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=RumbleURL)
|
||||||
|
|
||||||
|
; Input Rumble URL
|
||||||
|
Xpath = //input[@id='url-unauthorizedtv']
|
||||||
|
Status := Selenium_LoopToSendValueToXpath(Xpath:=Xpath,NumOfLoops:=2,SleepLength:=1000,StringTextContent:=UnauthorizedTVURL)
|
||||||
|
|
||||||
; Soundcloud but actually LBRY Audio URL
|
; Soundcloud but actually LBRY Audio URL
|
||||||
Xpath = //input[@id='url-lbry-audio']
|
Xpath = //input[@id='url-lbry-audio']
|
||||||
@@ -325,6 +328,9 @@ Sublime Indentation Reset
|
|||||||
Message = Input Complete! `nPlease Confirm and click Final "Save" Button on Podcast Page
|
Message = Input Complete! `nPlease Confirm and click Final "Save" Button on Podcast Page
|
||||||
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
|
SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
|
||||||
|
|
||||||
|
; Change GUI button from "Upload Podcast"
|
||||||
|
GuiControl,,UploadPodcast, Podcast Uploaded
|
||||||
|
|
||||||
sleep, 5000
|
sleep, 5000
|
||||||
|
|
||||||
CurrentSite :=
|
CurrentSite :=
|
||||||
|
|||||||
@@ -63,9 +63,10 @@ VideoLinks .= "[Rumble](" . RumbleURL . ") \| "
|
|||||||
if(DailyMotionURL != "")
|
if(DailyMotionURL != "")
|
||||||
VideoLinks .= "[DailyMotion](" . DailyMotionURL . ") \| "
|
VideoLinks .= "[DailyMotion](" . DailyMotionURL . ") \| "
|
||||||
|
|
||||||
if(PodcastTranscriptURL != "")
|
/*if(PodcastTranscriptURL != "")
|
||||||
VideoLinks .= "[Video Transcript](" . PodcastTranscriptURL . ") \| "
|
VideoLinks .= "[Video Transcript](" . PodcastTranscriptURL . ") \| "
|
||||||
|
|
||||||
|
*/
|
||||||
if(PodcastNumber != "")
|
if(PodcastNumber != "")
|
||||||
VideoLinks .= "[FDRPodcasts](" . "https://fdrpodcasts.com/" . PodcastNumber . ") \| "
|
VideoLinks .= "[FDRPodcasts](" . "https://fdrpodcasts.com/" . PodcastNumber . ") \| "
|
||||||
|
|
||||||
|
|||||||
@@ -1,3 +1,3 @@
|
|||||||
[Video-Uploader]
|
[Video-Uploader]
|
||||||
Version=3.34
|
Version=3.36
|
||||||
Name=Freedomain Video Uploader
|
Name=Freedomain Video Uploader
|
||||||
|
|||||||
Reference in New Issue
Block a user