Index: server/teapot_index
==================================================================
--- server/teapot_index
+++ server/teapot_index
@@ -6,10 +6,20 @@
}
set srcdir [file normalize [lindex $argv 0]]
set dstdir [file normalize [lindex $argv 1]]
+# Define requirements for entities
+## Must be sync'd with [teapot_index]
+set entity_definition(package) [list name ver arch]
+
+# Define maping of field name to text
+set entity_fieldnames([list package name]) "Name"
+set entity_fieldnames([list package ver]) "Version"
+set entity_fieldnames([list package arch]) "Platform"
+set entity_fieldnames([list entity]) "What"
+
# Index all packages
proc teapot_index {srcdir} {
array set pkginfo [list]
foreach pkgdir [glob -directory $srcdir -type d */out/*] {
@@ -87,25 +97,87 @@
return [array get pkginfo]
}
proc generate_tpm {entlist} {
+ set pkgs [list]
+ foreach part $entlist {
+ set pkginfo [list]
+ foreach enttype $part {
+ set pkg [lindex $enttype 0]
+ lappend pkginfo $pkg
+ }
+ lappend pkgs $pkginfo
+ }
+
set ret {}
return $ret
}
+
+proc complete_entpath {type entinfo_arrlist} {
+ array set entinfo $entinfo_arrlist
+
+ set req_fields $::entity_definition($type)
+
+ set retval [list $type]
+
+ foreach req_field $req_fields {
+ if {![info exists entinfo($req_field)]} {
+ return ""
+ }
+
+ lappend retval $req_field $entinfo($req_field)
+ }
+
+ return $retval
+}
proc generate_table {fields numitems} {
set ret ""
foreach field $fields {
append ret " \n"
- foreach part [lrange $field 0 [expr $numitems - 1]] {
- append ret " | $part | \n"
+ unset -nocomplain entinfo
+ foreach enttype [lrange $field 0 [expr $numitems - 1]] {
+ set item [lindex $enttype 0]
+ set type [lindex $enttype 1]
+
+ set entinfo($type) $item
+ }
+
+ if {[info exists entinfo(entity)]} {
+ set entity_type $entinfo(entity)
+
+ set req_fields $::entity_definition($entity_type)
+ }
+
+ set entpath_parts [list]
+
+ foreach enttype [lrange $field 0 [expr $numitems - 1]] {
+ set item [lindex $enttype 0]
+ set type [lindex $enttype 1]
+
+ if {$type != "entity"} {
+ lappend entpath_parts $type $item
+ }
+
+ set complete_entpath_parts ""
+ if {[info exists entity_type]} {
+ set complete_entpath_parts [complete_entpath $entity_type $entpath_parts]
+ }
+
+ if {$complete_entpath_parts == ""} {
+ set entpath [join [join [list entity $entpath_parts]] /]
+ } else {
+ set entpath [join $complete_entpath_parts /]
+ }
+
+ append ret " $item | \n"
}
append ret "
\n"
}
@@ -115,20 +187,24 @@
# Create "index.html"
proc create_output_index {dstdir pkginfo_arrlist} {
array set pkginfo $pkginfo_arrlist
set indexfile [file join $dstdir index.html]
+ set altindexfile [file join $dstdir entity index.html]
set pkglist [list]
foreach ent [array names pkginfo] {
set pkg [lindex $ent 0]
- if {[lsearch -exact $pkglist $pkg] != -1} {
+ set addent [list [list $pkg name]]
+ if {[lsearch -exact $pkglist $addent] != -1} {
continue
}
- lappend pkglist $pkg
+ lappend pkglist $addent
}
+
+ set pkglist [lsort -dictionary $pkglist]
set fd [open $indexfile w]
puts $fd ""
puts $fd " "
puts $fd " List of all entities"
@@ -140,10 +216,14 @@
puts $fd [generate_table $pkglist 1]
puts $fd " "
puts $fd " "
puts $fd ""
close $fd
+
+ file delete -- $altindexfile
+ file mkdir [file dirname $altindexfile]
+ file link -hard $altindexfile $indexfile
}
# Create "package/list"
proc create_output_pkglist {dstdir pkginfo_arrlist} {
array set pkginfo $pkginfo_arrlist
@@ -159,12 +239,14 @@
foreach ent [array names pkginfo] {
set pkg [lindex $ent 0]
set ver [lindex $ent 1]
set arch [lindex $ent 2]
- lappend pkglist [list package $pkg $ver $arch 0]
+ lappend pkglist [list [list package entity] [list $pkg name] [list $ver ver] [list $arch arch] [list 0 unknown]]
}
+
+ set pkglist [lsort -dictionary $pkglist]
set fd [open $indexfile w]
puts $fd ""
puts $fd " "
puts $fd " List of all packages"
@@ -183,11 +265,11 @@
puts $fd " "
puts $fd " "
puts $fd ""
close $fd
- file delete $altindexfile
+ file delete -- $altindexfile
file link -hard $altindexfile $indexfile
}
# Create "package/name//ver//arch//file"
proc create_output_files {dstdir pkginfo_arrlist {force 0}} {
@@ -216,11 +298,11 @@
}
if {[catch {
cd $pkgdir
- file delete $extfile
+ file delete -- $extfile
exec zip -r $extfile . -x build.log
} err]} {
puts "Error while zipping: $err"
}
} else {
@@ -227,14 +309,203 @@
set origfile [lindex [glob $pkgdir *] 0]
file copy -force -- $origfile $extfile
}
- file delete $regfile
+ file delete -- $regfile
file link -hard $regfile $extfile
}
}
+
+proc create_entity_file {entity dstdir pkginfo_arrlist} {
+ array set pkginfo $pkginfo_arrlist
+ array set entinfo $entity
+
+ if {![info exists entinfo(entity)]} {
+ return
+ }
+
+ set entity_type $entinfo(entity)
+ set req_fields $::entity_definition($entity_type)
+
+ set complete 1
+ set pkgpat [list]
+ set dispfields [list]
+ foreach req_field $req_fields {
+ if {![info exists entinfo($req_field)]} {
+ set complete 0
+
+ lappend pkgpat "*"
+ if {![info exists pkgnextlevel]} {
+ set pkgnextlevel $req_field
+ lappend dispfields $req_field
+ }
+ } else {
+ lappend pkgpat $entinfo($req_field)
+ lappend dispfields $req_field
+ }
+ }
+
+ if {$complete} {
+ set entpath_parts [list $entity_type]
+
+ foreach req_field $req_fields {
+ lappend entpath_parts $req_field $entinfo($req_field)
+ }
+ } else {
+ set entpath_parts [list entity]
+
+ foreach req_field $req_fields {
+ if {[info exists entinfo($req_field)]} {
+ lappend entpath_parts $req_field $entinfo($req_field)
+ }
+ }
+ }
+
+ set entpath [join $entpath_parts /]
+
+ if {[string match "/*" $entpath]} {
+ return
+ }
+
+ set indexfile [file join $dstdir $entpath index.html]
+ set tmpindexfile [file join $dstdir $entpath index.html.tmp]
+
+ catch {
+ file mkdir [file dirname $indexfile]
+ }
+
+ set fd [open $tmpindexfile w]
+
+ puts $fd ""
+ puts $fd " "
+ puts $fd " "
+ puts $fd " "
+ puts $fd " "
+ puts $fd " "
+
+ set pkglist [list]
+ if {!$complete} {
+ foreach pkgent [array names pkginfo $pkgpat] {
+ unset -nocomplain currpkginfo
+ for {set idx 0} {$idx < [llength $req_fields]} {incr idx} {
+ set field [lindex $req_fields $idx]
+ set value [lindex $pkgent $idx]
+ set currpkginfo($field) $value
+ }
+
+ set currpkgdata [list [list $entity_type entity]]
+ foreach dispfield $dispfields {
+ lappend currpkgdata [list $currpkginfo($dispfield) $dispfield]
+ }
+
+ if {[lsearch -exact $pkglist $currpkgdata] != -1} {
+ continue
+ }
+
+ lappend pkglist $currpkgdata
+ }
+
+ puts $fd [generate_tpm $pkglist]
+
+ puts $fd " $pkgnextlevel
"
+ puts $fd " "
+ puts $fd " "
+ foreach dispfield [join [list entity $dispfields]] {
+ if {[info exists ::entity_fieldnames([list $entity_type $dispfield])]} {
+ set dispfieldheader $::entity_fieldnames([list $entity_type $dispfield])
+ } else {
+ set dispfieldheader $::entity_fieldnames([list $dispfield])
+ }
+ puts $fd " | $dispfieldheader | "
+ }
+ puts $fd "
"
+
+ puts $fd [generate_table $pkglist 10]
+
+ puts $fd "
"
+ } else {
+ set dispname_list [list]
+ set pathname_list [list $entity_type]
+ foreach field $req_fields {
+ lappend dispname_list $entinfo($field)
+ lappend pathname_list $field $entinfo($field)
+ }
+ set key $dispname_list
+ array set currpkginfo $pkginfo($key)
+
+ set pathname_dir "[join $pathname_list /]"
+ set pathname_dirlocal [file join $dstdir $pathname_dir]
+ set pathname_tail $currpkginfo(extfile)
+ if {$pathname_tail == ""} {
+ set pathname_tail "file"
+ }
+ set pathname_uri "/$pathname_dir/$pathname_tail"
+
+ puts $fd " Details of $entity_type [join $dispname_list]
"
+ puts $fd " Package archive
"
+ puts $fd " Details
"
+ puts $fd " "
+ puts $fd " "
+ puts $fd " | Key | "
+ puts $fd " Value | "
+ puts $fd "
"
+
+ foreach descfield [list rsk::build::date category description license platform require summary] {
+ if {![info exists currpkginfo($descfield)]} {
+ continue
+ }
+ set descval $currpkginfo($descfield)
+ switch -- $descfield {
+ "require" {
+ catch {
+ set descval [join $descval {, }]
+ }
+ }
+ }
+
+ puts $fd " "
+ puts $fd " | $descfield | "
+
+ puts $fd " $descval | "
+ puts $fd "
"
+ }
+ puts $fd "
"
+ }
+
+ puts $fd " "
+ puts $fd ""
+
+ close $fd
+
+ file rename -force -- $tmpindexfile $indexfile
+}
+
+proc create_all_entity_files {dstdir pkginfo_arrlist} {
+ set entfields $::entity_definition(package)
+
+ array set pkginfo $pkginfo_arrlist
+
+ set seen_entities [list]
+ foreach pkgdata [lsort -dictionary [array names pkginfo]] {
+ unset -nocomplain entity
+ lappend entity entity package
+
+ for {set endidx 0} {$endidx < [llength $entfields]} {incr endidx} {
+ lappend entity [lindex $entfields $endidx]
+ lappend entity [lindex $pkgdata $endidx]
+
+ if {[lsearch -exact $seen_entities $entity] != -1} {
+ continue
+ }
+ lappend seen_entities $entity
+
+ create_entity_file $entity $dstdir $pkginfo_arrlist
+ }
+ }
+}
set pkginfo [teapot_index $srcdir]
create_output_index $dstdir $pkginfo
create_output_pkglist $dstdir $pkginfo
create_output_files $dstdir $pkginfo
+create_all_entity_files $dstdir $pkginfo