Add NewUnionFsFromRoots(), which automatically mounts zip/tar archives.

example/unionfs/main.go

@@ -3,6 +3,7 @@ package main
 import (
 	"flag"
 	"fmt"
+	"log"
 	"github.com/hanwen/go-fuse/fuse"
 	"github.com/hanwen/go-fuse/unionfs"
 	"os"
@@ -28,16 +29,14 @@ func main() {
 		DeletionDirName:      *deldirname,
 	}
 
-	fses := make([]fuse.FileSystem, 0)
-	for _, r := range flag.Args()[1:] {
-		fses = append(fses, fuse.NewLoopbackFileSystem(r))
+	ufs, err := unionfs.NewUnionFsFromRoots(flag.Args()[1:], &ufsOptions)
+	if err != nil {
+		log.Fatal("Cannot create UnionFs", err)
+		os.Exit(1)
 	}
-	
-	ufs := unionfs.NewUnionFs("unionfs", fses, ufsOptions)
 	mountState, _, err := fuse.MountFileSystem(flag.Arg(0), ufs, nil)
 	if err != nil {
-		fmt.Printf("Mount fail: %v\n", err)
-		os.Exit(1)
+		log.Fatal("Mount fail:", err)
 	}
 
 	mountState.Debug = *debug

unionfs/Makefile

@@ -7,7 +7,8 @@ GOFILES=unionfs.go \
 	timedcache.go \
 	cachingfs.go \
 	autounion.go \
+	create.go
 
-DEPS=../fuse
+DEPS=../fuse ../zipfs
 
 include $(GOROOT)/src/Make.pkg

unionfs/autounion.go

@@ -93,15 +93,13 @@ func (me *AutoUnionFs) createFs(name string, roots []string) (*UnionFs, fuse.Sta
 		return gofs, fuse.OK
 	}
 
-	fses := make([]fuse.FileSystem, 0)
-	for _, r := range roots {
-		fses = append(fses, fuse.NewLoopbackFileSystem(r))
+	ufs, err := NewUnionFsFromRoots(roots, &me.options.UnionFsOptions)
+	if err != nil {
+		log.Println("Could not create UnionFs:", err)
+		return nil, fuse.EPERM
 	}
-	identifier := fmt.Sprintf("%v", roots)
-	log.Println("Adding UnionFs for", identifier)
-	gofs = NewUnionFs(identifier, fses, me.options.UnionFsOptions)
 
-	me.knownFileSystems[name] = gofs
+	me.knownFileSystems[name] = ufs
 	me.nameRootMap[name] = roots[0]
 
 	return gofs, fuse.OK

unionfs/create.go

+package unionfs
+
+import (
+	"fmt"
+	"github.com/hanwen/go-fuse/fuse"
+	"github.com/hanwen/go-fuse/zipfs"
+	"log"
+	"os"
+)
+
+func NewUnionFsFromRoots(roots []string, opts *UnionFsOptions) (*UnionFs, os.Error) {
+	fses := make([]fuse.FileSystem, 0)
+	for _, r := range roots {
+		var fs fuse.FileSystem
+		fi, err := os.Stat(r)
+		if err != nil {
+			return nil, err
+		}
+		if fi.IsDirectory() {
+			fs = fuse.NewLoopbackFileSystem(r)
+		}
+		if fs == nil {
+			fs, err = zipfs.NewArchiveFileSystem(r)
+		}
+		if fs == nil {
+			return nil, err
+		}
+
+		fses = append(fses, fs)
+	}
+
+	identifier := fmt.Sprintf("%v", roots)
+	log.Println("Adding UnionFs for", identifier)
+	return NewUnionFs(identifier, fses, *opts), nil
+}