Merge branch 'master' of projekte.fagott.pw:grilist

10 files changed, 106 insertions, 34 deletions

diff --git a/.gitignore b/.gitignore
index 5d77737..1216dc4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,3 +13,4 @@ assets/css/*
 
 #Binaries
 /importer
+bin/grilist
diff --git a/Makefile b/Makefile
index 452e1d5..754b1e4 100644
--- a/Makefile
+++ b/Makefile
@@ -1,5 +1,7 @@
 include config.mk
 
+BINARY_PATH = ./bin
+TARGET = $(BINARY_PATH)/$(NAME)
 IMPORTER_FILES = $(shell find tools/importer/ -type f -name '*.go')
 
 CSS_FILES = $(patsubst assets_src/%, assets/%, $(shell find assets_src/css/ -type f -name '*.css'))
@@ -12,7 +14,7 @@ LESSC := ./node_modules/less/bin/lessc
 
 -include $(DEPFILES)
 
-all: $(CSS_FILES) $(LESS_FILES) $(JS_FILES) eventlogging/events.go
+all: assets $(TARGET) $(IMPORTER)
 
 print_info:
         @echo $(CSS_FILES)
@@ -20,6 +22,11 @@ print_info:
         @echo $(JS_FILES)
         @echo $(DEPFILES)
 
+$(NAME): $(TARGET)
+
+$(TARGET): eventlogging/events.go
+        go build -o $@
+
 .npm_update: package.json
         touch $@
         npm install
@@ -27,7 +34,9 @@ print_info:
 package.json: package.json.tpl config.mk
         export NAME=$(NAME) &&\
         export VERSION=$(VERSION) &&\
-        ./bin/template.awk < $< | sh > $@
+        $(BINARY_PATH)/template.awk < $< | sh > $@
+
+assets: $(CSS_FILES) $(LESS_FILES) $(JS_FILES)
 
 assets/css/%.css: assets_src/css/%.css
         @mkdir -p $(@D)
@@ -39,16 +48,17 @@ assets/css/%.css: assets_src/css/%.less .npm_update
         @$(LESSC) $< > $@
 
 assets_src/js/%.d: assets_src/js/%.js
-        @./bin/generate-dependencies $(patsubst assets_src/%, assets/%, $<) $< $@
+        @$(BINARY_PATH)/generate-dependencies $(patsubst assets_src/%, assets/%, $<) $< $@
 
 assets/js/%.js: assets_src/js/%.js assets_src/js/%.d .babelrc .npm_update
         @echo browserify $< -o $@
         @$(BROWSERIFY) --debug $< -o $@ -t babelify
 
 eventlogging/events.go: eventlogging/events.txt
-        @./bin/generate-events < $< > $@
+        ./bin/generate-events < $< > $@
 
 clean:
+        -rm -- $(BINARY_PATH)/$(NAME)
         -rm -- $(CSS_FILES)
         -rm -- $(LESS_FILES)
         -rm -- $(JS_FILES)
@@ -63,11 +73,11 @@ superclean: clean
 ultraclean: superclean
         -rm -r -- node_modules
 
-run: all
-        go run *.go
+run: assets $(TARGET)
+        $(TARGET)
 
 importer: $(IMPORTER_FILES)
         go build -o importer tools/importer/*.go
 
-.PHONY: all print_info clean superclean ultraclean run
+.PHONY: all assets $(NAME) $(TARGET) print_info clean superclean ultraclean run
 
diff --git a/grilist/health.go b/grilist/health.go
new file mode 100644
index 0000000..15697ea
--- /dev/null
+++ b/grilist/health.go
@@ -0,0 +1,16 @@
+package grilist
+
+import (
+        "fmt"
+        "net/http"
+        "runtime"
+
+        "github.com/julienschmidt/httprouter"
+)
+
+func (g *Grilist) HealthCheck(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
+        var mem runtime.MemStats
+        runtime.ReadMemStats(&mem)
+
+        w.Write([]byte(fmt.Sprintf("mem in use: %d\nopen g.DB connections: %d", mem.Alloc, g.DB.Stats().OpenConnections)))
+}
diff --git a/main.go b/main.go
index e1c06e6..75eee68 100644
--- a/main.go
+++ b/main.go
@@ -14,6 +14,7 @@ import (
         "fagott.pw/grilist/modules/grils"
         "fagott.pw/grilist/modules/lists"
         "fagott.pw/grilist/modules/search"
+        "fagott.pw/grilist/modules/series"
         "fagott.pw/grilist/modules/tags"
         "fagott.pw/grilist/modules/user"
         "fagott.pw/nsa"
@@ -76,6 +77,7 @@ func main() {
         }
 
         router.GET("/", index)
+        router.GET("/health", app.HealthCheck)
         router.HandlerFunc("GET", "/login", login.DisplayLogin)
         router.HandlerFunc("POST", "/login", login.Login)
         router.HandlerFunc("GET", "/settings", login.DisplayUserSettings)
@@ -94,6 +96,7 @@ func main() {
         loadModule(tags.New())
         loadModule(search.New())
         loadModule(user.New())
+        loadModule(series.New())
         router.GET("/dashboard", viewDashboard)
 
         log.Fatal(http.ListenAndServe(":8080", nil))
diff --git a/modules/grils/gril.go b/models/gril.go
index 7b54ab1..f0b8f8f 100644
--- a/modules/grils/gril.go
+++ b/models/gril.go
@@ -1,4 +1,4 @@
-package grils
+package models
 
 import (
         "database/sql"
@@ -41,6 +41,7 @@ type Gril struct {
         Series     []series.Series
 }
 
+// Der kram hier sollte eigentlich auch eher wo anders hin als ins Model, oder?!
 func (g *Gril) Slug() string {
         if g.RomajiName == "" {
                 return strconv.Itoa(g.ID)
@@ -51,13 +52,10 @@ func (g *Gril) Slug() string {
                 strings.Replace(g.RomajiName, " ", "", -1))
 }
 
-func ImagePath(id int, useThumbnail bool) string {
+// Das hier sollte auch irgendwo anders hin.
+func (g *Gril) ImagePath(useThumbnail bool) string {
         if useThumbnail {
-                return fmt.Sprintf("http://img.grilist.moe/gril/thumb/%d.jpg", id)
+                return fmt.Sprintf("http://img.grilist.moe/gril/thumb/%d.jpg", g.ID)
         }
-        return fmt.Sprintf("http://img.grilist.moe/gril/full/%d.jpg", id)
-}
-
-func (g *Gril) ImagePath(prioritizeThumbnail bool) string {
-        return ImagePath(g.ID, prioritizeThumbnail)
+        return fmt.Sprintf("http://img.grilist.moe/gril/full/%d.jpg", g.ID)
 }
diff --git a/modules/grils/grils.go b/modules/grils/grils.go
index debb77b..4a9990f 100644
--- a/modules/grils/grils.go
+++ b/modules/grils/grils.go
@@ -14,15 +14,11 @@ import (
         "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
+        "fagott.pw/grilist/models"
 
         "github.com/julienschmidt/httprouter"
 )
 
-type CachedGril struct {
-        Created time.Time
-        Gril    *Gril
-}
-
 var (
         pgArrayReg = regexp.MustCompile(`(((?P<value>(([^",\\{}\s(NULL)])+|"([^"\\]|\\"|\\\\)*")))(,)?)`)
         pgValueIdx int
@@ -55,8 +51,8 @@ func (m *GrilsModule) Init(g *grilist.Grilist) {
         m.c = cache.New()
 }
 
-func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gril, error) {
-        var grils []*Gril
+func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*models.Gril, error) {
+        var grils []*models.Gril
 
         rows, err := m.g.DB.Query(fmt.Sprintf(`SELECT id, kanji_name, romaji_name, other_names, updated_at, age, birthday, tags FROM grilist.grils_flattened WHERE %s`, whereClause), params...)
         if err != nil {
@@ -65,7 +61,7 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gr
 
         defer rows.Close()
         for rows.Next() {
-                gril := &Gril{}
+                gril := &models.Gril{}
                 var tags []byte
                 var otherNames []byte
                 err = rows.Scan(&gril.ID, &gril.KanjiName, &gril.RomajiName, &otherNames, &gril.UpdatedAt, &gril.Age, &gril.Birthday, &tags)
@@ -84,7 +80,7 @@ func (m *GrilsModule) getGrils(whereClause string, params ...interface{}) ([]*Gr
         return grils, nil
 }
 
-func (m *GrilsModule) GetListsOfGril(gril *Gril) error {
+func (m *GrilsModule) GetListsOfGril(gril *models.Gril) error {
         rows, err := m.g.DB.Query(`SELECT list_id FROM grilist.lists_grils WHERE gril_id = $1`, gril.ID)
         if err != nil {
                 return err
@@ -121,7 +117,7 @@ func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.Das
         }
 
         for rows.Next() {
-                var g Gril
+                var g models.Gril
                 if err := rows.Scan(&g.ID, &g.RomajiName, &g.KanjiName); err != nil {
                         log.Println(err)
                         continue
@@ -144,12 +140,12 @@ func (m *GrilsModule) ProvideDashboardData(user *charakterin.User) []grilist.Das
         return categories
 }
 
-func (m *GrilsModule) FromID(id int) (*Gril, error) {
+func (m *GrilsModule) FromID(id int) (*models.Gril, error) {
         if g, ok := m.c.Get(id); ok {
-                return g.(*Gril), nil
+                return g.(*models.Gril), nil
         }
 
-        gril := &Gril{
+        gril := &models.Gril{
                 ID: id,
         }
         t1 := time.Now()
@@ -220,9 +216,9 @@ func (m *GrilsModule) FromID(id int) (*Gril, error) {
         return gril, nil
 }
 
-func (m *GrilsModule) FromIDs(ids []int) ([]*Gril, error) {
+func (m *GrilsModule) FromIDs(ids []int) ([]*models.Gril, error) {
         if len(ids) == 0 {
-                return make([]*Gril, 0), nil
+                return make([]*models.Gril, 0), nil
         }
 
         idList := "("
@@ -276,7 +272,7 @@ func (m *GrilsModule) viewGril(w http.ResponseWriter, r *http.Request, p httprou
         }
 
         defer rows.Close()
-        var similar []*Gril
+        var similar []*models.Gril
         for rows.Next() {
                 var id int
                 if err := rows.Scan(&id); err != nil {
diff --git a/modules/lists/lists.go b/modules/lists/lists.go
index 9c9eaf4..65e969f 100644
--- a/modules/lists/lists.go
+++ b/modules/lists/lists.go
@@ -17,6 +17,7 @@ import (
         "fagott.pw/grilist/eventlogging"
         "fagott.pw/grilist/frontend"
         "fagott.pw/grilist/grilist"
+        "fagott.pw/grilist/models"
         "fagott.pw/grilist/modules/grils"
         "github.com/julienschmidt/httprouter"
         "github.com/lib/pq"
@@ -42,7 +43,7 @@ type List struct {
 
 // ListGril ist ein geranktes Gril
 type ListGril struct {
-        Gril  *grils.Gril
+        Gril  *models.Gril
         Order int
 }
 
diff --git a/modules/search/search.go b/modules/search/search.go
index a614c08..4048dbe 100644
--- a/modules/search/search.go
+++ b/modules/search/search.go
@@ -1,6 +1,7 @@
 package search
 
 import (
+        "fmt"
         "log"
         "net/http"
 
@@ -72,7 +73,9 @@ func (m *Module) instantSearchGril(w http.ResponseWriter, r *http.Request, p htt
                         continue
                 }
 
-                result.ImagePath = grils.ImagePath(result.ID, true)
+                // Jan: Das ist hier irgendwie scheisse, aber wir bauen ja grad irgendwie den kram auf Models um. Wir brauchen da
+                // irgendwas besseres.
+                result.ImagePath = fmt.Sprintf("http://img.grilist.moe/gril/thumb/%d.jpg", result.ID)
                 results = append(results, result)
         }
 
diff --git a/modules/series/module.go b/modules/series/module.go
new file mode 100644
index 0000000..295e16b
--- /dev/null
+++ b/modules/series/module.go
@@ -0,0 +1,44 @@
+package series
+
+import (
+        "net/http"
+        "strconv"
+
+        "fagott.pw/charakterin"
+        "fagott.pw/grilist/grilist"
+        "github.com/julienschmidt/httprouter"
+)
+
+type Module struct {
+        g *grilist.Grilist
+}
+
+func New() *Module {
+        return &Module{}
+}
+
+func (m *Module) Name() string {
+        return "Series"
+}
+
+func (m *Module) Init(g *grilist.Grilist) {
+        m.g = g
+
+        m.g.Router.GET("/series/:id", m.viewSeries)
+}
+
+func (m *Module) ProvideDashboardData(user *charakterin.User) []grilist.DashboardCategory {
+        return make([]grilist.DashboardCategory, 0)
+}
+
+func (m *Module) viewSeries(w http.ResponseWriter, r *http.Request, p httprouter.Params) {
+        _, _ = m.g.Charakterin.GetUserFromRequest(r)
+
+        _, err := strconv.Atoi(p.ByName("id"))
+        if err != nil {
+                http.Redirect(w, r, "/", 302)
+                return
+        }
+
+        http.Error(w, "not implemented", 500)
+}
diff --git a/views/pages/gril.html b/views/pages/gril.html
index 69d7fcd..b2a00a6 100644
--- a/views/pages/gril.html
+++ b/views/pages/gril.html
@@ -78,7 +78,7 @@
                         <h1>Ähnliche Grils</h1>
                         <div class="row">
                                 {{ range .SimilarGrils }}
-                                <div class="col s3">
+                                <div class="col s6 m4 l3">
                                         {{ template "card_gril" . }}
                                 </div>
                                 {{ end }}