imports and stuff

parts/ag/unpacker.go

@@ -2,14 +2,12 @@ package gsag
 
 import (
 	"bytes"
+	"fmt"
 	"io"
-	"io/ioutil"
+//	"io/ioutil"
 	"log"
 	"os"
 	"path/filepath"
-
-//	"github.com/eyedeekay/checki2cp"
-//	. "github.com/eyedeekay/go-fpw"
 )
 
 func userFind() string {
@@ -25,58 +23,35 @@ func userFind() string {
 
 var userdir = filepath.Join(userFind(), "/i2p/firefox-profiles")
 
-func writeExtension(val os.FileInfo, system *fs) bool {
-	var firstrun = false
-	if len(val.Name()) > 3 {
-		if !val.IsDir() {
-			file, err := system.Open(val.Name())
-			if err != nil {
-				log.Fatal(err.Error())
-			}
-			sys := bytes.NewBuffer(nil)
-			if _, err := io.Copy(sys, file); err != nil {
-				log.Fatal(err.Error())
-			}
-			log.Println(val.Name()[len(val.Name())-3:], "== xpi")
-			if val.Name()[len(val.Name())-3:] == "xpi" {
-				extension := filepath.Join(userdir, "extensions", val.Name())
-				if _, err := os.Stat(extension); os.IsNotExist(err) {
-					if err := ioutil.WriteFile(extension, sys.Bytes(), val.Mode()); err == nil {
-						//ARGS = append(ARGS, extension)
-						log.Println("wrote", extension)
-					} else {
-						log.Fatal(err)
-					}
-					firstrun = true
-				}
-			} else {
-				log.Println(filepath.Join(userdir, val.Name()), "ignored")
-			}
+func writeFile(val os.FileInfo, system *fs) ([]byte, error) {
+	if !val.IsDir() {
+		file, err := system.Open(val.Name())
+		if err != nil {
+			return nil, err
+		}
+		sys := bytes.NewBuffer(nil)
+		if _, err := io.Copy(sys, file); err != nil {
+			return nil, err
+		} else {
+			return sys.Bytes(), nil
 		}
 	} else {
 		log.Println(filepath.Join(userdir, val.Name()), "ignored", "contents", val.Sys())
 	}
-	return firstrun
+	return nil, fmt.Errorf("undefined unpacker error")
 }
 
-func writeProfile(FS *fs) bool {
-	var firstrun = false
+func WriteBrowser(FS *fs) ([]byte, error) {
 	if embedded, err := FS.Readdir(-1); err != nil {
 		log.Fatal("Extension error, embedded extension not read.", err)
 	} else {
-		os.MkdirAll(filepath.Join(userdir, "extensions"), 0755)
-		/*err := ioutil.WriteFile(filepath.Join(userdir, "extension-settings.json"), []byte(EXTENSIONPREFS), 0644)
-		if err != nil {
-			log.Fatal(err)
-		}*/
 		for _, val := range embedded {
 			if val.IsDir() {
 				os.MkdirAll(filepath.Join(userdir, val.Name()), val.Mode())
 			} else {
-				firstrun = writeExtension(val, FS)
+				return writeFile(val, FS)
 			}
 		}
 	}
-	return firstrun
+	return nil, nil
 }
-