Skip to content

Commit 0b033fb

Browse files
committed
Minor formattings
1 parent 15b6d0e commit 0b033fb

File tree

8 files changed

+274
-276
lines changed

8 files changed

+274
-276
lines changed

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ Options of awesome-cli:
132132
### Sample Execution
133133

134134
```bash
135-
> $ go run main.go
135+
> $ awesome-cli random
136136
aweome-cli Version 0.2.0
137137
✔ Platforms
138138
✔ Linux

internal/package/favourite/favourite.go

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,22 @@
11
package favourite
22

33
import (
4+
"encoding/gob"
45
"math/rand"
5-
"time"
6-
"os"
7-
"encoding/gob"
6+
"os"
7+
"time"
88

99
"github.com/umutphp/awesome-cli/internal/package/fetcher"
1010
)
1111

1212
type Favourite struct {
13-
Name string
13+
Name string
1414
Children map[string]Favourite
1515
}
1616

1717
func New(name string) Favourite {
1818
return Favourite{
19-
Name: name,
19+
Name: name,
2020
Children: map[string]Favourite{},
2121
}
2222
}
@@ -46,7 +46,7 @@ func (f *Favourite) GetRandom() Favourite {
4646
rint := rand.Intn(len(f.Children))
4747

4848
i := 0
49-
for _,fav := range f.Children {
49+
for _, fav := range f.Children {
5050
if i == rint {
5151
return fav
5252
}
@@ -77,23 +77,23 @@ func (f *Favourite) SaveCache() {
7777
}
7878

7979
func NewFromCache(cachename string) Favourite {
80-
filename := fetcher.GetCachePath(cachename)
81-
_, err := os.Stat(filename)
80+
filename := fetcher.GetCachePath(cachename)
81+
_, err := os.Stat(filename)
8282
favourites := Favourite{
83-
Name: cachename,
83+
Name: cachename,
8484
Children: map[string]Favourite{},
8585
}
8686

87-
if os.IsNotExist(err) {
88-
return favourites
89-
}
90-
87+
if os.IsNotExist(err) {
88+
return favourites
89+
}
90+
9191
decodeFile, err := os.Open(filename)
92-
92+
9393
if err != nil {
9494
panic(err)
9595
}
96-
96+
9797
defer decodeFile.Close()
9898

9999
decoder := gob.NewDecoder(decodeFile)
Lines changed: 102 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
package fetcher
22

33
import (
4-
"log"
5-
"net/url"
6-
"strings"
7-
"net/http"
4+
"crypto/md5"
5+
"encoding/hex"
86
"io/ioutil"
9-
"os"
10-
"time"
11-
"crypto/md5"
12-
"encoding/hex"
7+
"log"
8+
"net/http"
9+
"net/url"
10+
"os"
11+
"strings"
12+
"time"
1313
)
1414

15-
const AWESOMEREPOURL = "https://github.com/sindresorhus/awesome/"
16-
const AWESOMECACHEFOLDER = ".awesomecache"
15+
const AWESOMEREPOURL = "https://github.com/sindresorhus/awesome/"
16+
const AWESOMECACHEFOLDER = ".awesomecache"
1717
const RAWGITHUBUSERCONTENT = "https://raw.githubusercontent.com"
1818

1919
func FetchAwsomeRootRepo() (string, error) {
@@ -25,163 +25,162 @@ func FetchAwsomeRepo(repourl string) (string, error) {
2525
CreateCacheFolder()
2626
}
2727

28-
cacheFile := GetCachePath(repourl)
28+
cacheFile := GetCachePath(repourl)
29+
30+
if CacheFileExists(cacheFile) && CacheFileUptoDate(cacheFile) {
31+
content, err := ioutil.ReadFile(cacheFile)
2932

30-
if CacheFileExists(cacheFile) && CacheFileUptoDate(cacheFile) {
31-
content, err := ioutil.ReadFile(cacheFile)
32-
33-
if err != nil {
34-
log.Println(err)
35-
return "", err
36-
} else {
37-
return string(content), nil
38-
}
39-
}
33+
if err != nil {
34+
log.Println(err)
35+
return "", err
36+
} else {
37+
return string(content), nil
38+
}
39+
}
4040

41-
readmes := GetPossibleReadmeFileURLs(repourl)
41+
readmes := GetPossibleReadmeFileURLs(repourl)
4242

43-
for _,rurl := range readmes {
44-
response, err := http.Get(rurl)
43+
for _, rurl := range readmes {
44+
response, err := http.Get(rurl)
4545

46-
if err != nil {
47-
log.Println(err)
48-
continue
49-
}
46+
if err != nil {
47+
log.Println(err)
48+
continue
49+
}
5050

51-
if response.StatusCode == http.StatusNotFound {
52-
//log.Println(rurl, "gives 404.")
53-
continue
54-
}
51+
if response.StatusCode == http.StatusNotFound {
52+
//log.Println(rurl, "gives 404.")
53+
continue
54+
}
5555

56-
defer response.Body.Close()
56+
defer response.Body.Close()
5757

58-
responseData, err := ioutil.ReadAll(response.Body)
58+
responseData, err := ioutil.ReadAll(response.Body)
5959

60-
if err != nil {
61-
log.Println(err)
62-
return "", err
63-
}
60+
if err != nil {
61+
log.Println(err)
62+
return "", err
63+
}
6464

65-
responseString := string(responseData)
65+
responseString := string(responseData)
6666

67-
return SaveCache(cacheFile, responseString), nil
68-
}
67+
return SaveCache(cacheFile, responseString), nil
68+
}
6969

70-
return "", nil
70+
return "", nil
7171
}
7272

7373
func GetPossibleReadmeFileURLs(repourl string) []string {
74-
// Parse the URL and ensure there are no errors.
75-
u, err := url.Parse(repourl)
76-
if err != nil {
77-
log.Println(err)
78-
}
79-
80-
if strings.Count(u.Host, "github.com") == 0 {
81-
return []string{}
82-
}
83-
84-
prefix := RAWGITHUBUSERCONTENT + u.Path + "/master/"
85-
86-
return []string{
87-
prefix + "README",
88-
prefix + "README.MD",
89-
prefix + "README.md",
90-
prefix + "readme",
91-
prefix + "readme.md",
92-
prefix + "readme.MD",
93-
}
74+
// Parse the URL and ensure there are no errors.
75+
u, err := url.Parse(repourl)
76+
if err != nil {
77+
log.Println(err)
78+
}
79+
80+
if strings.Count(u.Host, "github.com") == 0 {
81+
return []string{}
82+
}
83+
84+
prefix := RAWGITHUBUSERCONTENT + u.Path + "/master/"
85+
86+
return []string{
87+
prefix + "README",
88+
prefix + "README.MD",
89+
prefix + "README.md",
90+
prefix + "readme",
91+
prefix + "readme.md",
92+
prefix + "readme.MD",
93+
}
9494
}
9595

9696
func GetCachePath(url string) string {
97-
return GetCacheFolderPath() + string(os.PathSeparator) + CacheFileName(url)
97+
return GetCacheFolderPath() + string(os.PathSeparator) + CacheFileName(url)
9898
}
9999

100100
func GetCacheFolderPath() string {
101101
home, err := os.UserHomeDir()
102102

103-
if err != nil {
104-
log.Println(err)
105-
return ""
106-
}
103+
if err != nil {
104+
log.Println(err)
105+
return ""
106+
}
107107

108-
return home + string(os.PathSeparator) + AWESOMECACHEFOLDER
108+
return home + string(os.PathSeparator) + AWESOMECACHEFOLDER
109109
}
110110

111111
func SaveCache(filename string, text string) string {
112112
file, err := os.Create(filename)
113113

114-
if err != nil {
115-
log.Println(err)
116-
return ""
117-
}
114+
if err != nil {
115+
log.Println(err)
116+
return ""
117+
}
118118

119-
file.WriteString(text)
119+
file.WriteString(text)
120120

121-
return text
121+
return text
122122
}
123123

124124
func CacheFileName(url string) string {
125125
hasher := md5.New()
126-
127-
hasher.Write([]byte(url))
128126

129-
return hex.EncodeToString(hasher.Sum(nil))
127+
hasher.Write([]byte(url))
128+
129+
return hex.EncodeToString(hasher.Sum(nil))
130130
}
131131

132132
func CacheFolderExists() bool {
133133
info, err := os.Stat(GetCacheFolderPath())
134-
135-
if os.IsNotExist(err) {
136-
return false
137-
}
138134

139-
return info.IsDir()
135+
if os.IsNotExist(err) {
136+
return false
137+
}
138+
139+
return info.IsDir()
140140
}
141141

142142
func CreateCacheFolder() bool {
143143
err := os.MkdirAll(GetCacheFolderPath(), 0755)
144144

145145
if err != nil {
146-
return false
146+
return false
147147
}
148148

149149
return true
150150
}
151151

152152
func CacheFileExists(filename string) bool {
153-
info, err := os.Stat(filename)
153+
info, err := os.Stat(filename)
154+
155+
if os.IsNotExist(err) {
156+
return false
157+
}
154158

155-
if os.IsNotExist(err) {
156-
return false
157-
}
158-
159-
return !info.IsDir()
159+
return !info.IsDir()
160160
}
161161

162162
func CacheFileUptoDate(filename string) bool {
163-
info, _ := os.Stat(filename)
164-
modifiedtime := info.ModTime()
163+
info, _ := os.Stat(filename)
164+
modifiedtime := info.ModTime()
165165

166-
return !IsOlderThanOneDay(modifiedtime)
166+
return !IsOlderThanOneDay(modifiedtime)
167167
}
168168

169169
func IsOlderThanOneDay(t time.Time) bool {
170-
return time.Now().Sub(t) > 24*time.Hour
170+
return time.Now().Sub(t) > 24*time.Hour
171171
}
172172

173173
func PadLeft(str, pad string, lenght int) string {
174-
for {
175-
str = pad + str
176-
if len(str) >= lenght {
177-
return str[0:lenght]
178-
}
179-
}
174+
for {
175+
str = pad + str
176+
if len(str) >= lenght {
177+
return str[0:lenght]
178+
}
179+
}
180180
}
181181

182-
183182
func IsUrl(str string) bool {
184-
u, err := url.Parse(str)
185-
186-
return err == nil && u.Scheme != "" && u.Host != ""
183+
u, err := url.Parse(str)
184+
185+
return err == nil && u.Scheme != "" && u.Host != ""
187186
}

0 commit comments

Comments
 (0)