Improve user experience & clean up (#135)
* Improve user experience & clean up * Codacy recommended fix Use $(...) notation instead of legacy backticked `...`.
This commit is contained in:
i-am-fyre
GitHub
parent
22cb252227
commit
46e24193ba
@ -12,16 +12,13 @@
|
||||
|
||||
## Expected param 1 to be 'a' for all, else ask some questions
|
||||
|
||||
## Normal log file (if not overwritten by second param
|
||||
## Normal log file (if not overwritten by second param)
|
||||
LOG_FILE="MaNGOSExtractor.log"
|
||||
|
||||
## Detailed log file
|
||||
DETAIL_LOG_FILE="MaNGOSExtractor_detailed.log"
|
||||
|
||||
## Change this to a value fitting for your sys!
|
||||
NUM_CPU="2"
|
||||
|
||||
## ! Use below only for finetuning or if you know what you are doing !
|
||||
|
||||
USE_AD="0"
|
||||
USE_VMAPS="0"
|
||||
USE_MMAPS="0"
|
||||
@ -54,9 +51,9 @@ else
|
||||
echo " Welcome to the MaNGOS Data Extraction helper script !"
|
||||
echo "========================================================="
|
||||
echo
|
||||
echo "Should all data (dbc, maps, vmaps and mmaps be extracted ?"
|
||||
echo "(Selecting n will give you the option to pick each step) (y/n):"
|
||||
read line
|
||||
echo "Should all data (dbc, maps, vmaps and mmaps) be extracted ?"
|
||||
read -p"(Selecting 'n' will give you the option to manually choose yes/no for each step) (y/n): " line
|
||||
|
||||
if [ "$line" = "y" ]
|
||||
then
|
||||
## extract all
|
||||
@ -66,14 +63,12 @@ else
|
||||
else
|
||||
DisplayHeader
|
||||
echo
|
||||
echo "Should dbc and maps be extracted? (y/n):"
|
||||
read line
|
||||
read -p"Should dbc and maps be extracted? (y/n): " line
|
||||
if [ "$line" = "y" ]; then USE_AD="1"; fi
|
||||
|
||||
DisplayHeader
|
||||
echo
|
||||
echo "Should vmaps be extracted? (y/n):"
|
||||
read line
|
||||
read -p"Should vmaps be extracted? (y/n): " line
|
||||
if [ "$line" = "y" ]; then USE_VMAPS="1"; fi
|
||||
|
||||
DisplayHeader
|
||||
@ -81,25 +76,19 @@ else
|
||||
echo "WARNING! Extracting mmaps will take several hours!"
|
||||
echo "(you can later tell the extractor to delay starting)"
|
||||
echo
|
||||
echo "Should mmaps be extracted? (y/n):"
|
||||
read line
|
||||
if [ "$line" = "y" ]
|
||||
then
|
||||
read -p"Should mmaps be extracted? (y/n): " line
|
||||
if [ "$line" = "y" ]; then
|
||||
USE_MMAPS="1";
|
||||
else
|
||||
echo
|
||||
echo "Only reextract offmesh tiles for mmaps?"
|
||||
read line
|
||||
if [ "$line" = "y" ]
|
||||
then
|
||||
USE_MMAPS_OFFMESH="1";
|
||||
fi
|
||||
read -p"Only reextract offmesh tiles for mmaps? (y/n): " line
|
||||
if [ "$line" = "y" ]; then USE_MMAPS_OFFMESH="1"; fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
|
||||
# Ensure bins are marked executable
|
||||
for bin in ./map-extractor ./mmap-extractor ./vmap-extractor; do
|
||||
for bin in ./map-extractor ./movemap-generator ./vmap-extractor; do
|
||||
if [ -f "$bin" ]; then
|
||||
echo "Marking $bin executable"
|
||||
chmod +x "$bin"
|
||||
@ -107,44 +96,39 @@ for bin in ./map-extractor ./mmap-extractor ./vmap-extractor; do
|
||||
done
|
||||
|
||||
## Special case: Only reextract offmesh tiles
|
||||
if [ "$USE_MMAPS_OFFMESH" = "1" ]
|
||||
then
|
||||
if [ "$USE_MMAPS_OFFMESH" = "1" ]; then
|
||||
echo "Only extracting offmesh meshes"
|
||||
./MoveMapGen.sh offmesh $LOG_FILE $DETAIL_LOG_FILE
|
||||
sh ./MoveMapGen.sh "offmesh" $LOG_FILE $DETAIL_LOG_FILE
|
||||
exit 0
|
||||
fi
|
||||
|
||||
## MMap Extraction specific
|
||||
if [ "$USE_MMAPS" = "1" ]
|
||||
then
|
||||
## Obtain number ob processes
|
||||
if [ "$USE_MMAPS" = "1" ]; then
|
||||
## Obtain number of processes
|
||||
DisplayHeader
|
||||
echo
|
||||
echo "How many CPUs should be used for extracting mmaps? (1-4)"
|
||||
read line
|
||||
read -p"How many CPUs should be used for extracting mmaps? (1-4): " line
|
||||
echo
|
||||
if [ "$line" -ge "1" -a "$line" -le "4" ]
|
||||
then
|
||||
NUM_CPU=$line
|
||||
else
|
||||
echo "Only number between 1 and 4 supported!"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
while [ "$line" -lt 1 -o "$line" -gt 4 ]; do
|
||||
echo "Only number between 1 and 4 are supported!"
|
||||
read -p"Please enter how many CPUs should be used for extracting mmaps? (1-4): " line
|
||||
done
|
||||
NUM_CPU=$line
|
||||
|
||||
## Extract MMaps delayed?
|
||||
if [ "$USE_MMAPS_DELAY" != "no" ]; then
|
||||
DisplayHeader
|
||||
echo
|
||||
echo "MMap extraction can be started delayed"
|
||||
echo
|
||||
echo "If you *do not* want MMap Extraction to start delayed, just press return"
|
||||
echo
|
||||
echo "Otherwise enter a number followed by s for seconds, m for minutes, h for hours"
|
||||
echo "Example: \"3h\" - will start mmap extraction in 3 hours"
|
||||
echo
|
||||
read -p"MMap Extraction Delay (leave blank for direct extraction): " USE_MMAPS_DELAY
|
||||
echo
|
||||
else
|
||||
USE_MMAPS_DELAY=""
|
||||
DisplayHeader
|
||||
echo
|
||||
echo "MMap extraction can be set up with a delayed start."
|
||||
echo
|
||||
echo "If you *do not* want MMap Extraction to start delayed, just press return"
|
||||
echo
|
||||
echo "Otherwise enter a number followed by s for seconds, m for minutes, h for hours"
|
||||
echo "Example: \"3h\" - will start mmap extraction in 3 hours"
|
||||
echo
|
||||
read -p"MMap Extraction Delay (leave blank for direct extraction): " line
|
||||
if [ "$line" != "" ]; then
|
||||
USE_MMAPS_DELAY=$line
|
||||
fi
|
||||
fi
|
||||
|
||||
@ -156,67 +140,66 @@ echo " vmaps: $USE_VMAPS"
|
||||
echo " mmaps: $USE_MMAPS using $NUM_CPU processes"
|
||||
if [ "$USE_MMAPS_DELAY" != "" ]; then
|
||||
echo
|
||||
echo "MMap Extraction will be started delayed by: $USE_MMAPS_DELAY"
|
||||
echo "MMap Extraction will be delayed by: $USE_MMAPS_DELAY"
|
||||
fi
|
||||
echo
|
||||
if [ "$1" != "a" ]
|
||||
then
|
||||
if [ "$1" != "a" ]; then
|
||||
echo "If you don't like these settings, interrupt with CTRL+C"
|
||||
echo
|
||||
echo "Press any key to proceed"
|
||||
read line
|
||||
read -p"Press any key to proceed" line
|
||||
fi
|
||||
|
||||
echo "`date`: Start extracting data for MaNGOS" | tee $LOG_FILE
|
||||
echo "$(date): Start extracting data for MaNGOS" | tee $LOG_FILE
|
||||
|
||||
## Handle log messages
|
||||
if [ "$USE_AD" = "1" ];
|
||||
then
|
||||
if [ "$USE_AD" = "1" ]; then
|
||||
echo "DBC and map files will be extracted" | tee -a $LOG_FILE
|
||||
else
|
||||
echo "DBC and map files won't be extracted!" | tee -a $LOG_FILE
|
||||
fi
|
||||
if [ "$USE_VMAPS" = "1" ]
|
||||
then
|
||||
|
||||
if [ "$USE_VMAPS" = "1" ]; then
|
||||
echo "Vmaps will be extracted" | tee -a $LOG_FILE
|
||||
else
|
||||
echo "Vmaps won't be extracted!" | tee -a $LOG_FILE
|
||||
fi
|
||||
if [ "$USE_MMAPS" = "1" ]
|
||||
then
|
||||
|
||||
if [ "$USE_MMAPS" = "1" ]; then
|
||||
echo "Mmaps will be extracted with $NUM_CPU processes" | tee -a $LOG_FILE
|
||||
else
|
||||
echo "Mmaps files won't be extracted!" | tee -a $LOG_FILE
|
||||
fi
|
||||
|
||||
echo | tee -a $LOG_FILE
|
||||
|
||||
echo "`date`: Start extracting data for MaNGOS, DBCs/maps $USE_AD, vmaps $USE_VMAPS, mmaps $USE_MMAPS on $NUM_CPU processes" | tee $DETAIL_LOG_FILE
|
||||
echo "$(date): Start extracting data for MaNGOS, DBCs/maps $USE_AD, vmaps $USE_VMAPS, mmaps $USE_MMAPS on $NUM_CPU processes" | tee $DETAIL_LOG_FILE
|
||||
echo | tee -a $DETAIL_LOG_FILE
|
||||
|
||||
## Extract dbcs and maps
|
||||
if [ "$USE_AD" = "1" ]
|
||||
then
|
||||
echo "`date`: Start extraction of DBCs and map files..." | tee -a $LOG_FILE
|
||||
./map-extractor | tee -a $DETAIL_LOG_FILE
|
||||
echo "`date`: Extracting of DBCs and map files finished" | tee -a $LOG_FILE
|
||||
echo | tee -a $LOG_FILE
|
||||
echo | tee -a $DETAIL_LOG_FILE
|
||||
if [ "$USE_AD" = "1" ]; then
|
||||
echo "$(date): Start extraction of DBCs and map files..." | tee -a $LOG_FILE
|
||||
./map-extractor | tee -a $DETAIL_LOG_FILE
|
||||
echo "$(date): Extracting of DBCs and map files finished" | tee -a $LOG_FILE
|
||||
echo | tee -a $LOG_FILE
|
||||
echo | tee -a $DETAIL_LOG_FILE
|
||||
fi
|
||||
|
||||
## Extract vmaps
|
||||
if [ "$USE_VMAPS" = "1" ]
|
||||
then
|
||||
echo "`date`: Start extraction of vmaps..." | tee -a $LOG_FILE
|
||||
if [ "$USE_VMAPS" = "1" ]; then
|
||||
echo "$(date): Start extraction of vmaps..." | tee -a $LOG_FILE
|
||||
./vmap-extractor | tee -a $DETAIL_LOG_FILE
|
||||
echo "`date`: Extracting of vmaps finished" | tee -a $LOG_FILE
|
||||
echo "$(date): Extracting of vmaps finished" | tee -a $LOG_FILE
|
||||
|
||||
echo "$(date): Start assembling of vmaps..." | tee -a $LOG_FILE
|
||||
./vmap-assembler Buildings vmaps | tee -a $DETAIL_LOG_FILE
|
||||
echo "$(date): Assembling of vmaps finished" | tee -a $LOG_FILE
|
||||
|
||||
echo | tee -a $LOG_FILE
|
||||
echo | tee -a $DETAIL_LOG_FILE
|
||||
fi
|
||||
|
||||
## Extract mmaps
|
||||
if [ "$USE_MMAPS" = "1" ]
|
||||
then
|
||||
if [ "$USE_MMAPS" = "1" ]; then
|
||||
if [ "$USE_MMAPS_DELAY" != "" ]; then
|
||||
echo "Extracting of MMaps is set to be started delayed by $USE_MMAPS_DELAY"
|
||||
echo "Current time: $(date)"
|
||||
@ -224,4 +207,3 @@ then
|
||||
fi
|
||||
sh ./MoveMapGen.sh $NUM_CPU $LOG_FILE $DETAIL_LOG_FILE
|
||||
fi
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user