kreativmonkey
/
shrty
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

Compare commits

base: kreativmonkey:2fcd341fd9c62ca1791f49406590d38966054a16
Branches Tags
kreativmonkey:master
...
compare: kreativmonkey:fb4deaf057543080362a2796163422754f43f915
Branches Tags
kreativmonkey:master

2 Commits
2fcd341fd9 ... fb4deaf057

Author SHA1 Message Date
kreativmonkey fb4deaf057 Fix Pointer Issue 7 years ago
kreativmonkey d48ec14a73 Fix Title 7 years ago
4 changed files with 17 additions and 12 deletions
Show Stats

12
shrty/short.go
Unescape Escape View File

@ -31,11 +31,11 @@ type Meta struct{
} }
func (s *Store) Short(URL string, value *string) error { func (s *Store) Short(URL string, value *string) error {
d := &Data{ d := Data{
URL: URL, URL: URL,
} }
err := CheckURL(d) err := CheckURL(&d)
if err != nil { if err != nil {
return err return err
} }
@ -44,7 +44,7 @@ func (s *Store) Short(URL string, value *string) error {
d.Hash = fmt.Sprintf("%x", sha256.Sum256([]byte(d.OriginalURL))) d.Hash = fmt.Sprintf("%x", sha256.Sum256([]byte(d.OriginalURL)))
// Check if the URL already in the Storage // Check if the URL already in the Storage
if ok := s.Exist(d); ok { if ok := s.Exist(&d); ok {
*value = d.Token *value = d.Token
return nil return nil
} }
@ -56,7 +56,7 @@ func (s *Store) Short(URL string, value *string) error {
d.Token = d.Hash[:hashShortestLen] d.Token = d.Hash[:hashShortestLen]
d.Created = time.Now().String() d.Created = time.Now().String()
s.Token[d.Token] = d s.Token[d.Token] = &d
s.Url[d.Hash] = d.Token s.Url[d.Hash] = d.Token
*value = d.Token *value = d.Token
@ -70,8 +70,8 @@ func (s *Store) Short(URL string, value *string) error {
// URL already Exist in the // URL already Exist in the
func (s *Store) Exist(d *Data) bool { func (s *Store) Exist(d *Data) bool {
if val, ok := s.Url[d.Hash]; ok { if token, ok := s.Url[d.Hash]; ok {
d = s.Token[val] *d = *s.Token[token]
return true return true
} }
return false return false

13
shrty/short_test.go
Unescape Escape View File

@ -42,6 +42,11 @@ func TestStorage_Short(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
assert.Equal(t, expected, s.Token[token]) assert.Equal(t, expected, s.Token[token])
// If already exist the same Token will be return
err = s.Short("http://bit.ly/2scBYES", &token)
assert.NoError(t, err)
assert.Equal(t, expected, s.Token[token])
} }
// Whats wrong with this Test? // Whats wrong with this Test?
@ -88,10 +93,10 @@ func TestStorage_Get(t *testing.T) {
} }
func TestStore_Exist(t *testing.T) { func TestStore_Exist(t *testing.T) {
s, err := Open("test.db") s, err := Open(path)
defer os.Remove(path) defer os.Remove(path)
d := &Data{ d := Data{
URL:"http://bit.ly/2scBYES", URL:"http://bit.ly/2scBYES",
URLFetched:"https://www.youtube.com/watch?v=bouIpFd9VGM", URLFetched:"https://www.youtube.com/watch?v=bouIpFd9VGM",
CanonicalURL:"", CanonicalURL:"",
@ -111,7 +116,7 @@ func TestStore_Exist(t *testing.T) {
Clicks:0, Clicks:0,
} }
notexist := s.Exist(d) notexist := s.Exist(&d)
assert.Equal(t, false, notexist) assert.Equal(t, false, notexist)
var token string var token string
@ -119,7 +124,7 @@ func TestStore_Exist(t *testing.T) {
err = s.Short(d.URL, &token) err = s.Short(d.URL, &token)
assert.NoError(t, err) assert.NoError(t, err)
exist := s.Exist(d) exist := s.Exist(&d)
assert.Equal(t, true, exist) assert.Equal(t, true, exist)
} }

2
template/index.gohtml
Unescape Escape View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Shrt</title> <title>{{.Title}}</title>
<link rel="stylesheet" type="text/css" href="/css/app.css" \> <link rel="stylesheet" type="text/css" href="/css/app.css" \>
</head> </head>
<body> <body>

2
template/short.gohtml
Unescape Escape View File

@ -2,7 +2,7 @@
<html lang="en"> <html lang="en">
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>Shrt</title> <title>{{.Title}} | Token</title>
<link rel="stylesheet" type="text/css" href="/css/app.css" \> <link rel="stylesheet" type="text/css" href="/css/app.css" \>
</head> </head>
<body> <body>

Write Preview
Loading…
Cancel
Save