code cleanup

2024-06-25 00:37:48 -04:00
parent ee21a03d55
commit 76d410e4d3
3 changed files with 36 additions and 93 deletions
--- a/Uploader.ahk
+++ b/Uploader.ahk
@@ -847,10 +847,9 @@ if(OdyseeAudio){
 if(LocalsGrabURL){
 	Gosub, LocalsGrabURL
 }
+
 ; // Upload to Sites
 ; ------------------------------------------------
-
-
 if(URLOfLastErrorPage){
 	Message = Activating Tab of last failed post.
 	SaveOrPostProgress(Message:=Message,PostType:="Tooltip")
@@ -1015,88 +1014,30 @@ if(!SocialMediaPosterFilepath or !FileExist(SocialMediaPosterFilepath)){

 ; Copy Info from GUI to Clipboard
 ; ------------------------------------------------
-; @todo: this can be converted into 1 gosub, with if/else statements based on the button clicked
+CopyToClipboard:
+
+Message = Copying %A_GuiControl% to Clipboard
+SaveOrPostProgress(Message:=Message,PostType:="Tooltip")
+
+(A_GuiControl = "Transcript URL")?(Clipboard := PodcastTranscriptURL):()
+(A_GuiControl = "Bitchute")?(Clipboard := BitChuteURL):()
+(A_GuiControl = "Brighteon")?(Clipboard := BrighteonURL):()
+(A_GuiControl = "DailyMotion")?(Clipboard := DailyMotionURL):()
+(A_GuiControl = "Odysee Video")?(Clipboard := OdyseeVideoURL):()
+(A_GuiControl = "Odysee Audio")?(Clipboard := OdyseeAudioURL):()
+(A_GuiControl = "Rumble")?(Clipboard := RumbleURL):()
+(A_GuiControl = "Locals")?(Clipboard := LocalsURL):()
+(A_GuiControl = "Unauthorized")?(Clipboard := UnauthorizedTVURL):()
+(A_GuiControl = "Video Tags")?(Clipboard := VideoTags):()
+(A_GuiControl = "Podcast Tags")?(Clipboard := PodcastTags):()
+(A_GuiControl = "Description")?(Clipboard := VideoDescription):()
+(A_GuiControl = "Summary")?(Clipboard := VideoSummary):()

-CopyPodcastTranscriptURL: 
-Clipboard := PodcastTranscriptURL
-Message := PodcastTranscriptURL . "`nCopied to Clipboard"
-SaveOrPostProgress(Message:=Message,PostType:="Tooltip,ErrorLoggingTextFile")
 sleep, 1000
 ToolTip
 Return


-CopyVideoTitle:
-Clipboard := VideoTitle
-SaveOrPostProgress(Message:=VideoTitle "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyBitChuteURL:
-Clipboard := BitChuteURL
-SaveOrPostProgress(Message:=BitChuteURL "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyBrighteonURL:
-Clipboard := BrighteonURL
-SaveOrPostProgress(Message:=BrighteonURL "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyDailyMotionURL:
-Clipboard := DailyMotionURL
-SaveOrPostProgress(Message:=DailyMotionURL "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyOdyseeVideoURL:
-Clipboard := OdyseeVideoURL
-SaveOrPostProgress(Message:=OdyseeVideoURL "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyOdyseeAudioURL:
-Clipboard := OdyseeAudioURL
-SaveOrPostProgress(Message:=OdyseeAudioURL "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyRumbleURL:
-Clipboard := RumbleURL
-SaveOrPostProgress(Message:=RumbleURL "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-
-CopyVideoTags:
-Clipboard := VideoTags
-SaveOrPostProgress(Message:=VideoTags "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyPodcastTags:
-Clipboard := PodcastTags
-SaveOrPostProgress(Message:=PodcastTags "`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
-CopyVideoDescription:
-Clipboard := VideoDescription
-SaveOrPostProgress(Message:="Video Description`nCopied to Clipboard",PostType:="Tooltip,ErrorLoggingTextFile")
-sleep, 1000
-ToolTip
-Return
-
 ; @todo: Add thumbnail status to this
 ; @todo: add podcast tags to this
 UpdateINI:
--- a/Modules/GUI-Main-Window.ahk
+++ b/Modules/GUI-Main-Window.ahk
@@ -364,67 +364,67 @@ Gosub, SetGUIVariables

 Gui, Font, s%GuiFontSize%
 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyPodcastTranscriptURL,Transcript URL
+Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard,Transcript URL
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% w%ResultEditBoxWidth% gUpdateVars vPodcastTranscriptURL, %PodcastTranscriptURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyBitChuteURL, Bitchute
+Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Bitchute
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vBitChuteURL w%ResultEditBoxWidth% gUpdateVars , %BitChuteURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyBrighteonURL, Brighteon
+Gui, Add, Button, x%MarginSize% y+%MarginSize% h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Brighteon
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vBrighteonURL w%ResultEditBoxWidth% gUpdateVars , %BrighteonURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyDailyMotionURL, DailyMotion
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, DailyMotion
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vDailyMotionURL w%ResultEditBoxWidth% gUpdateVars , %DailyMotionURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyOdyseeVideoURL, Odysee Video
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Odysee Video
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vOdyseeVideoURL w%ResultEditBoxWidth% gUpdateVars, %OdyseeVideoURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyOdyseeAudioURL, Odysee Audio
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Odysee Audio
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vOdyseeAudioURL w%ResultEditBoxWidth% gUpdateVars , %OdyseeAudioURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyRumbleURL, Rumble
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Rumble
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vRumbleURL w%ResultEditBoxWidth% gUpdateVars , %RumbleURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths%, Locals
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Locals
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vLocalsURL w%ResultEditBoxWidth% gUpdateVars, %LocalsURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths%, Unauthorized
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Unauthorized
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vUnauthorizedTVURL w%ResultEditBoxWidth% gUpdateVars, %UnauthorizedTVURL%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoTags vVideoTagsEdit, Video Tags
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Video Tags
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vVideoTags w%ResultEditBoxWidth% gUpdateVars , %VideoTags%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyPodcastTags, Podcast Tags
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Podcast Tags
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0  h%ButtonHeights% vPodcasttags w%ResultEditBoxWidth% gUpdateVars , %Podcasttags%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoDescription, Description
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Description
 Gui, Font, Normal
 Gui, Add, Edit, x+%MarginSize% yp+0 h%ButtonHeights% vVideoDescription w%ResultEditBoxWidth% gUpdateVars , %VideoDescription%

 Gui, Font, Bold
-Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyVideoDescription, Summary
+Gui, Add, Button, x%MarginSize% y+10 h%ButtonHeights% w%CopyButtonWidths% gCopyToClipboard, Summary
 Gui, Font, Normal

 Gui, Font, Normal
--- a/README.md
+++ b/README.md
@@ -12,8 +12,8 @@
 | Brighteon | Video Upload w/Selenium |
 | Odysee | Video + Audio Upload w/LBRY API |
 | FDRPodcasts | Podcast w/Selenium |
-| Discord | Video Announcement w/API | 
-| Telegram | Video Announcement w/API |
+| Discord | Announcement w/API | 
+| Telegram | Announcement w/API |

 ## Other Features
 - Install Uploader Updates from Gitea automatically
@@ -21,6 +21,8 @@
 - Schedule Posts for a later date & time
 - Log Errors to a Discord Channel using webhook
 - Discord Ping on Upload Completion
+- Setting to confirm an upload before it's published
+- Setting to show Tooltip progress at top of the screen showing current action being executed

 # Installation
 1.  Install .Net Framework 3.5