# HG changeset patch
# User Pascal Bellard <pascal.bellard@slitaz.org>
# Date 1250707719 -7200
# Node ID 9b57d55f7f657864a27216c7c1740045f7200754
# Parent  23dd3368c79acb521c39fc3aba8257cfd4cb2e07
tazpkgbox: use /home/slitaz/wok if available

diff -r 23dd3368c79a -r 9b57d55f7f65 lib/tazpkgbox/package_infos
--- a/lib/tazpkgbox/package_infos	Sat Aug 15 21:43:43 2009 +0000
+++ b/lib/tazpkgbox/package_infos	Wed Aug 19 20:48:39 2009 +0200
@@ -176,6 +176,7 @@
 	DEPENDS=""
 	MAINTAINER=""
 	BUGS=""
+	TAGS=""
 	. /var/lib/tazpkg/installed/$PKG/receipt
 	MAINTAINER=$(echo "$MAINTAINER" | sed 's/[<>|]/ /g')
 	upgrade_version="$(cat /var/lib/tazpkg/packages.desc \
@@ -221,6 +222,8 @@
 		<item icon=\"important\">Bugs: | $BUGS</item>"
 [ -n "$HANDBOOK_URL" ] && PACKAGE_INFOS="$PACKAGE_INFOS
 		<item icon=\"ascii\">Handbook: | $HANDBOOK_URL</item>"
+[ -n "$TAGS" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"tazpkg\">Tags: | $TAGS</item>"
 [ -n "$CONFIG_FILES" ] && PACKAGE_INFOS="$PACKAGE_INFOS
 		<item icon=\"tazpkg\">Config files: | $CONFIG_FILES</item>"
 [ -f /var/lib/tazpkg/installed/$PKG/modifiers ] && 
@@ -330,19 +333,44 @@
 	WEB_SITE=`echo "$RES" | cut -d "|" -f 5`
 	SIZES=`grep -sh -A 3 "^$(echo $PACKAGE)$" /var/lib/tazpkg/packages.txt \
 		/var/lib/tazpkg/undigest/*/packages.txt | tail -1`
+	DEPENDS=""
+	SUGGESTED=""
+	MAINTAINER=""
+	BUGS=""
+	HANDBOOK_URL=""
+	TAGS=""
+	CONFIG_FILES=""
+	height=160
+	if [ -s /home/slitaz/wok/$PKG/receipt ]; then
+		. /home/slitaz/wok/$PKG/receipt
+		height=200
+	fi
 	PACKAGE_INFOS="
 <window title=\"Package: $PACKAGE\" icon-name=\"package-x-generic\">
 <vbox>
 
 	<tree>
-		<width>460</width><height>160</height>
+		<width>460</width><height>$height</height>
 		<label>$PKG|$SHORT_DESC</label>
 		<variable>FIELD2</variable>
-		<item icon=\"tazpkg\">Name: | $PACKAGE</item>
 		<item icon=\"tazpkg\">Version: | $VERSION</item>
 		<item icon=\"tazpkg\">Category: | $CATEGORY</item>"
+	[ -n "$DEPENDS" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"tazpkg\">Depends: | $(echo $DEPENDS)</item>"
+	[ -n "$SUGGESTED" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"tazpkg\">Suggested: | $(echo $SUGGESTED)</item>"
 	[ -n "$SIZES" ] && PACKAGE_INFOS="$PACKAGE_INFOS
 		<item icon=\"tazpkg\">Size: | $SIZES</item>"
+	[ -n "$MAINTAINER" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"system-users\">Maintainer: | $MAINTAINER</item>"
+	[ -n "$BUGS" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"important\">Bugs: | $BUGS</item>"
+	[ -n "$HANDBOOK_URL" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"ascii\">Handbook: | $HANDBOOK_URL</item>"
+	[ -n "$TAGS" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"tazpkg\">Tags: | $TAGS</item>"
+	[ -n "$CONFIG_FILES" ] && PACKAGE_INFOS="$PACKAGE_INFOS
+		<item icon=\"tazpkg\">Config files: | $CONFIG_FILES</item>"
 	PACKAGE_INFOS="$PACKAGE_INFOS
 		<item icon=\"applications-internet\">Web site: | $WEB_SITE</item>
 		<action>case \$FIELD2 in Web*) firefox $WEB_SITE &;; esac</action>
diff -r 23dd3368c79a -r 9b57d55f7f65 lib/tazpkgbox/search
--- a/lib/tazpkgbox/search	Sat Aug 15 21:43:43 2009 +0000
+++ b/lib/tazpkgbox/search	Wed Aug 19 20:48:39 2009 +0200
@@ -34,6 +34,16 @@
 	done
 }
 
+list_package()
+{
+		if [ -d /var/lib/tazpkg/installed/$1 ]; then
+			. /var/lib/tazpkg/installed/$1/receipt
+			echo "tazpkg-installed|$PACKAGE|$VERSION|$SHORT_DESC"
+		else
+			echo "tazpkg|$PACKAGE|$VERSION|$SHORT_DESC"
+		fi
+}
+
 search_package()
 {
 	IFS="|"
@@ -41,12 +51,7 @@
 	    /var/lib/tazpkg/undigest/*/packages.desc 2> /dev/null | sort | \
 	while read PACKAGE VERSION SHORT_DESC; do
 	if echo "$PACKAGE $SHORT_DESC" | grep -q "$SEARCH"; then
-		if [ -d /var/lib/tazpkg/installed/${PACKAGE%% *} ]; then
-			. /var/lib/tazpkg/installed/${PACKAGE%% *}/receipt
-			echo "tazpkg-installed|$PACKAGE|$VERSION|$SHORT_DESC"
-		else
-			echo "tazpkg|$PACKAGE|$VERSION|$SHORT_DESC"
-		fi
+		list_package ${PACKAGE%% *}
 	fi
 	done 
 	unset IFS
@@ -57,9 +62,22 @@
 		tazpkg search-file "$SEARCH" --mirror | list_files > \
 			/tmp/tazpkgbox/search ;;
 	packages)
-		search_package > /tmp/tazpkgbox/search ;;
+		( search_package ;
+		  for i in $(grep ^$SEARCH= /var/lib/tazpkg/packages.equiv | \
+		          cut -d= -f2); do
+		        SEARCH=${i#*:}
+		        search_package
+		  done ) > /tmp/tazpkgbox/search ;;
+	tags)
+		grep -ls TAGS /home/slitaz/wok/*/receipt | while read file; do
+			TAGS=""
+			. $file
+			case "$TAGS" in
+			*$SEARCH*) list_package $PACKAGE ;;
+			esac
+		done > /tmp/tazpkgbox/search ;;
 	*)
-		echo "Usage: $0 [packages|files]" ;;
+		echo "Usage: $0 [packages|files|tags]" ;;
 esac
 
 
diff -r 23dd3368c79a -r 9b57d55f7f65 tazpkgbox
--- a/tazpkgbox	Sat Aug 15 21:43:43 2009 +0000
+++ b/tazpkgbox	Wed Aug 19 20:48:39 2009 +0200
@@ -357,6 +357,17 @@
 				<action>$LIB/search files</action>
 				<action>refresh:RESULT</action>
 			</button>
+'
+tmp='
+			<button>
+				<label>Tags</label>
+				<input file icon="system-search"></input>
+				<action>$LIB/search tags</action>
+				<action>refresh:RESULT</action>
+			</button>
+'
+[ -d /home/slitaz/wok ] && TAZPKG_DIALOG="$TAZPKG_DIALOG $tmp"
+tmp='
 		</hbox>
 	</vbox>
 
@@ -386,6 +397,7 @@
 			<combobox>
 				<variable>UNDIGEST_ENTRY</variable>
 '
+TAZPKG_DIALOG="$TAZPKG_DIALOG $tmp"
 for i in all $(ls /var/lib/tazpkg/undigest 2> /dev/null); do
 	TAZPKG_DIALOG="$TAZPKG_DIALOG <item>$i</item> "
 done