Add datastore to snapshots, force Datastore display when jail exist on multi datastores

cmd/struct.go

@@ -27,7 +27,8 @@ type Jail struct {
 	Running       bool
 	// No need, Config.Release always represent what is running (plus it know release for non-running jails)
 	//Release					string
-	Zpool string
+	Zpool         string
+	Datastore     string
 }
 
 // iocage struct as stored in config.json
@@ -191,11 +192,11 @@ type Mount struct {
 type Snapshot struct {
 	// snapshot name is stored after '@' in dataset name
 	Name       string
-	Dsname     string
+	Datastore  string
 	Jailname   string
 	Mountpoint string
-	Used       string
-	Referenced string
+	Used       uint64
+	Referenced uint64
 	Creation   time.Time
 }
 
@@ -215,6 +216,8 @@ type JailSort struct {
 	ConfigPathDec   jailLessFunc
 	RunningInc      jailLessFunc
 	RunningDec      jailLessFunc
+	DatastoreInc    jailLessFunc
+	DatastoreDec    jailLessFunc
 	ZpoolInc        jailLessFunc
 	ZpoolDec        jailLessFunc
 	Config          JailConfigSort
@@ -498,8 +501,8 @@ type JailConfigSort struct {
 type SnapshotSort struct {
 	NameInc       snapshotLessFunc
 	NameDec       snapshotLessFunc
-	DsnameInc     snapshotLessFunc
-	DsnameDec     snapshotLessFunc
+	DatastoreInc  snapshotLessFunc
+	DatastoreDec  snapshotLessFunc
 	JailnameInc   snapshotLessFunc
 	JailnameDec   snapshotLessFunc
 	MountpointInc snapshotLessFunc