bc574b748ea18366bab7bb81234e20c69dcfa3aa

Author
Ayman Bagabas <ayman.bagabas@gmail.com>
Committer
Ayman Bagabas <ayman.bagabas@gmail.com>
Date

Message

Cleanup, return errs

Diff

 1diff --git a/git/git.go b/git/git.go
 2index 748678f98c315d5e0b7cb09ad74268805867a490..074cbf83b8c94abcf7ed14886f96d62ffe463616 100644
 3--- a/git/git.go
 4+++ b/git/git.go
 5@@ -154,11 +154,11 @@ func (r *Repo) LatestFile(path string) (string, error) {
 6 	}
 7 	f, err := c.File(path)
 8 	if err != nil {
 9-		return "", nil
10+		return "", err
11 	}
12 	content, err := f.Contents()
13 	if err != nil {
14-		return "", nil
15+		return "", err
16 	}
17 	return content, nil
18 }
19diff --git a/tui/session.go b/tui/session.go
20index 648307358c4cefc8a2cd9ffe512d08780be8eaa0..78ed852cddbea2cceee98d2015aac07b18c58e52 100644
21--- a/tui/session.go
22+++ b/tui/session.go
23@@ -22,9 +22,7 @@ func SessionHandler(reposPath string, repoPoll time.Duration) func(ssh.Session)
24 	}
25 	appCfg, err := loadConfig(rs)
26 	if err != nil {
27-		if err != nil {
28-			log.Printf("cannot load config: %s", err)
29-		}
30+		log.Printf("cannot load config: %s", err)
31 	}
32 
33 	return func(s ssh.Session) (tea.Model, []tea.ProgramOption) {
34@@ -38,9 +36,7 @@ func SessionHandler(reposPath string, repoPoll time.Duration) func(ssh.Session)
35 			}
36 			cfg, err := loadConfig(rs)
37 			if err != nil {
38-				if err != nil {
39-					log.Printf("cannot load config: %s", err)
40-				}
41+				log.Printf("cannot load config: %s", err)
42 			}
43 			appCfg = cfg
44 			log.Printf("Repo bubble loaded in %s", time.Since(ct))
45@@ -70,11 +66,11 @@ func loadConfig(rs *git.RepoSource) (*Config, error) {
46 	cfg.RepoSource = rs
47 	cr, err := rs.GetRepo("config")
48 	if err != nil {
49-		return nil, fmt.Errorf("cannot load config repo: %s", err)
50+		return nil, err
51 	}
52 	cs, err := cr.LatestFile("config.json")
53 	if err != nil {
54-		return nil, fmt.Errorf("cannot load config.json: %s", err)
55+		return nil, err
56 	}
57 	err = json.Unmarshal([]byte(cs), cfg)
58 	if err != nil {