diff --git a/cmd/ytpm/add.go b/cmd/ytpm/add.go new file mode 100644 index 0000000..be7e8e1 --- /dev/null +++ b/cmd/ytpm/add.go @@ -0,0 +1,75 @@ +package main + +import ( + "os" + "fmt" + "go.yaml.in/yaml/v4" +) + +func AddSource(url, subfolder string) error { + cwd, err := os.Getwd() + if err != nil { + return err + } + + lstat, err := os.Lstat(cwd) + if err != nil { + return err + } + + manifestPath := cwd + "/manifest.yaml" + manifest, err := os.OpenFile(manifestPath, os.O_RDWR, lstat.Mode()) + if err != nil { + return err + } + + stat, err := manifest.Stat() + if err != nil { + return err + } + + data := make([]byte, stat.Size()) + n, err := manifest.Read(data) + if n != len(data) { + return fmt.Errorf("Not all data read from manifest (read %d bytes, wanted %d bytes)", n, len(data)) + } + + manifestData := Manifest{} + // Thank you S. Diego on stack overflow for telling someone + // to use a pointer. I wish I found your answer sooner + // + // https://stackoverflow.com/questions/45809746/reflect-value-set-using-unaddressable-value#45811129 + err = yaml.Unmarshal(data, &manifestData) + if err != nil { + return err + } + + if subfolder == "" { + subfolder = "default" + } + + /* */ + if manifestData.Sources[subfolder] == nil { + manifestData.Sources[subfolder] = []string{} + } + // */ + manifestData.Sources[subfolder] = append(manifestData.Sources[subfolder], url) + fmt.Println(manifestData) + + mf, err := yaml.Marshal(manifestData) + if err != nil { + return err + } + + n, err = manifest.WriteAt(mf, 0) + if err != nil { + return err + } + + if n != len(mf) { + return fmt.Errorf("Not all data written to manifest (wrote %d bytes, expected %d bytes)", n, len(data)) + } + // */ + + return nil +} diff --git a/cmd/ytpm/init.go b/cmd/ytpm/init.go new file mode 100644 index 0000000..bd33fc1 --- /dev/null +++ b/cmd/ytpm/init.go @@ -0,0 +1,72 @@ +package main + +import ( + "os" + "fmt" + "os/user" + "errors" + "go.yaml.in/yaml/v4" +) + +func InitProject(projectName, projectDir string) error { + if projectName == "" { + return errors.New("missing project name") + } + // Set path + var projPath string + if projectDir == "" { + path, err := os.Getwd() + if err != nil { + return err + } + lstat, err := os.Lstat(path) + if err != nil { + return err + } + if !lstat.IsDir() { + // There is absolutely no way in fucking hell this error message is gonna show + // however, what if it does tho? + return errors.New("your current working directory isn't a directory... how did you manage that?") + } + projPath = path+"/" + projectName + err = os.Mkdir(projPath, lstat.Mode()) + if err != nil { + return err + } + } else { projPath = projectDir } + + manifest, err := os.Create(projPath + "/manifest.yaml") + if err != nil { + return err + } + + authorUser, err := user.Current() + if err != nil { + return err + } + authorName := authorUser.Name + if authorName == "" { + authorName = authorUser.Username + } + + mf := Manifest{ + Project: projectName, + Authors: []string{authorName}, + Sources: map[string][]string{ "default": {} }, + } + + data, err := yaml.Marshal(mf) + if err != nil { + return err + } + + n, err := manifest.Write(data) + if err != nil { + return err + } + if n < len(data) { + return fmt.Errorf("Not all data written to manifest (wrote %d bytes, expected %d bytes)", n, len(data)) + } + + return nil +} diff --git a/cmd/ytpm/main.go b/cmd/ytpm/main.go index 3a68bdd..4124921 100644 --- a/cmd/ytpm/main.go +++ b/cmd/ytpm/main.go @@ -4,9 +4,6 @@ import ( "fmt" "flag" "os" - "os/user" - "errors" - yaml "go.yaml.in/yaml/v4" ) type Manifest struct{ @@ -55,137 +52,6 @@ func main() { } } -func AddSource(url, subfolder string) error { - cwd, err := os.Getwd() - if err != nil { - return err - } - - lstat, err := os.Lstat(cwd) - if err != nil { - return err - } - - manifestPath := cwd + "/manifest.yaml" - manifest, err := os.OpenFile(manifestPath, os.O_RDWR, lstat.Mode()) - if err != nil { - return err - } - - stat, err := manifest.Stat() - if err != nil { - return err - } - - data := make([]byte, stat.Size()) - n, err := manifest.Read(data) - if n != len(data) { - return fmt.Errorf("Not all data read from manifest (read %d bytes, wanted %d bytes)", n, len(data)) - } - - manifestData := Manifest{} - // Thank you S. Diego on stack overflow for telling someone - // to use a pointer. I wish I found your answer sooner - // - // https://stackoverflow.com/questions/45809746/reflect-value-set-using-unaddressable-value#45811129 - err = yaml.Unmarshal(data, &manifestData) - if err != nil { - return err - } - - if subfolder == "" { - subfolder = "default" - } - - /* */ - if manifestData.Sources[subfolder] == nil { - manifestData.Sources[subfolder] = []string{} - } - // */ - manifestData.Sources[subfolder] = append(manifestData.Sources[subfolder], url) - fmt.Println(manifestData) - - mf, err := yaml.Marshal(manifestData) - if err != nil { - return err - } - - n, err = manifest.WriteAt(mf, 0) - if err != nil { - return err - } - - if n != len(mf) { - return fmt.Errorf("Not all data written to manifest (wrote %d bytes, expected %d bytes)", n, len(data)) - } - // */ - - return nil -} - -func InitProject(projectName, projectDir string) error { - if projectName == "" { - return errors.New("missing project name") - } - // Set path - var projPath string - if projectDir == "" { - path, err := os.Getwd() - if err != nil { - return err - } - lstat, err := os.Lstat(path) - if err != nil { - return err - } - if !lstat.IsDir() { - // There is absolutely no way in fucking hell this error message is gonna show - // however, what if it does tho? - return errors.New("your current working directory isn't a directory... how did you manage that?") - } - projPath = path+"/" + projectName - err = os.Mkdir(projPath, lstat.Mode()) - if err != nil { - return err - } - } else { projPath = projectDir } - - manifest, err := os.Create(projPath + "/manifest.yaml") - if err != nil { - return err - } - - authorUser, err := user.Current() - if err != nil { - return err - } - authorName := authorUser.Name - if authorName == "" { - authorName = authorUser.Username - } - - mf := Manifest{ - Project: projectName, - Authors: []string{authorName}, - Sources: map[string][]string{ "default": {} }, - } - - data, err := yaml.Marshal(mf) - if err != nil { - return err - } - - n, err := manifest.Write(data) - if err != nil { - return err - } - if n < len(data) { - return fmt.Errorf("Not all data written to manifest (wrote %d bytes, expected %d bytes)", n, len(data)) - } - - return nil -} - type SubCmd uint const (