Refactored: Setup

Author: Heck-R

components/setup.ahk

@@ -8,14 +8,12 @@ return
 
 SetupClipLog:
 
-	gosub SetupClipLogDirectories
-
 	gosub SetupClipLogFinalValues
 
-	gosub SetupClipLogMessages
-
 	gosub SetupClipLogGlobalVariables
 
+	gosub SetupClipLogDirectories
+
 	gosub SetupClipLogFileLists
 
 	gosub SetupClipLogInit
@@ -27,23 +25,6 @@ return
 
 SetupClipLogDirectories:
 
-    gosub SetupClipLogDirectoriesPaths
-
-    gosub SetupClipLogDirectoriesCreateMissingOnes
-	
-return
-
-SetupClipLogDirectoriesPaths:
-
-	mainDir=%A_ScriptDir%\log\
-	logDir=%mainDir%%A_ComputerName%\
-	clipLogDir=%logDir%clipLogDir\
-	quickClipLogDir=%logDir%quickClipLogDir\
-
-return
-
-SetupClipLogDirectoriesCreateMissingOnes:
-
 	if !FileExist(mainDir)
 		FileCreateDir %mainDir%
 	if !FileExist(logDir)
@@ -52,18 +33,26 @@ SetupClipLogDirectoriesCreateMissingOnes:
 		FileCreateDir %clipLogDir%
 	if !FileExist(quickClipLogDir)
 		FileCreateDir %quickClipLogDir%
-
+	
 return
 
 ;------------------------------------------------
 
 SetupClipLogFinalValues:
 
-	clipTextExt := "clog"
-	clipPicExt := "plog"
-	clipBinExt := "blog"
-	clipErrorExt := "elog"
+	; Directory paths
+	mainDir=%A_ScriptDir%\log\					;Main directory for logging
+	logDir=%mainDir%%A_ComputerName%\			;Computer specific directory for logging (for compatibility with cloud file sync)
+	clipLogDir=%logDir%clipLogDir\				;Standard clip log directory
+	quickClipLogDir=%logDir%quickClipLogDir\	;Quick clip logging directory 
+
+	; Clip types
+	clipTextExt := "clog"	;Text
+	clipPicExt := "plog"	;Picture/Image/Bitmap
+	clipBinExt := "blog"	;Binary
+	clipErrorExt := "elog"	;Error
 
+	; Clip modes
 	clipModeNone := "none"
 	clipModePreview := "preview"
 	clipModePaste := "paste"
@@ -72,19 +61,16 @@ SetupClipLogFinalValues:
 
 	clipModePaused := "paused"
 
+	; Formats
 	fileTimeFormat := "yyyy-MM-dd_HH-mm-ss"
 
+	; Times / boundaries
 	minwaitForClipboard := 50
 	sleepTimeBeforeSaveClip := 100
 	divisionalForClipboardWait := 20000
     maxClipFileNum := 1000
 
-return
-
-;------------------------------------------------
-
-SetupClipLogMessages:
-
+	; Messages
     errorCantReadClipFile := "Can't read the file for some reason`nIn order to avoid further problems the file gets deleted and the script restarts"
 	errorCantSetQSlot := "Can't set quick slot"
 	errorCorruptStr := "Corrupt file"
@@ -107,33 +93,34 @@ return
 
 SetupClipLogGlobalVariables:
 
-	clipMode := clipModeNone
-	clipCursorPos := 0
-	clipType := ""
-	clipSize := 0
+	clipMode := clipModeNone	;Storing current clip mode for context sensitive hotkeys
+	clipCursorPos := 0			;Selected clip's number/position
+	clipType := ""				;Current clip type
+	clipSize := 0				;Current clip size
 
-	prevClipFile := ""
-	prevClipData := ""
-	prevClipType := ""
-	prevClipSize := 0
+	prevClipData := ""		;Previous clip data for avoiding duplications
+	prevClipType := ""		;Previous clip type for avoiding duplications
+	prevClipSize := 0		;Previous clip type for avoiding duplications
+
+	clipFiles := []							;List of standard clip log files
+	quickClipFiles := []					;List of quick clip log files
 
-	isLogging := true
-	scriptIsModifyingClipboard := false
+	isLogging := true						;Flag for enabling/disabling hotkeys
+	scriptIsModifyingClipboard := false		;Flag for making sure only one thing is trying to modify the cliboard
 
 return
 
 ;------------------------------------------------
 
 SetupClipLogFileLists:
 
-	clipFiles := []
+	;Reading clips
 	Loop, Files, %clipLogDir%*.?log
 	{
 		clipFiles.Push(A_LoopFileName)
 	}
 
-
-	quickClipFiles := []
+	; Reading quick clips
 	Loop, 10 {
 		quickClipFiles[A_Index] := false
 	}