diff --git a/README.md b/README.md index 61db23c..4ccbec0 100644 --- a/README.md +++ b/README.md @@ -42,3 +42,13 @@ go build code.go ``` This outputs an HTML file in your `public_html/` folder based on the _templates/code.html_ template. The HTML file will be named after whatever directory you're scanning, so in this example, it'd be `public_html/bin.html`. + +#### multiple sources +You can optionally supply multiple folders by passing a comma-separated list of folder to the `-d` flag. The first folder in the list will be used as the output file name. + +```bash +go build code.go +./code -d Code,code,projects +``` + +This lists files in `/home/*/{Code,code,projects}/*`. diff --git a/code.go b/code.go index d15b70a..cf17a38 100644 --- a/code.go +++ b/code.go @@ -12,6 +12,7 @@ import ( ) var searchDir string +var searchDirs []string func main() { fmt.Println("Starting...") @@ -20,8 +21,13 @@ func main() { dirPtr := flag.String("d", "Code", "Directory to scan for each user.") flag.Parse() searchDir = *dirPtr + searchDirs = strings.Split(searchDir, ",") - generate(findProjects()) + if len(searchDirs) > 1 { + generate(findProjects(), searchDirs[0]) + } else { + generate(findProjects(), searchDir) + } } type User struct { @@ -35,10 +41,25 @@ type Project struct { } func findProjects() map[string]User { - files, _ := filepath.Glob("/home/*/" + searchDir + "/*") + var files []string users := make(map[string]User) - for _, path := range files { + if len(searchDirs) > 1 { + for _, d := range searchDirs { + files, _ = filepath.Glob("/home/*/" + d + "/*") + mapFiles(&files, users) + } + } else { + files, _ = filepath.Glob("/home/*/" + searchDir + "/*") + mapFiles(&files, users) + } + + + return users +} + +func mapFiles(files *[]string, users map[string]User) { + for _, path := range *files { pparts := strings.Split(path, "/") uname := pparts[2] fname := filepath.Base(path) @@ -58,7 +79,7 @@ func findProjects() map[string]User { proj := &Project{Name: fname, Path: strings.Replace(path, "/home/", "~", -1)} u, exists := users[uname] if !exists { - fmt.Printf("Found %s for ~%s.\n", searchDir, uname) + fmt.Printf("Found %s for ~%s.\n", pparts[3], uname) projs := []Project{*proj} u = User{Name: uname, Projects: projs} } else { @@ -66,11 +87,11 @@ func findProjects() map[string]User { } users[uname] = u } - return users } type Page struct { FolderName string + Folders []string Host string Users map[string]User Updated string @@ -82,18 +103,40 @@ func graphicalName(n string) string { return r.Replace(n) } -func generate(users map[string]User) { +func Split(s string, d string) []string { + arr := strings.Split(s, d) + return arr +} + +func ListDirs(dirs []string) string { + if len(dirs) > 1 { + for i := 0; i < len(dirs); i++ { + d := dirs[i] + d = fmt.Sprintf("%s", d) + dirs[i] = d + } + return strings.Join(dirs, " or ") + } + return fmt.Sprintf("%s", dirs[0]) +} + +func generate(users map[string]User, outputFile string) { fmt.Println("Generating page.") - f, err := os.Create(os.Getenv("HOME") + "/public_html/" + strings.ToLower(searchDir) + ".html") + f, err := os.Create(os.Getenv("HOME") + "/public_html/" + strings.ToLower(outputFile) + ".html") if err != nil { panic(err) } defer f.Close() + + funcMap := template.FuncMap { + "Split": Split, + "ListDirs": ListDirs, + } w := bufio.NewWriter(f) - template, err := template.ParseFiles("templates/code.html") + template, err := template.New("").Funcs(funcMap).ParseFiles("templates/code.html") if err != nil { panic(err) } @@ -105,7 +148,7 @@ func generate(users map[string]User) { updated := curTime.Format(time.RFC3339) // Generate the page - page := &Page{FolderName: searchDir, Host: graphicalName(host), UpdatedForHumans: updatedReadable, Updated: updated, Users: users} + page := &Page{FolderName: searchDirs[0], Folders: searchDirs, Host: graphicalName(host), UpdatedForHumans: updatedReadable, Updated: updated, Users: users} template.ExecuteTemplate(w, "code", page) w.Flush()