From 1cb7fb50099140293ce83ac7614e3dd45516239e Mon Sep 17 00:00:00 2001 From: Htylol Date: Sun, 27 Oct 2024 00:06:55 +0500 Subject: [PATCH] Spellcheck and rename --- data_from_portwine/scripts/functions_helper | 28 ++++++++++----------- data_from_portwine/scripts/start.sh | 16 ++++++------ 2 files changed, 22 insertions(+), 22 deletions(-) diff --git a/data_from_portwine/scripts/functions_helper b/data_from_portwine/scripts/functions_helper index b6d7e58c..72f59a04 100755 --- a/data_from_portwine/scripts/functions_helper +++ b/data_from_portwine/scripts/functions_helper @@ -870,7 +870,7 @@ search_desktop_file () { if [[ ${line2[1]} == "$ENTRY_POINT" ]] ; then break fi - done < "$PW_DATABASE_PATH/times_current" + done < "$PW_DATABASE_PATH/database" if [[ $portwine_exe == "${EXEC_DESKTOP//\"/}" ]] ; then DESKTOP_CORRECT_FILE="$desktop_file" fi @@ -886,9 +886,9 @@ search_desktop_file () { # Проверка новых десктоп файлов, чтобы их можно было сортировать первыми при первом создании в главном меню if [[ $PW_NEW_DESKTOP == 1 ]] && [[ ${line2[3]} != NEW_DESKTOP ]] ; then if [[ -n ${line2[1]} ]] ; then - sed -i "s|$ENTRY_POINT $TIME_CURRENT OLD_DESKTOP|$ENTRY_POINT $TIME_CURRENT NEW_DESKTOP|" "$PW_DATABASE_PATH/times_current" + sed -i "s|$ENTRY_POINT $TIME_CURRENT OLD_DESKTOP|$ENTRY_POINT $TIME_CURRENT NEW_DESKTOP|" "$PW_DATABASE_PATH/database" else - echo "${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_CURRENT NEW_DESKTOP" >> "$PW_DATABASE_PATH/times_current" + echo "${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_CURRENT NEW_DESKTOP" >> "$PW_DATABASE_PATH/database" fi fi unset PW_NEW_DESKTOP @@ -897,26 +897,26 @@ search_desktop_file () { TIME_TOTAL=$(( TIME_CURRENT + PW_TIME_IN_GAME )) if [[ -n ${line2[1]} ]] ; then # Когда есть предыдущее время - sed -i "s|$ENTRY_POINT $TIME_CURRENT|$ENTRY_POINT $TIME_TOTAL|" "$PW_DATABASE_PATH/times_current" + sed -i "s|$ENTRY_POINT $TIME_CURRENT|$ENTRY_POINT $TIME_TOTAL|" "$PW_DATABASE_PATH/database" else # Когда только запустили приложение первый раз - echo "${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_TOTAL OLD_DESKTOP" >> "$PW_DATABASE_PATH/times_current" + echo "${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_TOTAL OLD_DESKTOP" >> "$PW_DATABASE_PATH/database" fi # Здесь добавляются новые линии для статистики по аналогии, к примеру ${line2[4]} + # L4 важен, чтобы не было путаницы из-за sed, то что используется \(.*\), для ${line2[5]} это будет L5 и т.д. if [[ -z ${line2[4]} ]] ; then - line2[4]=0 - sed -i "s|$ENTRY_POINT \(.*\)|$ENTRY_POINT \1 ${line2[4]}|" "$PW_DATABASE_PATH/times_current" + line2[4]=1 + sed -i "s|$ENTRY_POINT \(.*\)|$ENTRY_POINT \1 L4-${line2[4]}|" "$PW_DATABASE_PATH/database" + else + line2[4]=${line2[4]//L4-/} + NUMBER_OF_STARTS=$(( line2[4] + 1 )) + sed -i "s|$ENTRY_POINT \(.*\) L4-${line2[4]}|$ENTRY_POINT \1 L4-$NUMBER_OF_STARTS|" "$PW_DATABASE_PATH/database" fi - NUMBER_OF_STARTS=$(( ${line2[4]} + 1 )) - sed -i "s|$ENTRY_POINT \(.*\) ${line2[4]}|$ENTRY_POINT \1 $NUMBER_OF_STARTS|" "$PW_DATABASE_PATH/times_current" fi # Ремонтирует путь на новый, если вдруг путь до .exe файла битый или изменился, но .exe файл он опознал if [[ -n ${line2[1]} ]] && [[ ${line2[0]} != "${portwine_exe// /#@_@#}" ]] ; then - if [[ -n $TIME_TOTAL ]] - then TIME_TOTAL=$TIME_TOTAL - else TIME_TOTAL=$TIME_CURRENT - fi - sed -i "s|${line2[0]} $ENTRY_POINT $TIME_CURRENT|${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_TOTAL|" "$PW_DATABASE_PATH/times_current" + [[ -z $TIME_TOTAL ]] && TIME_TOTAL=$TIME_CURRENT + sed -i "s|${line2[0]} $ENTRY_POINT $TIME_CURRENT|${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_TOTAL|" "$PW_DATABASE_PATH/database" fi } diff --git a/data_from_portwine/scripts/start.sh b/data_from_portwine/scripts/start.sh index 19e51362..db888097 100755 --- a/data_from_portwine/scripts/start.sh +++ b/data_from_portwine/scripts/start.sh @@ -151,7 +151,7 @@ source "${PORT_SCRIPTS_PATH}/var" export STEAM_SCRIPTS="${PORT_WINE_PATH}/steam_scripts" export PW_PLUGINS_PATH="${PORT_WINE_TMP_PATH}/plugins${PW_PLUGINS_VER}" export PW_CACHE_LANG_PATH="${PORT_WINE_TMP_PATH}/cache_lang/" -export PW_DATABASE_PATH="${PORT_WINE_TMP_PATH}/database/" +export PW_DATABASE_PATH="${PORT_WINE_TMP_PATH}/pw_database/" export PW_GUI_ICON_PATH="${PORT_WINE_PATH}/data/img/gui" export PW_GUI_THEMES_PATH="${PORT_WINE_PATH}/data/themes" export pw_yad="${PW_GUI_THEMES_PATH}/gui/yad_gui_pp" @@ -179,8 +179,10 @@ try_remove_file "${PW_TMPFS_PATH}/update_pfx_log" # shellcheck source=/dev/null source "${USER_CONF}" -[[ ! -d $PW_DATABASE_PATH ]] && create_new_dir "$PW_DATABASE_PATH" -[[ ! -f $PW_DATABASE_PATH/times_current ]] && touch "$PW_DATABASE_PATH/times_current" +if [[ ! -f $PW_DATABASE_PATH/database ]] ; then + create_new_dir "$PW_DATABASE_PATH" + touch "$PW_DATABASE_PATH/database" +fi [[ ! -f "${PW_CACHE_LANG_PATH}/$LANGUAGE" ]] && create_translations unset translations @@ -638,16 +640,14 @@ else fi while IFS=" " read -r -a line2 ; do if [[ \"${line2[0]//#@_@#/ }\" == "${PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]}" ]] ; then - [[ ${line2[3]} == NEW_DESKTOP ]] && NEW_DESKTOP=1 PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]=${line2[2]} break else PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]=0 fi - done < "$PW_DATABASE_PATH/times_current" - if [[ $SORT_WITH_TIME == enabled ]] && [[ $NEW_DESKTOP == 1 ]] ; then - unset NEW_DESKTOP - sed -i "s/${line2[1]} ${line2[2]} NEW_DESKTOP/${line2[1]} ${line2[2]} OLD_DESKTOP/" "$PW_DATABASE_PATH/times_current" + done < "$PW_DATABASE_PATH/database" + if [[ $SORT_WITH_TIME == enabled ]] && [[ ${line2[3]} == NEW_DESKTOP ]] ; then + sed -i "s/${line2[1]} ${line2[2]} NEW_DESKTOP/${line2[1]} ${line2[2]} OLD_DESKTOP/" "$PW_DATABASE_PATH/database" PW_AMOUNT_NEW_DESKTOP+=($AMOUNT_GENERATE_BUTTONS) else PW_AMOUNT_OLD_DESKTOP+=($AMOUNT_GENERATE_BUTTONS)