\nFor a list of slugs, use --list-comics")
- }
- slug := os.Args[3]
- var u *User
- if u, err = m.GetUserByName(val); err != nil {
- errorExit("Couldn't find a user with the username " + val)
- }
- pts := strings.Split(slug, ";")
- if len(pts) != 2 {
- errorExit("Invalid slug given: " + slug)
- }
- _, err := m.GetComic(pts[0], pts[1])
- if err != nil {
- errorExit("Couldn't find comic with slug: " + slug)
- }
- fmt.Println(u.SubSlugs)
- fmt.Println(slug)
- u.SubSlugs = append(u.SubSlugs, slug)
- fmt.Println(u.SubSlugs)
- m.SaveUser(u)
- done()
- default:
- errorExit("Unknown argument")
- }
- } else if len(os.Args) > 1 {
- switch os.Args[1] {
- case "--test":
- fmt.Println(buildRssFeed("30f14e57-6500-443c-8c77-f352788eacb0"))
- done()
- case "--list-comics":
- comics := m.GetAllComics()
- for _, c := range comics {
- fmt.Printf("[ %s;%s ] %s\n", c.Source, c.Slug, c.Name)
- }
- done()
- case "--update-feeds":
- fmt.Println("Updating User Feeds...")
- m.UpdateAllUserFeeds()
- fmt.Println("Done.")
- done()
- case "--update-comics":
- fmt.Println("Updating the Comics List...")
- comics := downloadComicsList()
- for _, c := range comics {
- fmt.Printf("Updating [ %s - %s, %s ]\n", c.Slug, c.Name, c.Artist)
- m.SaveComic(&c)
- }
- m.saveChanges()
- fmt.Println("Done.")
+ initialize()
+ sessionStore = sessions.NewCookieStore([]byte(m.Site.sessionSecret))
- default:
- errorExit("Unknown argument")
+ for _, arg := range os.Args {
+ switch arg {
+ case "-dev":
+ m.Site.DevMode = true
+ fmt.Println("Running in Dev Mode")
}
}
r = mux.NewRouter()
r.StrictSlash(true)
- //r.PathPrefix("/assets/").Handler(http.FileServer())
+ r.PathPrefix("/assets/").Handler(http.FileServer(FS(m.Site.DevMode)))
pub := r.PathPrefix("/").Subrouter()
- pub.HandleFunc("/", handleRequest)
- pub.HandleFunc("/api", handleApiCall)
- pub.HandleFunc("/api/users", handleApiUsersCall)
- pub.HandleFunc("/api/users/{uid}", handleApiUsersCall)
- pub.HandleFunc("/api/users/{uid}/{function}", handleApiUsersCall)
- pub.HandleFunc("/api/users/{uid}/{function}/{slug}", handleApiUsersCall)
- pub.HandleFunc("/api/comics", handleApiComicsCall)
- pub.HandleFunc("/api/comics/{cid}", handleApiComicsCall)
- pub.HandleFunc("/api/comics/{cid}/{function}", handleApiComicsCall)
- pub.HandleFunc("/{function}", handleRequest)
- pub.HandleFunc("/{function}/{uid}", handleRequest)
- pub.HandleFunc("/{function}/{uid}/{subfunc}", handleRequest)
- pub.HandleFunc("/{function}/{uid}/{subfunc}/{slug}", handleRequest)
+ pub.HandleFunc("/", handleUserRequest)
+ /*
+ pub.HandleFunc("/api", handleApiCall)
+ pub.HandleFunc("/api/users", handleApiUsersCall)
+ pub.HandleFunc("/api/users/{uid}", handleApiUsersCall)
+ pub.HandleFunc("/api/users/{uid}/{function}", handleApiUsersCall)
+ pub.HandleFunc("/api/users/{uid}/{function}/{slug}", handleApiUsersCall)
+ pub.HandleFunc("/api/comics", handleApiComicsCall)
+ pub.HandleFunc("/api/comics/{cid}", handleApiComicsCall)
+ pub.HandleFunc("/api/comics/{cid}/{function}", handleApiComicsCall)
+ */
+ pub.HandleFunc("/rss/{uid}", handleRssFeed)
+ pub.HandleFunc("/user/{function}", handleUserRequest)
http.Handle("/", r)
chain := alice.New(loggingHandler).Then(r)
// Refresh the DB at 2 AM
- go func() {
- for {
- if m.Site.LastSave.IsZero() || (time.Now().Day() != m.Site.LastSave.Day() && time.Now().Hour() == 2) {
- fmt.Println("Updating GoComics List...")
- comics := downloadComicsList()
- for _, c := range comics {
- fmt.Printf("Updating [ %s - %s, %s ]\n", c.Slug, c.Name, c.Artist)
- m.SaveComic(&c)
+ /*
+ go func() {
+ for {
+ if m.Site.LastSave.IsZero() || (time.Now().Day() != m.Site.LastSave.Day() && time.Now().Hour() == 2) {
+ fmt.Println("Updating GoComics List...")
+ comics := downloadComicsList()
+ for _, c := range comics {
+ fmt.Printf("Updating [ %s - %s, %s ]\n", c.Slug, c.Name, c.Artist)
+ m.SaveComic(&c)
+ }
+ fmt.Println("Updating User Feeds...")
+ m.UpdateAllUserFeeds()
+ m.saveChanges()
+ fmt.Println("Done.")
}
- fmt.Println("Updating User Feeds...")
- m.UpdateAllUserFeeds()
- m.saveChanges()
- fmt.Println("Done.")
+ time.Sleep(time.Minute)
}
- time.Sleep(time.Minute)
- }
- }()
+ }()
+ */
// Set up a channel to intercept Ctrl+C for graceful shutdowns
c := make(chan os.Signal, 1)
@@ -148,10 +130,97 @@ func main() {
log.Fatal(http.ListenAndServe("127.0.0.1:"+strconv.Itoa(m.Site.Port), chain))
}
+func buildRssFeed(uid string) (string, error) {
+ return uid, nil
+}
+
func loggingHandler(h http.Handler) http.Handler {
return handlers.LoggingHandler(os.Stdout, h)
}
+func initPageData(w http.ResponseWriter, req *http.Request) *pageData {
+ if m.Site.DevMode {
+ w.Header().Set("Cache-Control", "no-cache")
+ }
+ p := new(pageData)
+
+ // Get session
+ var err error
+ var s *sessions.Session
+ if s, err = sessionStore.Get(req, m.Site.sessionSecret); err != nil {
+ fmt.Println("Session error... Recreating.")
+ http.Error(w, err.Error(), 500)
+ }
+ p.session = new(pageSession)
+ p.session.session = s
+ p.session.req = req
+ p.session.w = w
+
+ // First check if we're logged in
+ userId, _ := p.session.getStringValue("id")
+ // With a valid account
+ user, err := m.GetUser(userId)
+ if err == nil {
+ p.LoggedIn = true
+ p.IsAdmin = user.IsAdmin
+ }
+
+ p.Site = m.Site
+ p.SubTitle = "ribbit"
+ p.Stylesheets = make([]string, 0, 0)
+ p.Stylesheets = append(p.Stylesheets, "/assets/vendor/css/pure-min.css")
+ p.Stylesheets = append(p.Stylesheets, "/assets/vendor/css/grids-responsive-min.css")
+ p.Stylesheets = append(p.Stylesheets, "/assets/css/main.css")
+
+ p.HeaderScripts = make([]string, 0, 0)
+
+ p.Scripts = make([]string, 0, 0)
+
+ p.FlashMessage, p.FlashClass = p.session.getFlashMessage()
+ if p.FlashClass == "" {
+ p.FlashClass = "hidden"
+ }
+
+ // Build the menu
+ if p.LoggedIn {
+ p.BottomMenu = append(p.BottomMenu, menuItem{"Logout", "/user/logout", "fa-sign-out"})
+ } else {
+ if p.IsAdmin {
+ p.BottomMenu = append(p.BottomMenu, menuItem{"Admin", "/admin", "fa-sign-in"})
+ }
+ }
+
+ return p
+}
+
+func (p *pageData) show(tmplName string, w http.ResponseWriter) error {
+ for _, tmpl := range []string{
+ "htmlheader.html",
+ "header.html",
+ tmplName,
+ "footer.html",
+ "htmlfooter.html",
+ } {
+ if err := outputTemplate(tmpl, p, w); err != nil {
+ fmt.Printf("%s\n", err)
+ return err
+ }
+ }
+ return nil
+}
+
+func outputTemplate(tmplName string, tmplData interface{}, w http.ResponseWriter) error {
+ n := "/templates/" + tmplName
+ l := template.Must(template.New("layout").Parse(FSMustString(m.Site.DevMode, n)))
+ t := template.Must(l.Parse(FSMustString(m.Site.DevMode, n)))
+ return t.Execute(w, tmplData)
+}
+
+// redirect can be used only for GET redirects
+func redirect(url string, w http.ResponseWriter, req *http.Request) {
+ http.Redirect(w, req, url, 303)
+}
+
func done() {
os.Exit(0)
}
@@ -166,3 +235,41 @@ func assertError(err error) {
panic(err)
}
}
+
+func initialize() {
+ // Check if we have an admin user already
+ if !m.hasAdminUser() {
+ // Nope, create one
+ reader := bufio.NewReader(os.Stdin)
+ fmt.Println("Create new Admin user")
+ fmt.Print("Email: ")
+ email, _ := reader.ReadString('\n')
+ email = strings.TrimSpace(email)
+ u := NewUser(email)
+ var pw1, pw2 []byte
+ for string(pw1) != string(pw2) || string(pw1) == "" {
+ fmt.Print("Password: ")
+ pw1, _ = terminal.ReadPassword(0)
+ fmt.Println("")
+ fmt.Print("Repeat Password: ")
+ pw2, _ = terminal.ReadPassword(0)
+ fmt.Println("")
+ if string(pw1) != string(pw2) {
+ fmt.Println("Entered Passwords don't match!")
+ }
+ }
+ u.IsAdmin = true
+ m.SaveUser(u)
+ assertError(m.updateUserPassword(u.Uuid, string(pw1)))
+ }
+
+ if m.Site.sessionSecret == "" {
+ reader := bufio.NewReader(os.Stdin)
+ fmt.Println("A good session secret is like a good password")
+ fmt.Print("Create New Session Secret: ")
+ sessSc, _ := reader.ReadString('\n')
+ sessSc = strings.TrimSpace(sessSc)
+ m.Site.sessionSecret = sessSc
+ assertError(m.Site.SaveToDB())
+ }
+}
diff --git a/model.go b/model.go
index 985a4d4..acce94a 100644
--- a/model.go
+++ b/model.go
@@ -13,8 +13,8 @@ type model struct {
bolt *boltease.DB
dbFileName string
- Users []User
- Comics []Comic
+ Users []User
+ Feeds []Feed
Site *SiteData
}
@@ -31,11 +31,14 @@ func NewModel() (*model, error) {
if err = m.initDB(); err != nil {
return nil, errors.New("Unable to initialzie DB: " + err.Error())
}
- m.LoadSiteData()
+ m.Site = NewSiteData(m)
+ if err = m.Site.LoadFromDB(); err != nil {
+ return nil, err
+ }
if err = m.LoadUsers(); err != nil {
return nil, err
}
- if err = m.LoadComics(); err != nil {
+ if err = m.LoadFeeds(); err != nil {
return nil, err
}
@@ -55,16 +58,15 @@ func (m *model) initDB() error {
if err = m.bolt.MkBucketPath([]string{"users"}); err != nil {
return err
}
- if err = m.bolt.MkBucketPath([]string{"comics"}); err != nil {
+ if err = m.bolt.MkBucketPath([]string{"feeds"}); err != nil {
return err
}
return nil
}
func (m *model) saveChanges() {
- m.Site.LastSave = time.Now()
- m.SaveSite()
- //m.SaveAllComics(m.Comics)
+ m.Site.SaveToDB()
+ //m.SaveAllFeeds(m.Feeds)
m.SaveAllUsers(m.Users)
}
@@ -76,14 +78,14 @@ func (m *model) UpdateAllUserFeeds() {
allSubs = addStringIfUnique(sub, allSubs)
}
}
- // So we have allSubs which contains all subscribed comics for all users
+ // So we have allSubs which contains all subscribed feeds for all users
for _, sub := range allSubs {
- fmt.Println("Updating Comic: " + sub)
+ fmt.Println("Updating Feed: " + sub)
pts := strings.Split(sub, ";")
if len(pts) != 2 {
continue
}
- c, err := m.GetComic(pts[0], pts[1])
+ c, err := m.GetFeed(pts[0], pts[1])
if err != nil {
fmt.Println(sub, ":", err)
continue
@@ -92,7 +94,7 @@ func (m *model) UpdateAllUserFeeds() {
fmt.Println(sub, ":", err.Error())
continue
}
- if err = m.SaveComic(c); err != nil {
+ if err = m.SaveFeed(c); err != nil {
fmt.Println(sub, ":", err.Error())
continue
}
@@ -100,7 +102,7 @@ func (m *model) UpdateAllUserFeeds() {
}
type Source interface {
- downloadList() []Comic
+ downloadList() []Feed
getRssItem(slug string) (string, error)
getUrl(slug string, dt time.Time) (string, error)
getDescription(slug string, dt time.Time) (string, error)
diff --git a/model_comics.go b/model_comics.go
deleted file mode 100644
index 3d5ce61..0000000
--- a/model_comics.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package main
-
-import (
- "errors"
- "time"
-)
-
-type Comic struct {
- Name string
- Artist string
- Slug string
- Source string
- Desc string
- LastUpdate time.Time
-}
-
-func NewComic(s, n, a, source string) *Comic {
- return &Comic{
- Name: n,
- Artist: a,
- Slug: s,
- Source: source,
- }
-}
-
-func (c *Comic) GetBucket() []string {
- return []string{"comics", c.Source, c.Slug}
-}
-
-func (c *Comic) Update() error {
- dt := time.Now()
- desc, err := getComicDesc(c.Source, c.Slug, dt)
- if err != nil {
- return err
- }
- if desc == c.Desc {
- return errors.New("Comic didn't change")
- }
- c.Desc = desc
- c.LastUpdate = dt
- return nil
-}
-
-func (c *Comic) GetUrl(dt time.Time) string {
- var v string
- var e error
- if v, e = getComicUrl(c.Source, c.Slug, dt); e != nil {
- return ""
- }
- return v
-}
-
-func (c *Comic) GetDesc(dt time.Time) string {
- var v string
- var e error
- if v, e = getComicDesc(c.Source, c.Slug, dt); e != nil {
- return ""
- }
- return v
-}
-
-func (c *Comic) GetRssItem() string {
- var v string
- var e error
- if v, e = getRssItem(c.Source, c.Slug); e != nil {
- return ""
- }
- return v
-}
-
-// DB Function to save a comic
-func (m *model) SaveComic(c *Comic) error {
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return err
- }
- defer m.bolt.CloseDB()
- bkt := c.GetBucket()
- if err = m.bolt.MkBucketPath(bkt); err != nil {
- return err
- }
- if err = m.bolt.SetValue(bkt, "name", c.Name); err != nil {
- return err
- }
- if err = m.bolt.SetValue(bkt, "artist", c.Artist); err != nil {
- return err
- }
- if err = m.bolt.SetValue(bkt, "desc", c.Desc); err != nil {
- return err
- }
- if err = m.bolt.SetTimestamp(bkt, "lastupdate", c.LastUpdate); err != nil {
- return err
- }
- // Add it to the cached list
- for i, v := range m.Comics {
- if v.Source == c.Source && v.Slug == c.Slug {
- m.Comics[i] = *c
- return nil
- }
- }
- m.Comics = append(m.Comics, *c)
- return nil
-}
-
-// DB Function to get a comic
-func (m *model) GetComic(source, slug string) (*Comic, error) {
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return nil, err
- }
- defer m.bolt.CloseDB()
- ret := new(Comic)
- ret.Source = source
- ret.Slug = slug
- bkt := ret.GetBucket()
- if ret.Name, err = m.bolt.GetValue(bkt, "name"); err != nil {
- return nil, err
- }
- if ret.Artist, err = m.bolt.GetValue(bkt, "artist"); err != nil {
- return nil, err
- }
- if ret.Desc, err = m.bolt.GetValue(bkt, "desc"); err != nil {
- return nil, err
- }
- if ret.LastUpdate, err = m.bolt.GetTimestamp(bkt, "lastupdate"); err != nil {
- return nil, err
- }
- return ret, nil
-}
-
-// Load all comics into the model
-func (m *model) LoadComics() error {
- m.Comics = m.GetAllComics()
- return nil
-}
-
-// Save all comics to the DB
-func (m *model) SaveAllComics(comics []Comic) {
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return
- }
- defer m.bolt.CloseDB()
- for i := range comics {
- m.SaveComic(&comics[i])
- }
-}
-
-// Get all comics from the db
-func (m *model) GetAllComics() []Comic {
- var ret []Comic
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return ret
- }
- defer m.bolt.CloseDB()
- var srcs []string
- bkt := []string{"comics"}
- if srcs, err = m.bolt.GetBucketList(bkt); err != nil {
- return ret
- }
- for _, src := range srcs {
- srcBkt := append(bkt, src)
- var slugs []string
- if slugs, err = m.bolt.GetBucketList(srcBkt); err != nil {
- return ret
- }
- for _, slg := range slugs {
- c, err := m.GetComic(src, slg)
- if err == nil {
- ret = append(ret, *c)
- }
- }
- }
- return ret
-}
-
-// Delete a comic from the DB
-func (m *model) DeleteComic(slug string) error {
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return err
- }
- defer m.bolt.CloseDB()
-
- return m.bolt.DeleteBucket([]string{"comics"}, slug)
-}
-
-func (m *model) RemoveMissingComics(comics []Comic) {
- for _, c := range m.Comics {
- var fnd bool
- for _, nc := range comics {
- if nc.Slug == c.Slug {
- fnd = true
- break
- }
- }
- if !fnd {
- m.DeleteComic(c.Slug)
- }
- }
-}
diff --git a/model_feeds.go b/model_feeds.go
new file mode 100644
index 0000000..862c472
--- /dev/null
+++ b/model_feeds.go
@@ -0,0 +1,209 @@
+package main
+
+import (
+ "time"
+)
+
+type Feed struct {
+ Name string
+ Author string
+ Slug string
+ Source string
+ Desc string
+ LastUpdate time.Time
+}
+
+func NewFeed(s, n, a, source string) *Feed {
+ return &Feed{
+ Name: n,
+ Author: a,
+ Slug: s,
+ Source: source,
+ }
+}
+
+func (f *Feed) GetBucket() []string {
+ return []string{"feed", f.Source, f.Slug}
+}
+
+func (f *Feed) Update() error {
+ /*
+ dt := time.Now()
+ desc, err := getFeedDesc(f.Source, f.Slug, dt)
+ if err != nil {
+ return err
+ }
+ if desc == f.Desc {
+ return errors.New("Feed didn't change")
+ }
+ f.Desc = desc
+ f.LastUpdate = dt
+ */
+ return nil
+}
+
+func (f *Feed) GetUrl(dt time.Time) string {
+ var v string
+ /*
+ var e error
+ if v, e = getFeedUrl(f.Source, f.Slug, dt); e != nil {
+ return ""
+ }
+ */
+ return v
+}
+
+func (f *Feed) GetDesc(dt time.Time) string {
+ var v string
+ /*
+ var e error
+ if v, e = getFeedDesc(f.Source, f.Slug, dt); e != nil {
+ return ""
+ }
+ */
+ return v
+}
+
+func (f *Feed) GetRssItem() string {
+ var v string
+ /*
+ var e error
+ if v, e = getRssItem(f.Source, f.Slug); e != nil {
+ return ""
+ }
+ */
+ return v
+}
+
+// DB Function to save a feed
+func (m *model) SaveFeed(f *Feed) error {
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return err
+ }
+ defer m.bolt.CloseDB()
+ bkt := f.GetBucket()
+ if err = m.bolt.MkBucketPath(bkt); err != nil {
+ return err
+ }
+ if err = m.bolt.SetValue(bkt, "name", f.Name); err != nil {
+ return err
+ }
+ if err = m.bolt.SetValue(bkt, "author", f.Author); err != nil {
+ return err
+ }
+ if err = m.bolt.SetValue(bkt, "desc", f.Desc); err != nil {
+ return err
+ }
+ if err = m.bolt.SetTimestamp(bkt, "lastupdate", f.LastUpdate); err != nil {
+ return err
+ }
+ // Add it to the cached list
+ for i, v := range m.Feeds {
+ if v.Source == f.Source && v.Slug == f.Slug {
+ m.Feeds[i] = *f
+ return nil
+ }
+ }
+ m.Feeds = append(m.Feeds, *f)
+ return nil
+}
+
+// DB Function to get a feed
+func (m *model) GetFeed(source, slug string) (*Feed, error) {
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return nil, err
+ }
+ defer m.bolt.CloseDB()
+ ret := new(Feed)
+ ret.Source = source
+ ret.Slug = slug
+ bkt := ret.GetBucket()
+ if ret.Name, err = m.bolt.GetValue(bkt, "name"); err != nil {
+ return nil, err
+ }
+ if ret.Author, err = m.bolt.GetValue(bkt, "author"); err != nil {
+ return nil, err
+ }
+ if ret.Desc, err = m.bolt.GetValue(bkt, "desc"); err != nil {
+ return nil, err
+ }
+ if ret.LastUpdate, err = m.bolt.GetTimestamp(bkt, "lastupdate"); err != nil {
+ return nil, err
+ }
+ return ret, nil
+}
+
+// Load all feeds into the model
+func (m *model) LoadFeeds() error {
+ m.Feeds = m.GetAllFeeds()
+ return nil
+}
+
+// Save all feeds to the DB
+func (m *model) SaveAllFeeds(feeds []Feed) {
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return
+ }
+ defer m.bolt.CloseDB()
+ for i := range feeds {
+ m.SaveFeed(&feeds[i])
+ }
+}
+
+// Get all feeds from the db
+func (m *model) GetAllFeeds() []Feed {
+ var ret []Feed
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return ret
+ }
+ defer m.bolt.CloseDB()
+ var srcs []string
+ bkt := []string{"feeds"}
+ if srcs, err = m.bolt.GetBucketList(bkt); err != nil {
+ return ret
+ }
+ for _, src := range srcs {
+ srcBkt := append(bkt, src)
+ var slugs []string
+ if slugs, err = m.bolt.GetBucketList(srcBkt); err != nil {
+ return ret
+ }
+ for _, slg := range slugs {
+ c, err := m.GetFeed(src, slg)
+ if err == nil {
+ ret = append(ret, *c)
+ }
+ }
+ }
+ return ret
+}
+
+// Delete a feed from the DB
+func (m *model) DeleteFeed(slug string) error {
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return err
+ }
+ defer m.bolt.CloseDB()
+
+ return m.bolt.DeleteBucket([]string{"feeds"}, slug)
+}
+
+func (m *model) RemoveMissingFeeds(feeds []Feed) {
+ for _, c := range m.Feeds {
+ var fnd bool
+ for _, nc := range feeds {
+ if nc.Slug == c.Slug {
+ fnd = true
+ break
+ }
+ }
+ if !fnd {
+ m.DeleteFeed(c.Slug)
+ }
+ }
+}
diff --git a/model_site.go b/model_site.go
deleted file mode 100644
index 5c3d38d..0000000
--- a/model_site.go
+++ /dev/null
@@ -1,86 +0,0 @@
-package main
-
-import "time"
-
-type SiteData struct {
- Title string
- Port int
- SessionName string
- ServerDir string
- SessionSecret string
-
- LastSave time.Time
-}
-
-func NewSiteData() *SiteData {
- ret := new(SiteData)
- ret.Title = "BCW Comic Feed"
- ret.Port = 8080
- ret.SessionName = "bcw-comic-feed"
- ret.ServerDir = "./"
- return ret
-}
-
-func (m *model) LoadSiteData() {
- m.Site = m.GetSite()
-}
-
-func (m *model) SaveSite() error {
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return err
- }
- defer m.bolt.CloseDB()
- bkt := []string{"site"}
- if err = m.bolt.SetValue(bkt, "title", m.Site.Title); err != nil {
- return err
- }
- if err = m.bolt.SetInt(bkt, "port", m.Site.Port); err != nil {
- return err
- }
- if err = m.bolt.SetValue(bkt, "session-name", m.Site.SessionName); err != nil {
- return err
- }
- if err = m.bolt.SetValue(bkt, "session-secret", m.Site.SessionSecret); err != nil {
- return err
- }
- if err = m.bolt.SetValue(bkt, "server-dir", m.Site.ServerDir); err != nil {
- return err
- }
- if err = m.bolt.SetTimestamp(bkt, "last-save", m.Site.LastSave); err != nil {
- return err
- }
- return nil
-}
-
-func (m *model) GetSite() *SiteData {
- s := NewSiteData()
- var err error
- if err = m.bolt.OpenDB(); err != nil {
- return s
- }
- defer m.bolt.CloseDB()
- bkt := []string{"site"}
- var wrkStr string
- var wrkInt int
- var wrkTm time.Time
- if wrkStr, err = m.bolt.GetValue(bkt, "title"); err == nil {
- s.Title = wrkStr
- }
- if wrkInt, err = m.bolt.GetInt(bkt, "port"); err == nil {
- s.Port = wrkInt
- }
- if wrkStr, err = m.bolt.GetValue(bkt, "session-name"); err == nil {
- s.SessionName = wrkStr
- }
- if wrkStr, err = m.bolt.GetValue(bkt, "session-secret"); err == nil {
- s.SessionSecret = wrkStr
- }
- if wrkStr, err = m.bolt.GetValue(bkt, "server-dir"); err == nil {
- s.ServerDir = wrkStr
- }
- if wrkTm, err = m.bolt.GetTimestamp(bkt, "last-save"); err == nil {
- s.LastSave = wrkTm
- }
- return s
-}
diff --git a/model_sitedata.go b/model_sitedata.go
new file mode 100644
index 0000000..0a8a6b1
--- /dev/null
+++ b/model_sitedata.go
@@ -0,0 +1,106 @@
+package main
+
+import (
+ "strings"
+ "time"
+)
+
+/**
+ * SiteData
+ * Contains configuration for the website
+ */
+type SiteData struct {
+ Title string
+ Ip string
+ Port int
+ SessionName string
+ ServerDir string
+
+ DevMode bool
+
+ m *model
+ mPath []string // The path in the db to this site data
+ changed bool
+ lastSave time.Time
+
+ sessionSecret string
+}
+
+// NewSiteData returns a SiteData object with the default values
+func NewSiteData(m *model) *SiteData {
+ ret := new(SiteData)
+ ret.Title = "ribbit"
+ ret.Ip = "127.0.0.1"
+ ret.Port = 8080
+ ret.SessionName = "good-ol-ribbit"
+ ret.ServerDir = "./"
+ ret.mPath = []string{"site"}
+ ret.m = m
+ return ret
+}
+
+// load the site data out of the database
+// If fields don't exist in the DB, don't clobber what is already in s
+func (s *SiteData) LoadFromDB() error {
+ if err := s.m.bolt.OpenDB(); err != nil {
+ return err
+ }
+ defer s.m.bolt.CloseDB()
+
+ if title, _ := s.m.bolt.GetValue(s.mPath, "title"); strings.TrimSpace(title) != "" {
+ s.Title = title
+ }
+ if ip, err := s.m.bolt.GetValue(s.mPath, "ip"); err == nil {
+ s.Ip = ip
+ }
+ if port, err := s.m.bolt.GetInt(s.mPath, "port"); err == nil {
+ s.Port = port
+ }
+ if sessionName, _ := s.m.bolt.GetValue(s.mPath, "session-name"); strings.TrimSpace(sessionName) != "" {
+ s.SessionName = sessionName
+ }
+ if serverDir, _ := s.m.bolt.GetValue(s.mPath, "server-dir"); strings.TrimSpace(serverDir) != "" {
+ s.ServerDir = serverDir
+ }
+ s.changed = false
+ if secret, _ := s.m.bolt.GetValue(s.mPath, "session-secret"); strings.TrimSpace(secret) != "" {
+ s.sessionSecret = secret
+ }
+ return nil
+}
+
+// Return if the site data in memory has changed
+func (s *SiteData) NeedsSave() bool {
+ return s.changed
+}
+
+// Save the site data into the DB
+func (s *SiteData) SaveToDB() error {
+ s.lastSave = time.Now()
+ var err error
+ if err = s.m.bolt.OpenDB(); err != nil {
+ return err
+ }
+ defer s.m.bolt.CloseDB()
+
+ if err = s.m.bolt.SetValue(s.mPath, "title", s.Title); err != nil {
+ return err
+ }
+ if err = s.m.bolt.SetValue(s.mPath, "ip", s.Ip); err != nil {
+ return err
+ }
+ if err = s.m.bolt.SetInt(s.mPath, "port", s.Port); err != nil {
+ return err
+ }
+ if err = s.m.bolt.SetValue(s.mPath, "session-name", s.SessionName); err != nil {
+ return err
+ }
+ if err = s.m.bolt.SetValue(s.mPath, "server-dir", s.ServerDir); err != nil {
+ return err
+ }
+ s.changed = false
+ if err = s.m.bolt.SetValue(s.mPath, "session-secret", s.sessionSecret); err != nil {
+ return err
+ }
+ return nil
+}
diff --git a/model_user.go b/model_user.go
index f9da076..eb7d7a5 100644
--- a/model_user.go
+++ b/model_user.go
@@ -6,12 +6,14 @@ import (
"strings"
"github.com/pborman/uuid"
+ "golang.org/x/crypto/bcrypt"
)
type User struct {
Username string `json:username`
Uuid string `json:uuid`
SubSlugs []string `json:subs`
+ IsAdmin bool `json:admin`
}
func NewUser(un string) *User {
@@ -21,6 +23,7 @@ func NewUser(un string) *User {
return u
}
+/*
func (u *User) UpdateFeed() error {
for _, slug := range u.SubSlugs {
pts := strings.Split(slug, ";")
@@ -33,6 +36,7 @@ func (u *User) UpdateFeed() error {
}
return nil
}
+*/
func (m *model) SaveUser(u *User) error {
var err error
@@ -47,6 +51,13 @@ func (m *model) SaveUser(u *User) error {
if err = m.bolt.SetValue(bkt, "username", u.Username); err != nil {
return err
}
+ var adminVal = "false"
+ if u.IsAdmin {
+ adminVal = "true"
+ }
+ if err = m.bolt.SetValue(bkt, "admin", adminVal); err != nil {
+ return err
+ }
var newSubs []string
for _, v := range u.SubSlugs {
if strings.TrimSpace(v) != "" {
@@ -60,7 +71,39 @@ func (m *model) SaveUser(u *User) error {
return nil
}
+func (m *model) isValidUser(uid string) bool {
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return false
+ }
+ defer m.bolt.CloseDB()
+ ret := new(User)
+ bkt := []string{"users", uid}
+ ret.Uuid = uid
+ if ret.Username, err = m.bolt.GetValue(bkt, "username"); err != nil {
+ fmt.Println("Error getting username value:", err.Error())
+ return false
+ }
+ return true
+}
+
+func (m *model) GetUserByEmail(email string) (*User, error) {
+ if email == "" {
+ return nil, errors.New("No email given")
+ }
+ u := m.GetAllUsers()
+ for i := range u {
+ if u[i].Username == email {
+ return &u[i], nil
+ }
+ }
+ return nil, errors.New("No user found")
+}
+
func (m *model) GetUser(uid string) (*User, error) {
+ if uid == "" {
+ return nil, errors.New("No user id given")
+ }
var err error
if err = m.bolt.OpenDB(); err != nil {
return nil, err
@@ -73,6 +116,8 @@ func (m *model) GetUser(uid string) (*User, error) {
fmt.Println("Error getting username value:", err.Error())
return nil, err
}
+ admin, _ := m.bolt.GetValue(bkt, "admin")
+ ret.IsAdmin = (admin == "true")
var subs string
if subs, err = m.bolt.GetValue(bkt, "subs"); err != nil {
return nil, err
@@ -143,3 +188,50 @@ func (m *model) GetUserIdList() []string {
ret, _ = m.bolt.GetBucketList(bkt)
return ret
}
+
+// updateUserPassword
+// Takes a user id and a password
+// Fails if the user doesn't exist
+func (m *model) updateUserPassword(uid, password string) error {
+ cryptPw, cryptError := bcrypt.GenerateFromPassword([]byte(password), bcrypt.DefaultCost)
+ if cryptError != nil {
+ return cryptError
+ }
+ if _, err := m.GetUser(uid); err != nil {
+ return err
+ }
+
+ if err := m.bolt.OpenDB(); err != nil {
+ return err
+ }
+ defer m.bolt.CloseDB()
+
+ usrPath := []string{"users", uid}
+ return m.bolt.SetValue(usrPath, "password", string(cryptPw))
+}
+
+// Is the uid and pw given valid?
+func (m *model) checkCredentials(uid, pw string) error {
+ var err error
+ if err = m.bolt.OpenDB(); err != nil {
+ return err
+ }
+ defer m.bolt.CloseDB()
+
+ var uPw string
+ usrPath := []string{"users", uid}
+ if uPw, err = m.bolt.GetValue(usrPath, "password"); err != nil {
+ return err
+ }
+ return bcrypt.CompareHashAndPassword([]byte(uPw), []byte(pw))
+}
+
+func (m *model) hasAdminUser() bool {
+ users := m.GetAllUsers()
+ for i := range users {
+ if users[i].IsAdmin {
+ return true
+ }
+ }
+ return false
+}
diff --git a/page_session.go b/page_session.go
index a5fb7cd..ebc40a3 100644
--- a/page_session.go
+++ b/page_session.go
@@ -1,6 +1,7 @@
package main
import (
+ "errors"
"fmt"
"net/http"
@@ -16,6 +17,9 @@ type pageSession struct {
}
func (p *pageSession) getStringValue(key string) (string, error) {
+ if p.session == nil {
+ return "", errors.New("Session is nil")
+ }
val := p.session.Values[key]
var retVal string
var ok bool
diff --git a/helper_dilbert.go b/plugin_src/plugin_dilbert.go
similarity index 56%
rename from helper_dilbert.go
rename to plugin_src/plugin_dilbert.go
index d1a8838..1aba78d 100644
--- a/helper_dilbert.go
+++ b/plugin_src/plugin_dilbert.go
@@ -1,5 +1,8 @@
package main
+import (
+ "C"
+)
import (
"errors"
"fmt"
@@ -9,33 +12,33 @@ import (
"github.com/PuerkitoBio/goquery"
)
-func downloadDilbertList() []Comic {
- var ret []Comic
- ret = append(ret, *NewComic("dilbert", "Dilbert", "Scott Adams", "dilbert"))
+func getFeedList() []Feed {
+ var ret []Feed
+ ret = append(ret, *NewFeed("dilbert", "Dilbert", "Scott Adams", "dilbert"))
return ret
}
-func getDilbertRssItem(slug string) (string, error) {
- desc, err := getDilbertFeedDesc(time.Now())
+func getRssItem(slug string) (string, error) {
+ desc, err := getFeedDesc(time.Now())
if err != nil {
return "", err
}
- comic, err := m.GetComic(SRC_DILBERT, slug)
+ feed, err := m.GetFeed(SRC_DILBERT, slug)
if err != nil {
return "", err
}
desc = ""
ret := " - \n"
- ret += " " + comic.Name + "\n"
- ret += " " + comic.LastUpdate.Format(time.RFC1123Z) + "\n"
- ret += " dilbert;" + slug + ";" + comic.LastUpdate.Format(time.RFC1123Z) + "\n"
- ret += " " + getDilbertComicUrl(time.Now()) + "\n"
+ ret += " " + feed.Name + "\n"
+ ret += " " + feed.LastUpdate.Format(time.RFC1123Z) + "\n"
+ ret += " dilbert;" + slug + ";" + feed.LastUpdate.Format(time.RFC1123Z) + "\n"
+ ret += " " + getFeedUrl(time.Now()) + "\n"
ret += " " + desc + "\n"
ret += "
\n"
return ret, nil
}
-func getDilbertComicUrl(date time.Time) string {
+func getFeedUrl(date time.Time) string {
return fmt.Sprintf(
"http://dilbert.com/strip/%4d-%02d-%02d",
date.Year(),
@@ -44,8 +47,8 @@ func getDilbertComicUrl(date time.Time) string {
)
}
-func getDilbertFeedDesc(date time.Time) (string, error) {
- res, err := http.Get(getDilbertComicUrl(date))
+func getFeedDesc(date time.Time) (string, error) {
+ res, err := http.Get(getFeedUrl(date))
if err != nil {
return "", err
}
diff --git a/helper_gocomics.go b/plugin_src/plugin_gocomics.go
similarity index 85%
rename from helper_gocomics.go
rename to plugin_src/plugin_gocomics.go
index 9f5fcb7..5675e42 100644
--- a/helper_gocomics.go
+++ b/plugin_src/plugin_gocomics.go
@@ -1,6 +1,7 @@
package main
import (
+ "C"
"errors"
"fmt"
"net/http"
@@ -10,8 +11,8 @@ import (
"github.com/PuerkitoBio/goquery"
)
-func downloadGoComicsList() []Comic {
- var ret []Comic
+func downloadList() {
+ var ret []Feed
lstUrl := "http://www.gocomics.com/comics/a-to-z"
res, err := http.Get(lstUrl)
if err != nil {
@@ -47,14 +48,14 @@ func downloadGoComicsList() []Comic {
}
author = strings.TrimPrefix(author, "By ")
author = strings.Replace(author, "\u0026", "&", -1)
- ret = append(ret, *NewComic(slug, name, author, "gocomics"))
+ ret = append(ret, *NewFeed(slug, name, author, "gocomics"))
}
})
return ret
}
-func getGoComicsRssItem(slug string) (string, error) {
- desc, err := getGoComicsFeedDesc(slug, time.Now())
+func getRssItem(slug string) (string, error) {
+ desc, err := getFeedDesc(slug, time.Now())
if err != nil {
return "", err
}
@@ -73,7 +74,7 @@ func getGoComicsRssItem(slug string) (string, error) {
return ret, nil
}
-func getGoComicsComicUrl(slug string, date time.Time) string {
+func getFeedUrl(slug string, date time.Time) string {
return fmt.Sprintf(
"http://www.gocomics.com/%s/%04d/%02d/%02d",
slug,
@@ -83,8 +84,8 @@ func getGoComicsComicUrl(slug string, date time.Time) string {
)
}
-func getGoComicsFeedDesc(slug string, date time.Time) (string, error) {
- res, err := http.Get(getGoComicsComicUrl(slug, date))
+func getFeedDesc(slug string, date time.Time) (string, error) {
+ res, err := http.Get(getFeedUrl(slug, date))
if err != nil {
return "", err
}
diff --git a/plugin_src/plugin_xkcd.go b/plugin_src/plugin_xkcd.go
new file mode 100644
index 0000000..d1f40cb
--- /dev/null
+++ b/plugin_src/plugin_xkcd.go
@@ -0,0 +1,84 @@
+package main
+
+import (
+ "C"
+ "errors"
+ "fmt"
+ "net/http"
+ "time"
+
+ "github.com/PuerkitoBio/goquery"
+)
+
+func getFeedList() []Feed {
+ var ret []Feed
+ ret = append(ret, *NewFeed("xkcd", "XKCD", "Randall Munroe", "xkcd"))
+ return ret
+}
+
+func getRssItem(slug string) (string, error) {
+ desc, err := getFeedDesc(time.Now())
+ if err != nil {
+ return "", err
+ }
+ feed, err := m.GetFeed(SRC_XKCD, slug)
+ if err != nil {
+ return "", err
+ }
+ desc = ""
+ ret := " - \n"
+ ret += " " + feed.Name + "\n"
+ ret += " " + feed.LastUpdate.Format(time.RFC1123Z) + "\n"
+ ret += " xkcd;" + slug + ";" + feed.LastUpdate.Format(time.RFC1123Z) + "\n"
+ ret += " " + getUrl(time.Now()) + "\n"
+ ret += " " + desc + "\n"
+ ret += "
\n"
+ return ret, nil
+}
+
+func getFeedUrl(date time.Time) (string, error) {
+ var isComicDay = func(dt time.Time) bool {
+ return dt.Weekday() == time.Monday || dt.Weekday() == time.Wednesday || dt.Weekday() == time.Friday
+ }
+ if !isComicDay(dt) {
+ return "", errors.New("No URL for the given day")
+ }
+ var num int
+ wrkDate := time.Date(2005, time.August, 19, 0, 0, 0, 0, time.UTC)
+ for wrkDate.Before(dt) {
+ if isComicDay(wrkDate) {
+ num++
+ }
+ wrkDate = wrkDate.Add(time.Hour * 24)
+ }
+ return fmt.Sprintf("https://xkcd.com/%d", num), nil
+}
+
+func getFeedDesc(date time.Time) (string, error) {
+ res, err := http.Get(getUrl(date))
+ if err != nil {
+ return "", err
+ }
+ defer res.Body.Close()
+ if res.StatusCode != 200 {
+ return "", errors.New(fmt.Sprintf("Status code error: %d %s", res.StatusCode, res.Status))
+ }
+
+ // Load the HTML document
+ doc, err := goquery.NewDocumentFromReader(res.Body)
+ if err != nil {
+ return "", err
+ }
+ // Find the Picture
+ sel := doc.Find("div#comic>img")
+ src, exists := sel.Attr("src")
+ if !exists {
+ return "", errors.New("Couldn't find image source")
+ }
+ src = "https:" + src
+ title, exists := sel.Attr("title")
+ if !exists {
+ title = ""
+ }
+ return "![](\"")
" + title + "
", nil
+}
diff --git a/templates/footer.html b/templates/footer.html
new file mode 100644
index 0000000..3076371
--- /dev/null
+++ b/templates/footer.html
@@ -0,0 +1,11 @@
+
+
diff --git a/templates/header.html b/templates/header.html
new file mode 100644
index 0000000..608556f
--- /dev/null
+++ b/templates/header.html
@@ -0,0 +1,9 @@
+
+ {{.FlashMessage}}
+
+
+ {{ if .SubTitle }}
+
+ {{ end }}
diff --git a/templates/htmlfooter.html b/templates/htmlfooter.html
new file mode 100644
index 0000000..10480dd
--- /dev/null
+++ b/templates/htmlfooter.html
@@ -0,0 +1,6 @@
+
+ {{ range $i, $v := .Scripts }}
+
+ {{ end }}
+