44 "embed"
55 "errors"
66 "fmt"
7+ "io"
78 "io/ioutil"
89 "log"
910 "os"
@@ -75,6 +76,7 @@ const (
7576 LeaderTag
7677 LeaderUser
7778 LeaderWindow
79+ LeaderLoadNewer
7880)
7981
8082type Timeline struct {
@@ -431,21 +433,31 @@ func parseStyle(cfg *ini.File) Style {
431433 style := Style {}
432434 theme := cfg .Section ("style" ).Key ("theme" ).String ()
433435 if theme != "none" && theme != "" {
434- themes , err := getThemes ()
436+ bundled , local , err := getThemes ()
435437 if err != nil {
436438 log .Fatalf ("Couldn't load themes. Error: %s\n " , err )
437439 }
438440 found := false
439- for _ , t := range themes {
441+ isLocal := false
442+ for _ , t := range local {
440443 if filepath .Base (t ) == fmt .Sprintf ("%s.ini" , theme ) {
441444 found = true
445+ isLocal = true
442446 break
443447 }
444448 }
449+ if ! found {
450+ for _ , t := range bundled {
451+ if filepath .Base (t ) == fmt .Sprintf ("%s.ini" , theme ) {
452+ found = true
453+ break
454+ }
455+ }
456+ }
445457 if ! found {
446458 log .Fatalf ("Couldn't find theme %s\n " , theme )
447459 }
448- tcfg , err := getTheme (theme )
460+ tcfg , err := getTheme (theme , isLocal )
449461 if err != nil {
450462 log .Fatalf ("Couldn't load theme. Error: %s\n " , err )
451463 }
@@ -696,6 +708,8 @@ func parseGeneral(cfg *ini.File) General {
696708 case "window" :
697709 la .Command = LeaderWindow
698710 la .Subaction = subaction
711+ case "newer" :
712+ la .Command = LeaderLoadNewer
699713 default :
700714 fmt .Printf ("leader-action %s is invalid\n " , parts [0 ])
701715 os .Exit (1 )
@@ -1183,7 +1197,7 @@ func parseConfig(filepath string) (Config, error) {
11831197func createConfigDir () error {
11841198 cd , err := os .UserConfigDir ()
11851199 if err != nil {
1186- log .Fatalf ("couldn't find $HOME . Err %v" , err )
1200+ log .Fatalf ("couldn't find config dir . Err %v" , err )
11871201 }
11881202 path := cd + "/tut"
11891203 return os .MkdirAll (path , os .ModePerm )
@@ -1192,7 +1206,7 @@ func createConfigDir() error {
11921206func checkConfig (filename string ) (path string , exists bool , err error ) {
11931207 cd , err := os .UserConfigDir ()
11941208 if err != nil {
1195- log .Fatalf ("couldn't find $HOME . Err %v" , err )
1209+ log .Fatalf ("couldn't find config dir . Err %v" , err )
11961210 }
11971211 dir := cd + "/tut/"
11981212 path = dir + filename
@@ -1218,24 +1232,58 @@ func CreateDefaultConfig(filepath string) error {
12181232 return nil
12191233}
12201234
1221- func getThemes () ([]string , error ) {
1235+ func getThemes () (bundled []string , local [] string , err error ) {
12221236 entries , err := themesFS .ReadDir ("themes" )
1223- files := []string {}
12241237 if err != nil {
1225- return [] string {} , err
1238+ return bundled , local , err
12261239 }
12271240 for _ , entry := range entries {
12281241 if entry .IsDir () {
12291242 continue
12301243 }
12311244 fp := filepath .Join ("themes/" , entry .Name ())
1232- files = append (files , fp )
1245+ bundled = append (bundled , fp )
1246+ }
1247+ _ , exists , err := checkConfig ("themes" )
1248+ if err != nil {
1249+ return bundled , local , err
1250+ }
1251+ if ! exists {
1252+ return bundled , local , err
1253+ }
1254+ cd , err := os .UserConfigDir ()
1255+ if err != nil {
1256+ log .Fatalf ("couldn't find config dir. Err %v" , err )
12331257 }
1234- return files , nil
1258+ dir := cd + "/tut/themes"
1259+ entries , err = os .ReadDir (dir )
1260+ if err != nil {
1261+ return bundled , local , err
1262+ }
1263+ for _ , entry := range entries {
1264+ if entry .IsDir () {
1265+ continue
1266+ }
1267+ fp := filepath .Join (dir , entry .Name ())
1268+ local = append (local , fp )
1269+ }
1270+ return bundled , local , nil
12351271}
12361272
1237- func getTheme (fname string ) (* ini.File , error ) {
1238- f , err := themesFS .Open (fmt .Sprintf ("themes/%s.ini" , strings .TrimSpace (fname )))
1273+ func getTheme (fname string , isLocal bool ) (* ini.File , error ) {
1274+ var f io.Reader
1275+ var err error
1276+ if isLocal {
1277+ var cd string
1278+ cd , err = os .UserConfigDir ()
1279+ if err != nil {
1280+ log .Fatalf ("couldn't find config dir. Err %v" , err )
1281+ }
1282+ dir := cd + "/tut/themes"
1283+ f , err = os .Open (fmt .Sprintf ("%s/%s.ini" , dir , strings .TrimSpace (fname )))
1284+ } else {
1285+ f , err = themesFS .Open (fmt .Sprintf ("themes/%s.ini" , strings .TrimSpace (fname )))
1286+ }
12391287 if err != nil {
12401288 return nil , err
12411289 }
0 commit comments