Repair stat func and dropped entry point
This commit is contained in:
Htylol
parent
ef83c60711
commit
0c97d2c003
@ -849,7 +849,13 @@ debug_timer () {
|
||||
# Поиск нужного .desktop файла по $portwine_exe (для показа в комментариях нужного времени)
|
||||
# Параллельное создание базы по времени после завершения приложения
|
||||
search_desktop_file () {
|
||||
local desktop_file desktop_file_new EXEC_DESKTOP line1 line2 TIME_TOTAL
|
||||
local desktop_file desktop_file_new line1 line2 line3 line4 count_line i
|
||||
local EXEC_DESKTOP TIME_TOTAL BROKEN_LINE FILE_SHA256SUM_ARRAY FILE_SHA256SUM_FOUND FILE_SHA256SUM_NOT_FOUND
|
||||
if [[ -z $FILE_SHA256SUM ]] ; then
|
||||
read -r -a FILE_SHA256SUM_ARRAY < <(sha256sum "$portwine_exe")
|
||||
FILE_SHA256SUM=${FILE_SHA256SUM_ARRAY[0]}
|
||||
edit_db_from_gui FILE_SHA256SUM
|
||||
fi
|
||||
for desktop_file in "$PORT_WINE_PATH"/* ; do
|
||||
desktop_file_new="${desktop_file//"$PORT_WINE_PATH/"/}"
|
||||
if [[ $desktop_file_new =~ .desktop$ ]] ; then
|
||||
@ -864,7 +870,17 @@ search_desktop_file () {
|
||||
fi
|
||||
done < "$desktop_file"
|
||||
while IFS=" " read -r -a line2 ; do
|
||||
if [[ ${line2[1]} == "$ENTRY_POINT" ]] ; then
|
||||
if [[ -z ${line2[0]} ]] \
|
||||
|| [[ ! ${line2[0]} =~ (.[Bb][Aa][Tt]$|.[Ee][Xx][Ee]$|.[Mm][Ss][Ii]$|.[Rr][Ee][Gg]$) ]] ; then
|
||||
BROKEN_LINE=1
|
||||
fi
|
||||
if [[ ${line2[1]} == "$FILE_SHA256SUM" ]] ; then
|
||||
FILE_SHA256SUM_FOUND=1
|
||||
break
|
||||
fi
|
||||
if [[ ${line2[1]} != "$FILE_SHA256SUM" ]] \
|
||||
&& [[ ${line2[0]} == "${portwine_exe// /#@_@#}" ]] ; then
|
||||
FILE_SHA256SUM_NOT_FOUND=1
|
||||
break
|
||||
fi
|
||||
done < "$PORT_WINE_TMP_PATH/statistics"
|
||||
@ -875,45 +891,95 @@ search_desktop_file () {
|
||||
fi
|
||||
done
|
||||
IFS="$orig_IFS"
|
||||
if [[ -n ${line2[2]} ]]
|
||||
then TIME_CURRENT=${line2[2]}
|
||||
else TIME_CURRENT=0
|
||||
## Ремонты:
|
||||
# Когда приложения ещё нет в статистике
|
||||
[[ -z ${line2[2]} ]] && line2[2]=0
|
||||
|
||||
## TODO: ремонтирует devel пр с entry point потом можно будет это дропнуть
|
||||
if [[ $FILE_SHA256SUM_NOT_FOUND == 1 ]] && [[ ${#line2[1]} != "64" ]] ; then
|
||||
while IFS=" " read -r -a line4 ; do
|
||||
if [[ ${#line4[1]} == "64" ]]
|
||||
then echo "${line4[*]}"
|
||||
fi
|
||||
export TIME_CURRENT
|
||||
done < "$PORT_WINE_TMP_PATH/statistics" > "$PORT_WINE_TMP_PATH/statistics_repair"
|
||||
try_remove_file "$PORT_WINE_TMP_PATH/statistics"
|
||||
mv -f "$PORT_WINE_TMP_PATH/statistics_repair" "$PORT_WINE_TMP_PATH/statistics"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Ремонт, если есть пустые строки и непонятные строки без .exe, .bat, .msi, .reg
|
||||
if [[ $BROKEN_LINE == 1 ]] ; then
|
||||
while IFS=" " read -r -a line3 ; do
|
||||
if [[ -n ${line3[0]} ]] && [[ ${line3[0]} =~ (.[Bb][Aa][Tt]$|.[Ee][Xx][Ee]$|.[Mm][Ss][Ii]$|.[Rr][Ee][Gg]$) ]]
|
||||
then echo "${line3[*]}"
|
||||
fi
|
||||
done < "$PORT_WINE_TMP_PATH/statistics" > "$PORT_WINE_TMP_PATH/statistics_repair"
|
||||
try_remove_file "$PORT_WINE_TMP_PATH/statistics"
|
||||
mv -f "$PORT_WINE_TMP_PATH/statistics_repair" "$PORT_WINE_TMP_PATH/statistics"
|
||||
return 0
|
||||
fi
|
||||
|
||||
# Ремонтирует путь на новый, если вдруг путь до .exe файла битый или изменился, но .exe файл он опознал
|
||||
if [[ $FILE_SHA256SUM_FOUND == 1 ]] && [[ ${line2[0]} != "${portwine_exe// /#@_@#}" ]] ; then
|
||||
sed -i "s|${line2[0]} ${line2[1]}|${portwine_exe// /#@_@#} ${line2[1]}|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
line2[0]=${portwine_exe// /#@_@#}
|
||||
fi
|
||||
|
||||
# Ремонт, если sha256sum изменилась, но путь до .exe тот же
|
||||
if [[ $FILE_SHA256SUM_NOT_FOUND == 1 ]] ; then
|
||||
sed -i "s|${line2[0]} ${line2[1]}|${line2[0]} $FILE_SHA256SUM|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
line2[1]=$FILE_SHA256SUM
|
||||
fi
|
||||
|
||||
# Ремонт, если сломалось время
|
||||
if [[ ! ${line2[2]} =~ [0-9]+ ]] || (( line2[2] >= 999999999 )) ; then
|
||||
sed -i "s|${line2[1]} ${line2[2]}|${line2[1]} 0|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
line2[2]=0
|
||||
fi
|
||||
export TIME_CURRENT=${line2[2]}
|
||||
|
||||
# Проверка новых десктоп файлов, чтобы их можно было сортировать первыми при первом создании в главном меню
|
||||
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|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
if [[ $FILE_SHA256SUM_FOUND == 1 ]] ; then
|
||||
sed -i "s|${line2[1]} \(.*\) OLD_DESKTOP|${line2[1]} \1 NEW_DESKTOP|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
else
|
||||
echo "${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_CURRENT NEW_DESKTOP" >> "$PORT_WINE_TMP_PATH/statistics"
|
||||
echo "${portwine_exe// /#@_@#} $FILE_SHA256SUM $TIME_CURRENT NEW_DESKTOP" >> "$PORT_WINE_TMP_PATH/statistics"
|
||||
fi
|
||||
fi
|
||||
unset PW_NEW_DESKTOP
|
||||
|
||||
# Когда приложение было запущено и завершено
|
||||
if [[ -n $PW_TIME_IN_GAME ]] ; then
|
||||
TIME_TOTAL=$(( TIME_CURRENT + PW_TIME_IN_GAME ))
|
||||
if [[ -n ${line2[1]} ]] ; then
|
||||
if [[ $FILE_SHA256SUM_FOUND == 1 ]] ; then
|
||||
# Когда есть предыдущее время
|
||||
sed -i "s|$ENTRY_POINT $TIME_CURRENT|$ENTRY_POINT $TIME_TOTAL|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
sed -i "s|$FILE_SHA256SUM $TIME_CURRENT|$FILE_SHA256SUM $TIME_TOTAL|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
else
|
||||
# Когда только запустили приложение первый раз
|
||||
echo "${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_TOTAL OLD_DESKTOP" >> "$PORT_WINE_TMP_PATH/statistics"
|
||||
echo "${portwine_exe// /#@_@#} $FILE_SHA256SUM $TIME_TOTAL OLD_DESKTOP" >> "$PORT_WINE_TMP_PATH/statistics"
|
||||
fi
|
||||
# Здесь добавляются новые линии для статистики по аналогии, к примеру ${line2[4]}
|
||||
# L4 важен, чтобы не было путаницы из-за sed, то что используется \(.*\), для ${line2[5]} это будет L5 и т.д.
|
||||
count_line=4
|
||||
if [[ -z ${line2[4]} ]] ; then
|
||||
line2[4]=1
|
||||
sed -i "s|$ENTRY_POINT \(.*\)|$ENTRY_POINT \1 L4-${line2[4]}|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
line2[4]=0
|
||||
sed -i "s|$FILE_SHA256SUM \(.*\)|$FILE_SHA256SUM \1 L4-${line2[4]}|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
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|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
(( count_line ++ ))
|
||||
fi
|
||||
# сюда L5
|
||||
|
||||
# Ремонт, если количество элементов массива по каким-то причина больше, чем должно быть
|
||||
if [[ -n ${line2["$count_line"]} ]] ; then
|
||||
for i in $(seq $count_line ${#line2[@]}) ; do
|
||||
unset 'line2[$i]'
|
||||
done
|
||||
sed -i "s|${portwine_exe// /#@_@#} $FILE_SHA256SUM \(.*\)|${line2[*]}|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
fi
|
||||
# Ремонтирует путь на новый, если вдруг путь до .exe файла битый или изменился, но .exe файл он опознал
|
||||
if [[ -n ${line2[1]} ]] && [[ ${line2[0]} != "${portwine_exe// /#@_@#}" ]] ; then
|
||||
[[ -z $TIME_TOTAL ]] && TIME_TOTAL=$TIME_CURRENT
|
||||
sed -i "s|${line2[0]} $ENTRY_POINT $TIME_CURRENT|${portwine_exe// /#@_@#} $ENTRY_POINT $TIME_TOTAL|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
# Сюда все sedы от L4, L5 и т.д. (после всех ремонтов)
|
||||
sed -i "s|$FILE_SHA256SUM \(.*\) L4-${line2[4]}|$FILE_SHA256SUM \1 L4-$NUMBER_OF_STARTS|" "$PORT_WINE_TMP_PATH/statistics"
|
||||
fi
|
||||
}
|
||||
|
||||
@ -1613,7 +1679,7 @@ stop_portwine () {
|
||||
pw_auto_create_shortcut
|
||||
add_in_stop_portwine
|
||||
|
||||
if [[ $PW_LOG != 1 ]] ; then
|
||||
if [[ $PW_LOG != 1 ]] && [[ -n $START_PW_TIME_IN_GAME ]] ; then
|
||||
debug_timer --end -s "PW_TIME_IN_GAME"
|
||||
PW_TIME_IN_GAME=$(( PW_TIME_IN_GAME / 1000 )) # в секундах
|
||||
search_desktop_file
|
||||
@ -2474,7 +2540,6 @@ pw_create_gui_png () {
|
||||
fi
|
||||
if [[ -z "$PORTPROTON_NAME" ]] \
|
||||
|| [[ -z "$FILE_DESCRIPTION" ]] \
|
||||
|| [[ -z "$ENTRY_POINT" ]] \
|
||||
|| [[ "$PW_NO_RESTART_PPDB" == "1" ]]
|
||||
then
|
||||
if [[ -n "${PORTWINE_CREATE_SHORTCUT_NAME}" ]] ; then
|
||||
@ -2484,7 +2549,6 @@ pw_create_gui_png () {
|
||||
if timeout 3 exiftool "$portwine_exe" &> "${PW_TMPFS_PATH}/exiftool.tmp" ; then
|
||||
PW_PRODUCTNAME=$(sed -n 's/^Product Name\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp")
|
||||
FILE_DESCRIPTION=$(sed -n 's/^File Description\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp")
|
||||
ENTRY_POINT=$(sed -n 's/^Entry Point\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp")
|
||||
else
|
||||
print_error "exiftool - broken!"
|
||||
fi
|
||||
@ -2493,7 +2557,6 @@ pw_create_gui_png () {
|
||||
env PERL5LIB="${PW_PLUGINS_PATH}/portable/lib/perl5" "${PW_PLUGINS_PATH}/portable/bin/exiftool" "$portwine_exe" &> "${PW_TMPFS_PATH}/exiftool.tmp"
|
||||
PW_PRODUCTNAME=$(sed -n 's/^Product Name\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp")
|
||||
FILE_DESCRIPTION=$(sed -n 's/^File Description\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp")
|
||||
ENTRY_POINT=$(sed -n 's/^Entry Point\s*:\s*//p' "${PW_TMPFS_PATH}/exiftool.tmp")
|
||||
fi
|
||||
|
||||
if [[ "$PW_PRODUCTNAME" =~ (Launcher|RU) ]]
|
||||
@ -2512,7 +2575,7 @@ pw_create_gui_png () {
|
||||
|
||||
PORTPROTON_NAME="$(echo "${PORTPROTON_NAME}" | sed "s/\`//g" | sed "s/\"//g" | sed "s/'//g" | sed "s/\!//g")"
|
||||
export PORTPROTON_NAME
|
||||
edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION ENTRY_POINT
|
||||
edit_db_from_gui PORTPROTON_NAME FILE_DESCRIPTION
|
||||
fi
|
||||
|
||||
resize_png "$portwine_exe" "${PORTPROTON_NAME}" "128"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user