From 78712527eed66929b8147e04d18f000dcb7dfff6 Mon Sep 17 00:00:00 2001 From: Mitch Riedstra Date: Fri, 20 Nov 2020 22:48:46 -0500 Subject: Remove dead code. Remove 32 bit windows builds. --- Build.sh | 4 -- archive/archive.go | 103 ----------------------------------------------- archive/unarchive.go | 85 -------------------------------------- config/config.go | 89 ---------------------------------------- config/config_unix.go | 21 ---------- config/config_windows.go | 22 ---------- 6 files changed, 324 deletions(-) delete mode 100644 archive/archive.go delete mode 100644 archive/unarchive.go delete mode 100644 config/config.go delete mode 100644 config/config_unix.go delete mode 100644 config/config_windows.go diff --git a/Build.sh b/Build.sh index 57b1c16..916394a 100755 --- a/Build.sh +++ b/Build.sh @@ -10,10 +10,6 @@ commands=cli for cmd in $commands ; do -export GOOS=windows -export GOARCH="386" -go build -o bin/steam-export-$GOOS-$GOARCH.exe ./cmd/$cmd - export GOOS=windows export GOARCH=amd64 go build -o bin/steam-export-$GOOS-$GOARCH.exe ./cmd/$cmd diff --git a/archive/archive.go b/archive/archive.go deleted file mode 100644 index 313c062..0000000 --- a/archive/archive.go +++ /dev/null @@ -1,103 +0,0 @@ -package archive - -import ( - "archive/tar" - "path/filepath" - - "compress/gzip" - - "io" - "os" - - "strings" -) - -type Archive struct { - Output string - Input []string - file *os.File -} - -func (a *Archive) Tar(compressionType string) error { - var err error - if a.file, err = os.Create(a.Output); err != nil { - return err - } - - defer a.file.Close() - - var twriter *tar.Writer - - // Set the compression type... if any - switch compressionType { - case "gz": - gzwriter, err := gzip.NewWriterLevel(a.file, gzip.BestSpeed) - if err != nil { - return err - } - defer gzwriter.Close() - // Write to the gzip writer - twriter = tar.NewWriter(gzwriter) - default: - // Write directly to the file - twriter = tar.NewWriter(a.file) - } - - // Close off the tar writer when we're done - defer twriter.Close() - - for _, v := range a.Input { - if err := filepath.Walk(v, TarWalkfn(twriter)); err != nil { - return err - } - } - - return nil - -} - -func TarWalkfn(writer *tar.Writer) filepath.WalkFunc { - return func(path string, info os.FileInfo, err error) error { - if err != nil { - return err - } - - if info.IsDir() { - return nil - } - - f, err := os.Open(path) - if err != nil { - return err - } - defer f.Close() - - // Convert Windows paths to Unix paths - path = strings.Replace(path, "\\", "/", -1) - - // TODO; See if tar.FileInfoheader() could be used instead - // without the pathing issues I encountered - h := &tar.Header{ - Name: path, - Size: info.Size(), - // I don't like it... but it helps with platform compatibility - Mode: 0664, - ModTime: info.ModTime(), - } - - err = writer.WriteHeader(h) - if err != nil { - return err - } - - _, err = io.Copy(writer, f) - if err != nil { - // TODO: Figure out how to add more useful information to - // These errors - // fmt.Fprintln(os.Stderr, f.Name()) - return err - } - - return nil - } -} diff --git a/archive/unarchive.go b/archive/unarchive.go deleted file mode 100644 index 8a5617e..0000000 --- a/archive/unarchive.go +++ /dev/null @@ -1,85 +0,0 @@ -package archive - -import ( - "archive/tar" - fp "path/filepath" - - "compress/gzip" - - "io" - "os" - - "strings" -) - -type Unarchive struct { - Input string - tarReader *tar.Reader -} - -// Extracts a tar arcive to the current working directory -// This will overwrite everything. So be careful -func (u *Unarchive) UnTar(compressionType string) error { - f, err := os.Open(u.Input) - if err != nil { - return err - } - defer f.Close() - - var treader *tar.Reader - - switch compressionType { - case "gz": - gzreader, err := gzip.NewReader(f) - if err != nil { - return err - } - // Read from the gzip reader instead of the file - treader = tar.NewReader(gzreader) - default: - // Read from the file directly - treader = tar.NewReader(f) - } - - for { - hdr, err := treader.Next() - if err == io.EOF { - // We've reached the end! Whoee - break - } - if err != nil { - return err - } - - // Fix windows slashes... - fileName := strings.Replace(hdr.Name, "\\", "/", -1) - - info := hdr.FileInfo() - if info.IsDir() { - // I don't like hard-coded permissions but it - // it helps with overall platform compatibility - if err = os.MkdirAll(fileName, 0775); err != nil { - return err - } - continue - } - - if err = os.MkdirAll(fp.Dir(fileName), 0775); err != nil { - return err - } - - // Create a file handle to work with - // f, err := os.Create(fileName) - f, err := os.OpenFile(fileName, os.O_CREATE|os.O_TRUNC|os.O_WRONLY, 0664) - if err != nil { - return err - } - defer f.Close() - if _, err := io.Copy(f, treader); err != nil { - return err - } - - } - - return nil -} diff --git a/config/config.go b/config/config.go deleted file mode 100644 index 839acbf..0000000 --- a/config/config.go +++ /dev/null @@ -1,89 +0,0 @@ -// Used to define and load this application's specific configuration -package config - -import ( - "gopkg.in/yaml.v2" - "io/ioutil" - "os" - "os/exec" -) - -type Config struct { - SteamRepositories []string `yaml:"SteamRepositories"` - DefaultRepository string `yaml:"DefaultRepository"` - Listen string -} - -var configFilename string = "steam-export.yml" - -// By default it reads 'config.yml' in the current directory -func LoadConfig() (*Config, error) { - c := &Config{} - err := c.ReadDefaultConfig() - return c, err -} - -func (c *Config) ReadConfig(cfg string) error { - contents, err := ioutil.ReadFile(cfg) - if err != nil { - return err - } - return yaml.Unmarshal([]byte(contents), c) -} - -func checkConfigFile(cf string) error { - // Check if our config file exists, or create it - if _, err := os.Stat(cf); err != nil { - if f, err := os.Create(cf); err != nil { - return err - } else { - f.WriteString(` ---- -listen: 0.0.0.0:9413 -# Repositories that you want to expose on the web server -SteamRepositories: - # We're ideally looking for the full path to the steamapps folder - # On windows you're going to escape the slashes - - "C:\\Program Files (x86)\\Steam\\steamapps" - # - "/usr/mitch/SteamGames/steamapps" - -# This defaults to: -# Only change this if your default Steam library is different than the Steam default -# DefaultRepository: "/usr/mitch/SteamGames/steamapps" -# DefaultRepository: "Z:\\SteamGames\\steamapps" -`) - f.Close() - } - } - return nil -} - -func (c *Config) ReadDefaultConfig() error { - if err := c.ReadConfig(configFilename); err != nil { - if err = checkConfigFile(fn); err != nil { - return err - } - return c.ReadConfig(fn) - } - return nil -} - -func EditDefaultConfig(e string) error { - if e != "" { - editor = e - } - - if _, err := os.Stat(configFilename); err != nil { - if _, err := os.Stat(fn); err != nil { - return err - } - c := exec.Command(editor, fn) - c.Stdout = os.Stdout - c.Stdin = os.Stdin - c.Stderr = os.Stderr - return c.Run() - } - cmd := exec.Command(editor, configFilename) - return cmd.Run() - -} diff --git a/config/config_unix.go b/config/config_unix.go deleted file mode 100644 index 8be1967..0000000 --- a/config/config_unix.go +++ /dev/null @@ -1,21 +0,0 @@ -// +build darwin dragonfly freebsd linux nacl netbsd openbsd solaris - -package config - -import ( - "os" - "path/filepath" -) - -var ( - editor string = setEditor() - fn string = filepath.Join(os.Getenv("HOME"), "."+configFilename) -) - -func setEditor() string { - e := os.Getenv("EDITOR") - if e == "" { - return "vi" - } - return e -} diff --git a/config/config_windows.go b/config/config_windows.go deleted file mode 100644 index 39b6b6c..0000000 --- a/config/config_windows.go +++ /dev/null @@ -1,22 +0,0 @@ -// +build windows - -package config - -import ( - "os" - // "os/exec" - "path/filepath" -) - -var ( - editor string = setEditor() - fn string = filepath.Join(os.Getenv("LOCALAPPDATA"), configFilename) -) - -func setEditor() string { - e := os.Getenv("EDITOR") - if e == "" { - return `C:\Program Files\Windows NT\Accessories\wordpad.exe` - } - return e -} -- cgit v1.2.3