X-Git-Url: https://pd.if.org/git/?a=blobdiff_plain;f=zpm-pkginfo;h=ff55481c27e4022e66cd80caaabe6d1e9189c7b9;hb=62f6ff407bc4f2cf03d1fa7cf3dc9a3f4026624a;hp=93326e50d1e6b27e7590d387f7f14ca527cab16d;hpb=ecdd57da7df775c039aee834e1f74172004f352b;p=zpackage

diff --git a/zpm-pkginfo b/zpm-pkginfo
index 93326e5..ff55481 100755
--- a/zpm-pkginfo
+++ b/zpm-pkginfo
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 package=${1:-$ZPMPACKAGE}
-shift
 pkgver=${ZPMPACKAGEVER:-1.0}
 pkgrel=${ZPMPACKAGEREL:-1}
 
@@ -27,23 +26,106 @@ while getopts :f:v:r:d:a:u:l:p:b:P: opt; do
 	esac
 done
 
+pkgfile=$1
+
 set -e
 if [ -z "$pkgfile" ]; then
 	pkgfile="$package-$pkgver-$pkgrel.zpm"
 fi
 
-appid=$(sqlite3 $pkgfile 'pragma application_id;' | ( echo obase = 16; cat - ) | bc)
-if [ "$appid" != "5A504442" ]; then
-	echo $pkgfile does not appear to be a zpm package file
-	exit 1
-fi
+zpm-test -v $pkgfile
+pkg=$(zpm-findpkg -f $pkgfile)
 
+#.mode line
 {
-sqlite3 $pkgfile <<EOS
-.mode line
-select * from packages where package = '$package' and version = '$pkgver' and release = $pkgrel
+zpm shell $pkgfile <<-EOS
+select 
+	printf('Package: %s
+	Version: %s
+	Release: %s
+	URL: %s
+	License: %s
+	Packager: %s
+	Description: %s
+	Buildtime: %s
+	Content-Checksum: %s
+	',
+	package, version, release, url, licenses, packager,description,
+	strftime('%Y-%m-%dT%H:%M:%S', build_time, 'unixepoch'),
+	NULL
+	)
+from packages
+where 
+'$pkg' = package||'-'||version||'-'||release
 ;
 EOS
-} | sed -e 's/ = /=/' -e 's/^ \+//'
+
+#mode user group hash mtime csvtags path
+
+zpm shell $pkgfile <<-EOS
+.header off
+select
+	printf('%s %s %s %s %s %s %s',
+	F.mode, F.username, F.groupname,
+	case when F.filetype = 'c' then
+	       	F.devmajor || ',' || F.devminor
+	when F.filetype = 'd' then
+		'directory'
+	else
+		F.hash
+	end 
+	,strftime('%Y-%m-%dT%H:%M:%S', F.mtime, 'unixepoch')
+	, coalesce(T.tags, '-')
+	,F.path)
+from packagefiles as F
+left join (
+	select TG.package, TG.version, TG.release, TG.path
+	,group_concat(tag) as tags
+	from pathtags TG
+	group by package, version, release, path
+) T
+on T.package = F.package and T.version = F.version and T.release = F.release
+and T.path = F.path
+-- apparently going to have to do this in C because there's
+-- no way to order the aggregated tags
+where 
+'$pkg' = F.package||'-'||F.version||'-'||F.release
+;
+EOS
+}
 
 exit 0
+
+        path    text, -- filesystem path
+        mode    text, -- perms, use text for octal rep?
+        username        text, -- name of owner
+        groupname       text, -- group of owner
+        uid     integer, -- numeric uid, generally ignored
+        gid     integer, -- numeric gid, generally ignored
+        filetype varchar default 'r',
+        -- r regular file
+        -- d directory
+        -- s symlink
+        -- h hard link -- not supported
+        -- c character special and b device special files add dev number column
+        -- b block special
+        -- p fifos (i.e. pipe)
+        target  text, -- link target for links
+        -- device file dev numbers, should probably be a separate table
+        devmajor        integer,
+        devminor        integer,
+        hash    text, -- null if no actual content, i.e. anything but a regular file
+        mtime   integer,
+
+Package:
+Version:
+Release:
+URL:
+License:
+Packager:
+Description:
+Buildtime:
+Content-Checksum:
+
+mode user group hash mtime csvtags path
+following order by path