Layersets now can be moved correctly

scripts/getActiveDoc.jsx

@@ -10,7 +10,7 @@ function layers(lyrs) {
 		var lyr = lyrs[i];
 		stdout.write(('{"Name":"' + lyr.name + '", "Bounds": [[' + lyr.bounds[0] + ',' +
 	                     lyr.bounds[1] + '],[' + lyr.bounds[2] + ',' + 
-	                     lyr.bounds[3] + ']], "Visible": ' + lyr.visible+',"Text":').replace(/ px/g, ""));
+	                     lyr.bounds[3] + ']], "Visible": ' + lyr.visible+', "Text":').replace(/ px/g, ""));
 	if (lyr.kind == LayerKind.TEXT)
 		stdout.write('"'+lyr.textItem.contents+'"');
 	else
@@ -29,7 +29,7 @@ function lyrSets(sets, nm) {
 	for (var i = 0; i < sets.length; i++) {
 		var set = sets[i];
 		var name = nm + set.name + "/";
-		stdout.write('{"Name": "' + set.name + '"}');
+		stdout.write('{"Name": "' + set.name + '", "Visible":'+ set.visible +'}');
 		if (i+1 != sets.length)
 			stdout.write(',');
 	}

scripts/getLayerSet.jsx

@@ -1,7 +1,7 @@
 #include lib.js
 var stdout = newFile(arguments[0]);
 var set = eval(arguments[1]);
-stdout.writeln('{"Name": "'+set.name+'", "ArtLayers":[');
+stdout.writeln('{"Name": "'+set.name+'", "Visible": '+ set.visible +', "ArtLayers":[');
 stdout.flush();
 for (var i = 0; i < set.artLayers.length; i++) {
 	var lyr = set.artLayers[i];

scripts/layerSetBounds.jsx

@@ -0,0 +1,11 @@
+#include lib.js
+var stdout = newFile(arguments[0]);
+var set = eval(arguments[1]);
+app.activeDocument.activeLayer=set;
+set.merge();
+set=eval(arguments[2]);
+stdout.write(('[[' + set.bounds[0] + ',' +
+		set.bounds[1] + '],[' + set.bounds[2] + ',' + 
+	    set.bounds[3] + ']]').replace(/ px/g, ""));
+Undo();
+stdout.close();

scripts/moveLayer.jsx

@@ -3,11 +3,9 @@ var stdout = newFile(arguments[0]);
 var lyr = eval(arguments[1]);
 lyr.translate((Number)(arguments[2]), (Number)(arguments[3]));
 if (lyr.typename == 'LayerSet') {
-	alert(lyr.name + "\n" + lyr.typename)
-	alert(lyr)
-	// lyr.merge()
-	// lyr=eval(arguments[4])
-	// Undo();
+	lyr.merge()
+	lyr=eval(arguments[4])
+	Undo();
 }
 stdout.writeln('{' + bounds(lyr) + '}')
 stdout.close();

scripts/test.jsx

@@ -1,8 +1,10 @@
 #include lib.js
 
 // var saveFile = File(arguments[0]);
-var arg = 'app.activeDocument.layerSets.getByName("Indicators").layerSets.getByName("Deck")';
-alert(arg.replace(/[^(?:layerSets)]*(layerSets)/, "artLayers"))
+var arg = 'app.activeDocument.layerSets.getByName("ResolveGem");';
+var set = eval(arg);
+set.visible=false;
+alert(set.visible)
 // var doc=app.activeDocument
 // doc.layerSets.getByName("ResolveGem").merge();
 // alert(doc.artLayers.getByName("ResolveGem").bounds); 

structs.go

@@ -91,6 +91,9 @@ func (d *Document) LayerSets() []*LayerSet {
 func (d *Document) LayerSet(name string) *LayerSet {
 	for _, set := range d.layerSets {
 		if set.name == name {
+			if Mode != Fast && !set.current {
+				set.Refresh()
+			}
 			return set
 		}
 	}
@@ -124,8 +127,8 @@ func ActiveDocument() (*Document, error) {
 	if err != nil {
 		return nil, err
 	}
-	d.name = string(byt)
-	if Mode != 1 {
+	d.name = strings.TrimRight(string(byt), "\r\n")
+	if Mode != Safe {
 		byt, err = ioutil.ReadFile(d.Filename())
 		if err == nil {
 			log.Println("Previous version found, loading")
@@ -137,7 +140,15 @@ func ActiveDocument() (*Document, error) {
 	}
 	log.Println("Loading manually (This could take awhile)")
 	byt, err = DoJs("getActiveDoc.jsx")
+	if err != nil {
+		log.Panic(err)
+	}
 	err = json.Unmarshal(byt, &d)
+	if err != nil {
+		d.Dump()
+		fmt.Println(string(byt))
+		log.Panic(err)
+	}
 	for _, lyr := range d.artLayers {
 		lyr.SetParent(d)
 	}
@@ -317,6 +328,9 @@ func (a *ArtLayer) SetStroke(stk Stroke, fill Color) {
 		a.SetColor(fill)
 		return
 	}
+	if fill == nil {
+		fill = a.Color
+	}
 	if stk.Size == a.Stroke.Size && stk.Color.RGB() == a.Stroke.Color.RGB() {
 		if a.Color.RGB() == fill.RGB() {
 			if Mode == 2 || (Mode == 0 && a.current) {
@@ -466,6 +480,7 @@ type LayerSet struct {
 type LayerSetJSON struct {
 	Name      string
 	Bounds    [2][2]int
+	Visible   bool
 	ArtLayers []*ArtLayer
 	LayerSets []*LayerSet
 }
@@ -474,6 +489,7 @@ func (l *LayerSet) MarshalJSON() ([]byte, error) {
 	return json.Marshal(&LayerSetJSON{
 		Name:      l.name,
 		Bounds:    l.bounds,
+		Visible:   l.visible,
 		ArtLayers: l.artLayers,
 		LayerSets: l.layerSets,
 	})
@@ -486,6 +502,7 @@ func (l *LayerSet) UnmarshalJSON(b []byte) error {
 	}
 	l.name = tmp.Name
 	l.bounds = tmp.Bounds
+	l.visible = tmp.Visible
 	l.artLayers = tmp.ArtLayers
 	for _, lyr := range l.artLayers {
 		lyr.SetParent(l)
@@ -608,27 +625,44 @@ func NewLayerSet(path string, g Group) (*LayerSet, error) {
 		out.layerSets[i] = s
 		s.SetParent(out)
 	}
+	out.current = true
 	return out, err
 }
 
+func (l *LayerSet) Visible() bool {
+	return l.visible
+}
+
 // SetVisible makes the LayerSet visible.
 func (l *LayerSet) SetVisible(b bool) {
 	if l.visible == b {
 		return
 	}
-	l.visible = b
-	js := fmt.Sprintf("%s%v", JSLayer(strings.TrimRight(l.Path(), ";")), b)
+	js := fmt.Sprintf("%s.visible=%v;", strings.TrimRight(
+		JSLayer(l.Path()), ";"), b)
 	DoJs("compilejs.jsx", js)
+	l.visible = b
 }
 
 // SetPos snaps the given layerset boundry to the given point.
 // Valid options for bound are: "TL", "TR", "BL", "BR"
-//
-// TODO: Test TR and BR
 func (l *LayerSet) SetPos(x, y int, bound string) {
-	// if !l.visible || (x == 0 && y == 0) {
-	// return
-	// }
+	if !l.visible || (x == 0 && y == 0) {
+		return
+	}
+	byt, err := DoJs("LayerSetBounds.jsx", JSLayer(l.Path()),
+		JSLayer(l.Path(), true))
+	if err != nil {
+		log.Println(string(byt))
+		log.Panic(err)
+	}
+	var bnds *[2][2]int
+	err = json.Unmarshal(byt, &bnds)
+	if err != nil {
+		fmt.Println(string(byt))
+		log.Panic(err)
+	}
+	l.bounds = *bnds
 	var lyrX, lyrY int
 	switch bound[:1] {
 	case "B":
@@ -646,8 +680,7 @@ func (l *LayerSet) SetPos(x, y int, bound string) {
 	default:
 		lyrX = l.bounds[0][0]
 	}
-	fmt.Println(JSLayer(l.Path()), fmt.Sprint(x-lyrX), fmt.Sprint(y-lyrY))
-	byt, err := DoJs("moveLayer.jsx", JSLayer(l.Path()), fmt.Sprint(x-lyrX),
+	byt, err = DoJs("moveLayer.jsx", JSLayer(l.Path()), fmt.Sprint(x-lyrX),
 		fmt.Sprint(y-lyrY), JSLayer(l.Path(), true))
 	if err != nil {
 		fmt.Println("byte:", string(byt))