xpamych/PortWINE
1
0
Fork 0
forked from CastroFidel/PortWINE
Code Pull Requests Activity

Fixed bugs

Browse Source
This commit is contained in:
Htylol 2024-10-05 12:49:43 +05:00
parent 006f5645f1
commit f687917692
2 changed files with 28 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
data_from_portwine/scripts/functions_helper
View File

@ -1321,22 +1321,17 @@ stop_portwine () {
add_in_stop_portwine add_in_stop_portwine
debug_timer --end -s "PW_TIME_IN_GAME" debug_timer --end -s "PW_TIME_IN_GAME"
#PW_TIME_IN_GAME=$(( (PW_TIME_IN_GAME / 60000) % 60 )) так в минутах #PW_TIME_IN_GAME=$(( (PW_TIME_IN_GAME / 60000) % 60 )) # в минутах
PW_TIME_IN_GAME=$(( PW_TIME_IN_GAME / 1000 )) PW_TIME_IN_GAME=$(( PW_TIME_IN_GAME / 1000 )) # в секундах
while IFS= read -r line ; do while IFS= read -r line ; do
if [[ $line =~ ^Time= ]] ; then if [[ $line =~ ^Time= ]] ; then
export SKIP_GAME_TIME="1"
TIME_CURRENT=${line//Time=/} TIME_CURRENT=${line//Time=/}
TIME_TOTAL=$(( TIME_CURRENT + PW_TIME_IN_GAME )) TIME_TOTAL=$(( TIME_CURRENT + PW_TIME_IN_GAME ))
fi fi
done < "$LAST_DESKTOP_FILE" done < "$LAST_DESKTOP_FILE"
IFS="$orig_IFS" IFS="$orig_IFS"
if [[ $SKIP_GAME_TIME != 1 ]] ; then sed -i '/^Time=/d' "$LAST_DESKTOP_FILE"
echo "Time=$PW_TIME_IN_GAME" >> "$LAST_DESKTOP_FILE" echo "Time=$TIME_TOTAL" >> "$LAST_DESKTOP_FILE"
else
sed -i '/^Time=/d' "$LAST_DESKTOP_FILE"
echo "Time=$TIME_TOTAL" >> "$LAST_DESKTOP_FILE"
fi
case "$1" in case "$1" in
--restart) --restart)

37
data_from_portwine/scripts/start.sh
View File

@ -616,15 +616,17 @@ else
[[ $line =~ ^Exec= ]] && PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]="${line//Exec=/}" [[ $line =~ ^Exec= ]] && PW_NAME_D_ICON["$AMOUNT_GENERATE_BUTTONS"]="${line//Exec=/}"
[[ $line =~ ^Icon= ]] && PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]="${line//Icon=/}" [[ $line =~ ^Icon= ]] && PW_ICON_PATH["$AMOUNT_GENERATE_BUTTONS"]="${line//Icon=/}"
if [[ $line =~ ^Time= ]] ; then if [[ $line =~ ^Time= ]] ; then
PW_ALL_DF_WITH_TIME["$AMOUNT_GENERATE_BUTTONS"]="${desktop_file//"${PORT_WINE_PATH}"\//}"
PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]="${line//Time=/}" PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]="${line//Time=/}"
WITH_TIME="1" WITH_TIME="1"
fi fi
done < "$desktop_file" done < "$desktop_file"
PW_ALL_DF["$AMOUNT_GENERATE_BUTTONS"]="${desktop_file//"${PORT_WINE_PATH}"\//}"
if [[ $WITH_TIME != 1 ]] ; then if [[ $WITH_TIME != 1 ]] ; then
PW_ALL_DF["$AMOUNT_GENERATE_BUTTONS"]="${desktop_file//"${PORT_WINE_PATH}"\//}" echo "Time=0" >> "$desktop_file"
PW_GAME_TIME["$AMOUNT_GENERATE_BUTTONS"]="0"
fi fi
unset WITH_TIME unset WITH_TIME
PW_ALL_DF_ARRAY+=($AMOUNT_GENERATE_BUTTONS)
(( AMOUNT_GENERATE_BUTTONS++ )) (( AMOUNT_GENERATE_BUTTONS++ ))
fi fi
fi fi
@ -633,26 +635,35 @@ else
for i in "${!PW_GAME_TIME[@]}" ; do for i in "${!PW_GAME_TIME[@]}" ; do
for j in "${!PW_GAME_TIME[@]}" ; do for j in "${!PW_GAME_TIME[@]}" ; do
if [[ ${PW_GAME_TIME[$i]} -gt ${PW_GAME_TIME[$j]} ]]; then if [[ ${PW_GAME_TIME[$i]} -gt ${PW_GAME_TIME[$j]} ]]; then
tmp=${PW_GAME_TIME[$i]} tmp_0=${PW_GAME_TIME[$i]}
tmp_new=${PW_ALL_DF_WITH_TIME[$i]} tmp_1=${PW_ALL_DF[$i]}
tmp_2=${PW_NAME_D_ICON[$i]}
tmp_4=${PW_ICON_PATH[$i]}
PW_GAME_TIME[$i]=${PW_GAME_TIME[$j]} PW_GAME_TIME[$i]=${PW_GAME_TIME[$j]}
PW_ALL_DF_WITH_TIME[$i]=${PW_ALL_DF_WITH_TIME[$j]} PW_ALL_DF[$i]=${PW_ALL_DF[$j]}
PW_GAME_TIME[$j]=$tmp PW_NAME_D_ICON[$i]=${PW_NAME_D_ICON[$j]}
PW_ALL_DF_WITH_TIME[$j]=$tmp_new PW_ICON_PATH[$i]=${PW_ICON_PATH[$j]}
PW_GAME_TIME[$j]=$tmp_0
PW_ALL_DF[$j]=$tmp_1
PW_NAME_D_ICON[$j]=$tmp_2
PW_ICON_PATH[$j]=$tmp_4
fi fi
done done
done done
IFS=$'\n' IFS=$'\n'
PW_GENERATE_BUTTONS="--field= ${translations[Create shortcut...]}!${PW_GUI_ICON_PATH}/find_48.svg!:FBTNR%@bash -c \"button_click --normal pw_find_exe\"%" PW_GENERATE_BUTTONS="--field= ${translations[Create shortcut...]}!${PW_GUI_ICON_PATH}/find_48.svg!:FBTNR%@bash -c \"button_click --normal pw_find_exe\"%"
for PW_DESKTOP_FILES in "${PW_ALL_DF_WITH_TIME[@]}" "${PW_ALL_DF[@]}" ; do for dp in "${PW_ALL_DF_ARRAY[@]}" ; do
if [[ -n ${PW_NAME_D_ICON} ]] ; then PW_DESKTOP_FILES="${PW_ALL_DF[$dp]}"
PW_NAME_D_ICON_48="${PW_ICON_PATH%.png}_48" if [[ -n ${PW_NAME_D_ICON[dp]} ]] ; then
PW_NAME_D_ICON_128="${PW_ICON_PATH%.png}" PW_NAME_D_ICON_48="${PW_ICON_PATH[dp]%.png}_48"
PW_NAME_D_ICON_128="${PW_ICON_PATH[dp]%.png}"
if check_flatpak ; then if check_flatpak ; then
PW_NAME_D_ICON_NEW=${PW_NAME_D_ICON//flatpak run ru.linux_gaming.PortProton /} PW_NAME_D_ICON_NEW=${PW_NAME_D_ICON[dp]//flatpak run ru.linux_gaming.PortProton /}
else else
PW_NAME_D_ICON_NEW=${PW_NAME_D_ICON//"${PORT_SCRIPTS_PATH}/start.sh" /} PW_NAME_D_ICON_NEW=${PW_NAME_D_ICON[dp]//env \"${PORT_SCRIPTS_PATH}\/start.sh\" /}
fi fi
PW_NAME_D_ICON_NEW="${PW_NAME_D_ICON_NEW//\"/}" PW_NAME_D_ICON_NEW="${PW_NAME_D_ICON_NEW//\"/}"
resize_png "${PW_NAME_D_ICON_NEW}" "${PW_NAME_D_ICON_48//"${PORT_WINE_PATH}/data/img/"/}" "48" resize_png "${PW_NAME_D_ICON_NEW}" "${PW_NAME_D_ICON_48//"${PORT_WINE_PATH}/data/img/"/}" "48"