Merge pull request #181 from julesontheroad/Beta

Beta
julesontheroad · Jul 23, 2020 · 93b8535 · 93b8535
2 parents a25ef3d + 5b3751a
commit 93b8535
Show file tree

Hide file tree

Showing 21 changed files with 346 additions and 280 deletions.
diff --git a/py/Documentation and Resources/Changelogs/NSCB_1.00.md b/py/Documentation and Resources/Changelogs/NSCB_1.00.md
@@ -1,4 +1,4 @@
-# NSC_Builder v1.00b - Changelog
+# NSC_Builder v1.00c - Changelog
 
 ![DeviceTag](https://img.shields.io/badge/Device-SWITCH-e60012.svg)  ![LanguageTag](https://img.shields.io/badge/languages-python_batch_html5_javascript-blue.svg)
 
@@ -24,14 +24,19 @@ Here's also a little readme with some DBI information:
 https://github.com/julesontheroad/NSC_BUILDER/tree/master/py/Documentation%20and%20Resources/DBI
 
 ## *Changelog*
+### 1.00c Fixes
+
+Fixes to functions in mtp_gdrive.py where the use of curses prevented some prints on filters.
+
+Fixed indentation in mtpsp and mtpxci library which derived in **"No module named 'mtpsp'"** and **"No module named 'mtxci'"** errors in the exe builds.
 
 ### 1.00b Fixes
 
 Fixed issue where on some systems some search filters wouldn't show the message asking for an input.
 
 Fixed bug introduced by 1.00 that would stop the databases update in the middle of the process.
 
-If you already setup 1.00 just override ztools by the 1.00b version. There's no changes in the config files.
+If you already setup 1.00 just override ztools by the 1.00c version. There's no changes in the config files.
 
 ### 1. Added NSCB.exe
 

diff --git a/py/Interface.bat b/py/Interface.bat
@@ -3,7 +3,7 @@
 set "prog_dir=%~dp0"
 set "bat_name=%~n0"
 set "ofile_name=%bat_name%_options.cmd"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 set "list_folder=%prog_dir%lists"
 ::-----------------------------------------------------
 ::EDIT THIS VARIABLE TO LINK OTHER OPTION FILE

diff --git a/py/NSCB.bat b/py/NSCB.bat
@@ -5,7 +5,7 @@ set "bat_name=%~n0"
 set "ofile_name=%bat_name%_options.cmd"
 set "opt_interface=Interface_options.cmd"
 set "opt_server=Server_options.cmd"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 set "list_folder=%prog_dir%lists"
 ::-----------------------------------------------------
 ::EDIT THIS VARIABLE TO LINK OTHER OPTION FILE
@@ -3014,7 +3014,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                  VERSION 1.00b (NEW)
+ECHO                                  VERSION 1.00c (NEW)
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/Server.bat b/py/Server.bat
@@ -3,7 +3,7 @@
 set "prog_dir=%~dp0"
 set "bat_name=%~n0"
 set "ofile_name=%bat_name%_options.cmd"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 set "list_folder=%prog_dir%lists"
 ::-----------------------------------------------------
 ::EDIT THIS VARIABLE TO LINK OTHER OPTION FILE

diff --git a/py/ztools/ADV.bat b/py/ztools/ADV.bat
@@ -424,7 +424,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/DriveMode.bat b/py/ztools/DriveMode.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 :MAIN
 cls
@@ -87,7 +87,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                  VERSION 1.00b (GDRIVE)
+ECHO                                  VERSION 1.00c (GDRIVE)
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/JOINER.bat b/py/ztools/JOINER.bat
@@ -278,7 +278,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/LEGACY.bat b/py/ztools/LEGACY.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 ::Check if user is dragging a folder or a file
 if "%~1"=="" goto manual
@@ -2288,7 +2288,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                  VERSION 1.00b (LEGACY)
+ECHO                                  VERSION 1.00c (LEGACY)
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/MNG.bat b/py/ztools/MNG.bat
@@ -272,7 +272,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/MtpCmxciFTLocal.bat b/py/ztools/MtpCmxciFTLocal.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 ::///////////////////////////////////////////////////
 ::///////////////////////////////////////////////////
@@ -333,7 +333,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                         A MTP MANAGER FOR DBI INSTALLER                           "
-ECHO                                  VERSION 1.00b (MTP)
+ECHO                                  VERSION 1.00c (MTP)
 ECHO -------------------------------------------------------------------------------------
 ECHO DBI by DUCKBILL: https://github.com/rashevskyv/switch/releases
 ECHO Latest DBI: https://github.com/rashevskyv/switch/releases/tag/462

diff --git a/py/ztools/MtpCxciFTLocal.bat b/py/ztools/MtpCxciFTLocal.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 REM //////////////////////////////////////////////////
 REM /////////////////////////////////////////////////
 REM START OF MANUAL MODE. INDIVIDUAL PROCESSING
@@ -264,7 +264,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                         A MTP MANAGER FOR DBI INSTALLER                           "
-ECHO                                  VERSION 1.00b (MTP)
+ECHO                                  VERSION 1.00c (MTP)
 ECHO -------------------------------------------------------------------------------------
 ECHO DBI by DUCKBILL: https://github.com/rashevskyv/switch/releases
 ECHO Latest DBI: https://github.com/rashevskyv/switch/releases/tag/462

diff --git a/py/ztools/MtpFTLocal.bat b/py/ztools/MtpFTLocal.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 :MAIN
 if exist "MTP2.txt" goto prevlist
@@ -258,7 +258,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                         A MTP MANAGER FOR DBI INSTALLER                           "
-ECHO                                  VERSION 1.00b (MTP)
+ECHO                                  VERSION 1.00c (MTP)
 ECHO -------------------------------------------------------------------------------------
 ECHO DBI by DUCKBILL: https://github.com/rashevskyv/switch/releases
 ECHO Latest DBI: https://github.com/rashevskyv/switch/releases/tag/462

diff --git a/py/ztools/MtpInstallRemote.bat b/py/ztools/MtpInstallRemote.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 :MAIN
 if exist "MTP1GD.txt" goto prevlist
@@ -81,9 +81,9 @@ setlocal enabledelayedexpansion
 echo+ >"%uinput%"
 endlocal
 if /i "%eval%"=="0" goto MAIN
-if /i "%eval%"=="1" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_cache -xarg "%prog_dir%MTP1GD.txt" )
-if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_libraries -xarg "%prog_dir%MTP1GD.txt" )
-if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_walker -xarg "%prog_dir%MTP1GD.txt" "nsp nsz" )
+if /i "%eval%"=="1" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_cache -xarg "%prog_dir%MTP1GD.txt" )
+if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_libraries -xarg "%prog_dir%MTP1GD.txt" )
+if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_walker -xarg "%prog_dir%MTP1GD.txt" "nsp nsz" )
 if /i "%eval%"=="c" ( %pycommand% "%squirrel%" -lib_call workers concurrent_cache )
 echo.
 goto checkagain
@@ -117,9 +117,9 @@ echo+ >"%uinput%"
 endlocal
 if /i "%eval%"=="0" goto MAIN
 if /i "%eval%"=="1" goto select_medium
-if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_cache -xarg "%prog_dir%MTP1GD.txt" )
-if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_libraries -xarg "%prog_dir%MTP1GD.txt" )
-if /i "%eval%"=="4" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_walker -xarg "%prog_dir%MTP1GD.txt" "nsp nsz" )
+if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_cache -xarg "%prog_dir%MTP1GD.txt" )
+if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_libraries -xarg "%prog_dir%MTP1GD.txt" )
+if /i "%eval%"=="4" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_walker -xarg "%prog_dir%MTP1GD.txt" "nsp nsz" )
 if /i "%eval%"=="c" ( %pycommand% "%squirrel%" -lib_call workers concurrent_cache )
 if /i "%eval%"=="e" goto salida
 if /i "%eval%"=="i" goto showlist
@@ -260,7 +260,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                         A MTP MANAGER FOR DBI INSTALLER                           "
-ECHO                                  VERSION 1.00b (MTP)
+ECHO                                  VERSION 1.00c (MTP)
 ECHO -------------------------------------------------------------------------------------
 ECHO DBI by DUCKBILL: https://github.com/rashevskyv/switch/releases
 ECHO Latest DBI: https://github.com/rashevskyv/switch/releases/tag/462

diff --git a/py/ztools/MtpMode.bat b/py/ztools/MtpMode.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 :MAIN
 cls
@@ -699,7 +699,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                         A MTP MANAGER FOR DBI INSTALLER                           "
-ECHO                                  VERSION 1.00b (MTP)
+ECHO                                  VERSION 1.00c (MTP)
 ECHO -------------------------------------------------------------------------------------
 ECHO DBI by DUCKBILL: https://github.com/rashevskyv/switch/releases
 ECHO Latest DBI: https://github.com/rashevskyv/switch/releases/tag/462

diff --git a/py/ztools/MtpTransferRemote.bat b/py/ztools/MtpTransferRemote.bat
@@ -2,7 +2,7 @@
 :TOP_INIT
 CD /d "%prog_dir%"
 set "bat_name=%~n0"
-Title NSC_Builder v1.00b -- Profile: %ofile_name% -- by JulesOnTheRoad
+Title NSC_Builder v1.00c -- Profile: %ofile_name% -- by JulesOnTheRoad
 
 :MAIN
 if exist "MTP2GD.txt" goto prevlist
@@ -81,9 +81,9 @@ setlocal enabledelayedexpansion
 echo+ >"%uinput%"
 endlocal
 if /i "%eval%"=="0" goto MAIN
-if /i "%eval%"=="1" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_cache -xarg "%prog_dir%MTP2GD.txt" )
-if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_libraries -xarg "%prog_dir%MTP2GD.txt" )
-if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_walker -xarg "%prog_dir%MTP2GD.txt" )
+if /i "%eval%"=="1" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_cache -xarg "%prog_dir%MTP2GD.txt" )
+if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_libraries -xarg "%prog_dir%MTP2GD.txt" )
+if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_walker -xarg "%prog_dir%MTP2GD.txt" )
 if /i "%eval%"=="c" ( %pycommand% "%squirrel%" -lib_call workers concurrent_cache )
 echo.
 goto checkagain
@@ -117,9 +117,9 @@ echo+ >"%uinput%"
 endlocal
 if /i "%eval%"=="0" goto MAIN
 if /i "%eval%"=="1" goto START_TRANSFER
-if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_cache -xarg "%prog_dir%MTP2GD.txt" )
-if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_libraries -xarg "%prog_dir%MTP2GD.txt" )
-if /i "%eval%"=="4" ( %pycommand% "%squirrel%" -lib_call mtp.mtp_gdrive select_from_walker -xarg "%prog_dir%MTP2GD.txt" )
+if /i "%eval%"=="2" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_cache -xarg "%prog_dir%MTP2GD.txt" )
+if /i "%eval%"=="3" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_libraries -xarg "%prog_dir%MTP2GD.txt" )
+if /i "%eval%"=="4" ( %pycommand% "%squirrel%" -lib_call picker_walker remote_select_from_walker -xarg "%prog_dir%MTP2GD.txt" )
 if /i "%eval%"=="c" ( %pycommand% "%squirrel%" -lib_call workers concurrent_cache )
 if /i "%eval%"=="e" goto salida
 if /i "%eval%"=="i" goto showlist
@@ -238,7 +238,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                         A MTP MANAGER FOR DBI INSTALLER                           "
-ECHO                                  VERSION 1.00b (MTP)
+ECHO                                  VERSION 1.00c (MTP)
 ECHO -------------------------------------------------------------------------------------
 ECHO DBI by DUCKBILL: https://github.com/rashevskyv/switch/releases
 ECHO Latest DBI: https://github.com/rashevskyv/switch/releases/tag/462

diff --git a/py/ztools/NSCB_config.bat b/py/ztools/NSCB_config.bat
@@ -2753,7 +2753,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED IN THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/RST.bat b/py/ztools/RST.bat
@@ -297,7 +297,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/ZSTD.bat b/py/ztools/ZSTD.bat
@@ -506,7 +506,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar

diff --git a/py/ztools/info.bat b/py/ztools/info.bat
@@ -413,7 +413,7 @@ ECHO =============================     BY JULESONTHEROAD     ===================
 ECHO -------------------------------------------------------------------------------------
 ECHO "                                POWERED BY SQUIRREL                                "
 ECHO "                    BASED ON THE WORK OF BLAWAR AND LUCA FRAGA                     "
-ECHO                                    VERSION 1.00b
+ECHO                                    VERSION 1.00c
 ECHO -------------------------------------------------------------------------------------
 ECHO Program's github: https://github.com/julesontheroad/NSC_BUILDER
 ECHO Blawar's github:  https://github.com/blawar