Merge pull request #63 from vcatafesta/main

sáb 26 ago 2023 15:17:25 -04 Vilmar Catafesta ([email protected])
biglinux · Aug 26, 2023 · 72d428f · 72d428f
2 parents dd16eae + 09c9398
commit 72d428f
Show file tree

Hide file tree

Showing 8 changed files with 543 additions and 368 deletions.
diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/big-store-start.sh b/big-store/usr/share/bigbashview/bcc/apps/big-store/big-store-start.sh
@@ -68,7 +68,7 @@ function sh_check_big_store_is_running() {
 	fi
 }
 
-function sh_main() {
+function sh_big_store_start_sh_main {
 	local resolution
 	local half_resolution
 
@@ -88,7 +88,8 @@ function sh_main() {
 	echo "$half_resolution" >"${TMP_FOLDER}/screenshot-resolution.txt"
 
 	#	sh_update_cache_flatpak &
-	COMMON_OPTIONS="QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 WINIT_UNIX_BACKEND=x11 GDK_BACKEND=x11 bigbashview -n \"$TITLE\" -w maximized "
+	#	COMMON_OPTIONS="QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 WINIT_UNIX_BACKEND=x11 GDK_BACKEND=x11 bigbashview -n \"$TITLE\" -w maximized "
+	COMMON_OPTIONS="QT_QPA_PLATFORM=xcb SDL_VIDEODRIVER=x11 WINIT_UNIX_BACKEND=x11 GDK_BACKEND=x11 bigbashview -n \"$TITLE\" -s 1280x720 "
 	if [[ -n "$1" ]]; then
 		case "$1" in
 		"category") eval "$COMMON_OPTIONS index.sh.htm?category=\"$2\"          -i $bigstore_icon_file" ;;
@@ -106,4 +107,4 @@ function sh_main() {
 #sh_debug
 sh_config
 sh_check_big_store_is_running
-sh_main "$@"
+sh_big_store_start_sh_main "$@"
diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css b/big-store/usr/share/bigbashview/bcc/apps/big-store/css/appstream.css
@@ -377,7 +377,7 @@ div#box_aur {
 }
 
 div#box_flatpak {
-/*	 display: none;*/
+	display: none;
     background-attachment: fixed;
     margin-bottom: 25px;
     border-radius: 15px;

diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/header.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/header.sh.htm
@@ -119,6 +119,7 @@
 }
 
 function sh_include_script_pageshow {
+	return
 	cat <<-EOF
 		<script type="text/javascript">
 			if (document.addEventListener) {
@@ -149,6 +150,7 @@
 }
 
 function sh_include_style {
+	return
 	cat <<-EOF
 		<style>
 			div#box_progress_config {
@@ -260,7 +262,7 @@
 }
 
 # Carrega o tema e arquivos essenciais
-function sh_main {
+function sh_header_sh_htm_main {
 	cat <<-EOF
 		<meta charset="utf-8">
 		<script type="text/javascript" src="/usr/share/bigbashview/bcc/apps/big-store/materialize/js/jquery.js"></script>
@@ -763,4 +765,8 @@
 #sh_debug
 sh_config
 sh_refresh_installed_packages
-sh_main
+if [[ $# -eq 0 ]]; then
+	sh_header_sh_htm_main
+else
+	eval "$@"
+fi
diff --git a/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm b/big-store/usr/share/bigbashview/bcc/apps/big-store/index.sh.htm
@@ -65,12 +65,13 @@
 	local param_search="$*"
 	local i
 
+#	xdebug "FLATPAK_CATEGORY : $search : all:$@"
+
 	if [[ "$flatpak_checkbox" = "checked" ]]; then
 		[[ -e "$TMP_FOLDER/flatpak_number.html" ]] && rm -f "$TMP_FOLDER/flatpak_number.html"
 		[[ -e "$TMP_FOLDER/flatpak.html" ]] && rm -f "$TMP_FOLDER/flatpak.html"
 		[[ -e "$TMP_FOLDER/flatpak_build.html" ]] && rm -f "$TMP_FOLDER/flatpak_build.html"
 
-		#xdebug "FLATPAK_CATEGORY : $search : all:$@"
 		cat <<-EOF
 			<div id="box_flatpak">
 			<div id="title_flatpak">
@@ -94,19 +95,28 @@
 
 		if (( flatpak_search_category )); then
 #			for i in "$@"; do sh_search_flatpak "$i"; done
-			sh_search_flatpak "${param_search,,}" &
-			[[ -e "${TMP_FOLDER}/flatpak_build.html" ]] && mv -f "${TMP_FOLDER}/flatpak_build.html" "${TMP_FOLDER}/flatpak.html"
+#			sh_search_flatpak "${param_search,,}" &
+			sh_search_flatpak "${param_search,,}"
+#			[[ -e "${TMP_FOLDER}/flatpak_build.html" ]] && mv -f "${TMP_FOLDER}/flatpak_build.html" "${TMP_FOLDER}/flatpak.html"
 			flatpak_search_category=0
 		else
-			resultFilter_checkbox="$resultFilter_checkbox" sh_search_flatpak "${param_search,,}" &
+#			resultFilter_checkbox="$resultFilter_checkbox" sh_search_flatpak "${param_search,,}" &
+			resultFilter_checkbox="$resultFilter_checkbox" sh_search_flatpak "${param_search,,}"
 		fi
 
-		cat <<-EOF
-			<script>fileReplaceDiv(true, '#content_flatpak', '${TMP_FOLDER}/flatpak.html');</script>
-			<script>fileReplaceDiv(true, '#flatpak_number', '${TMP_FOLDER}/flatpak_number.html');</script>
-			</div>
-			</div>
-		EOF
+		if [[ -e "${TMP_FOLDER}/flatpak_build.html" ]]; then
+			cat <<-EOF
+				<script>fileReplaceDiv(true, '#content_flatpak', '${TMP_FOLDER}/flatpak.html');</script>
+				<script>fileReplaceDiv(true, '#flatpak_number', '${TMP_FOLDER}/flatpak_number.html');</script>
+				</div>
+				</div>
+			EOF
+		else
+			cat <<-EOF
+				</div>
+				</div>
+			EOF
+		fi
 	fi
 }
 export -f FLATPAK_CATEGORY
@@ -118,6 +128,7 @@
 	if [[ "$snap_checkbox" = "checked" ]]; then
 		[[ -e "$TMP_FOLDER/snap.html" ]] && rm -f "$TMP_FOLDER/snap.html"
 		[[ -e "$TMP_FOLDER/snap_number.html" ]] && rm -f "$TMP_FOLDER/snap_number.html"
+		[[ -e "$TMP_FOLDER/snap_build.html" ]] && rm -f "$TMP_FOLDER/snap_build.html"
 		cat <<-EOF
 			<div id="box_snap">
 			<div id="title_snap">
@@ -133,17 +144,26 @@
 		EOF
 
 		if (( snap_search_category )); then
-			sh_search_snap "${param_search,,}" &
+#			sh_search_snap "${param_search,,}" &
+			sh_search_snap "${param_search,,}"
 			snap_search_category=0
 		else
-			resultFilter_checkbox="$resultFilter_checkbox" sh_search_snap "${param_search,,}" &
+#			resultFilter_checkbox="$resultFilter_checkbox" sh_search_snap "${param_search,,}" &
+			resultFilter_checkbox="$resultFilter_checkbox" sh_search_snap "${param_search,,}"
 		fi
 
-		cat <<-EOF
-			<script>fileReplaceDiv(true, '#content_snap', '${TMP_FOLDER}/snap.html');</script>
-			<script>fileReplaceDiv(true, '#snap_number',  '${TMP_FOLDER}/snap_number.html');</script>
-			</div></div>
-		EOF
+		if [[ -e "${TMP_FOLDER}/snap_build.html" ]]; then
+			cat <<-EOF
+				<script>fileReplaceDiv(true, '#content_snap', '${TMP_FOLDER}/snap.html');</script>
+				<script>fileReplaceDiv(true, '#snap_number',  '${TMP_FOLDER}/snap_number.html');</script>
+				</div></div>
+			EOF
+		else
+			cat <<-EOF
+				</div>
+				</div>
+			EOF
+		fi
 	fi
 }
 export -f SNAP_CATEGORY