Updated source to v1.4.4

Check changelog.

Author: eh-K

source-latest.bat

@@ -1,5 +1,5 @@
 @Echo Off
-set version=RandomFilePicker - v1.4.3
+set version=RandomFilePicker - v1.4.4
 Title %version%
 
 
@@ -8,28 +8,27 @@ Title %version%
 	::CAN MANUALLY SET DIRECTORY HERE- Comment the other and vice versa
 
 	::Option 1 - Viewing away from directory.
-	::Set directory="C:\Users\Echox\OneDrive\Pictures\All_Wallpapers"
+		::Set directory="C:\Users\Echox\OneDrive\Pictures\All_Wallpapers"
 
 	::Option 2 - Viewing within same folder/subfolders.
-	mkdir "%~dp0" > NUL 2>&1
+		mkdir "%~dp0" > NUL 2>&1
 
 	::KEY BINDS - The script can recognize if you type part of a word so caution with mistyping.
-	set bind_delete=d del delete
-	set bind_review=v review
-	set bind_reload=r reload
-	set bind_randomizer=
+		set bind_delete=d del delete
+		set bind_open=v review
+		set bind_reload=r reload
 
 	::Toggles question on what Search Mode you want set. Default = 0-disabled, 1-enabled.
-	set manual_mode=0
+		set manual_mode=0
 
 	::SET YOUR PREFERRED COLOR - List is on the documentation file on home page.
-	set color_code=3
+		set color_code=3
 
 	::Determines how many times you want the Randomizer to shuffle. Default = 250
-	Set timeout_max=250
+		Set timeout_max=250
 
 	::SET YOUR SEARCH CRITERIA
-	set search_mode=1
+		set search_mode=2
 	::1 = Images
 	::2 = Videos
 	::3 = Music
@@ -38,21 +37,23 @@ Title %version%
 
 	::FILTER - Add any file extensions you may find useful.
 	::Image file types
-	set file_image=.png .jpg .jpeg .webp .gif .bmp .tiff
+		set file_image=.png .jpg .jpeg .webp .gif .bmp .tiff
 	::Video file types
-	set file_video=.mp4 .mkv .mov .webm .avi .wmv .mpeg
+		set file_video=.mp4 .mkv .mov .webm .avi .wmv .mpeg
 	::Music file types
-	set file_music=.mp3 .m4a .wav .wma .flac .aac .ogg
-	::Allowed file types or keywords. CASE SENSITIVE
-	set allowed_filter=
+		set file_music=.mp3 .m4a .wav .wma .flac .aac .ogg
+	::Allowed file types or keywords.
+		set allowed_filter=
 	::Blocked file types or keywords.
-	set blocked_filter=.exe
+		set blocked_filter=.exe
 
 ::####  END OF CONFIG  ####
 
 
 
 ::####  START OF SCRIPT  ####
+
+::file_all prevents folders from being opened as a result. Directory is forced to contain a '.'
 set file_all=.
 set file_media=%file_image% %file_video% %file_music%
 Color %color_code%
@@ -68,10 +69,13 @@ Echo %manual_mode% | findstr "1" >nul && (goto ManualQuestion) || (goto Start)
 
 ::Step 1
 :Start
+if %search_mode% LSS 1 (goto Error-IncorrectNum)
+if %search_mode% GTR 5 (goto Error-IncorrectNum)
+
 Echo %manual_mode% | findstr "1" >nul && (CLS)
 Color %color_code%
 Echo.
-Echo (Step 1/3) - Directory set, checking... Please wait a moment.
+Echo (Step 1/3) - Directory set, creating index... Please wait a moment.
 Set count=0
 Set timeout=0
 For /f %%f in ('dir "%directory%" /b /s') do set /a count+=1
@@ -81,16 +85,23 @@ For /f %%f in ('dir "%directory%" /b /s') do set /a count+=1
 Color %color_code%
 CLS
 Echo.
+Echo Pool Total: %count%
+Echo.
 Echo (Step 2/3) - Randomizer searching... Please wait a moment.
 Echo %timeout% | findstr %timeout_max% >nul && (goto Error-TimedOut) || (Echo Attempt %timeout%/%timeout_max% till Timeout...)
+Echo.
+Echo %search_mode% | findstr "1" >nul && (Echo     File Type: Images & set opp_filter=%file_video% %file_music%)
+Echo %search_mode% | findstr "2" >nul && (Echo     File Type: Videos & set opp_filter=%file_image% %file_music%)
+Echo %search_mode% | findstr "3" >nul && (Echo     File Type: Music & set opp_filter=%file_image% %file_video%)
+Echo %search_mode% | findstr "4" >nul && (Echo     File Type: Images, Videos, Music)
+Echo %search_mode% | findstr "5" >nul && (Echo     File Type: Any, literally anything.)
+Echo Allowed Words: %allowed_filter%
+Echo Blocked Words: %blocked_filter%
 ::timeout 1 >nul
 Set /a timeout+=1
 Set /a randN=%random% %% %count% +1
-Set listN=0
 For /f "tokens=1* delims=:" %%I in ('dir "%directory%" /b /s^| findstr /n /r . ^| findstr /b "%randN%"') do set filename=%%J
 
-if %search_mode% LSS 1 (goto Error-IncorrectNum)
-if %search_mode% GTR 5 (goto Error-IncorrectNum)
 Echo %search_mode% | findstr "%search_mode%" >nul && (goto Search_Mode%search_mode%) || (goto Error-IncorrectNum)
 
 :Search_Mode1
@@ -107,10 +118,13 @@ goto Review
 
 ::Step 3
 :Review
-Echo %filename% | findstr /v "%allowed_filter%" >nul && (goto Randomizer)
-Echo %filename% | find /v "%file_all%" >nul && (goto Randomizer)
-Echo %filename% | findstr /i "%blocked_filter%" >nul && (goto Error-InvalidFile)
+Echo %filename% | findstr /i "%blocked_filter%" >nul && (goto Randomizer)
+Echo %filename% | findstr /i "%opp_filter%" >nul && (goto Randomizer)
+Echo %filename% | findstr /i "%allowed_filter%" >nul && (goto Present) || (goto Randomizer)
+Echo %filename% | find /v "%file_all%" >nul && (goto Present) || (goto Randomizer)
 ::For /f %%A in ("%filename%") do set filesize=%%~zA
+
+:Present
 CLS
 Start "" "%filename%"
 Echo (Step 3/3) - File selected and presented.
@@ -122,22 +136,25 @@ Echo Location: %filename%
 Echo.
 
 ::Choices
+Echo.
+Echo - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+Echo.
 Echo How do you want to continue? Deletion is FINAL and PERMANENT.
 Echo.
 Echo OPTIONS:
 Echo.
-Echo %bind_randomizer% = Reroll for new file.
+Echo ENTER KEY = Reroll for new file.
 Echo %bind_delete% = Permanently delete.
 Echo %bind_reload% = Update directory if you added new files.
-Echo %bind_review% = Open file again.
+Echo %bind_open% = Open file again.
 Echo.
 Set timeout=0
 Set choice=
 Set /p choice= Choice:
 Echo %bind_randomizer% | find /i "%choice%" >nul && goto Randomizer
 Echo %bind_delete% | find /i "%choice%" >nul && goto Deletion
 Echo %bind_reload% | find /i "%choice%" >nul && goto Start
-Echo %bind_review% | find /i "%choice%" >nul && goto Review
+Echo %bind_open% | find /i "%choice%" >nul && goto Open
 goto Randomizer
 
 :Deletion
@@ -173,6 +190,8 @@ Set search_mode=%choice%
 Goto Start
 
 
+
+
 ::####  Error Codes  ####
 
 :Error-IncorrectNum
@@ -181,7 +200,8 @@ Color C
 Echo ###  ERROR  ###
 Echo    Code: 400
 Echo.
-Echo Search Criteria is not Mode 1-5. CHECK CONFIG.
+Echo Search Mode is not Mode 1-5. CHECK CONFIG.
+Echo Current: %search_mode%
 Echo.
 Echo Program will close upon continuing
 Pause
@@ -199,18 +219,3 @@ Echo.
 Echo Program will close upon continuing
 Pause
 exit
-
-:Error-InvalidFile
-CLS
-Color C
-Echo ###  ERROR  ###
-Echo    Code: 403
-Echo.
-Echo Location: %filename%
-Echo.
-Echo File is an invalid type. 
-Echo Check config for invalid file types.
-Echo.
-Echo Program will close upon continuing
-Pause
-exit