Merge branch 'master' of https://github.com/ewhal/nyaa

main.go

@@ -1,6 +1,8 @@
 package main
 
 import (
+	"bytes"
+	"compress/zlib"
 	"encoding/json"
 	"github.com/gorilla/feeds"
 	"github.com/gorilla/mux"
@@ -8,6 +10,7 @@ import (
 	_ "github.com/jinzhu/gorm/dialects/sqlite"
 	"html"
 	"html/template"
+	"io/ioutil"
 	"log"
 	"net/http"
 	"strconv"
@@ -36,6 +39,16 @@ func checkErr(err error) {
 	}
 }
 
+func unZlib(description []byte) string {
+	b := bytes.NewReader(description)
+	z, err := zlib.NewReader(b)
+	checkErr(err)
+	defer z.Close()
+	p, err := ioutil.ReadAll(z)
+	checkErr(err)
+	return string(p)
+}
+
 func apiHandler(w http.ResponseWriter, r *http.Request) {
 
 	vars := mux.Vars(r)

models.go

@@ -73,6 +73,7 @@ type TorrentsJson struct {
 	Hash        string       `json: "hash"`
 	Date        int          `json: "date"`
 	Filesize    string       `json: "filesize"`
+	Description string       `json: "description"`
 	Magnet      template.URL `json: "magnet"`
 }
 
@@ -202,6 +203,7 @@ func (t *Torrents) toJson() TorrentsJson {
 		Hash:        t.Hash,
 		Date:        t.Date,
 		Filesize:    t.Filesize,
+		Description: unZlib(t.Description),
 		Magnet:      safe(magnet)}
 	return res
 }

view.html

@@ -124,6 +124,10 @@
                       <a href="https://itorrents.org/torrent/{{.Hash}}.torrent" title="Torrent file"><span class="glyphicon glyphicon-floppy-save" aria-hidden="true"></span></a>
                   </td>
               </tr>
+              <tr>
+                  <td>Description</td>
+                  <td>{{.Description}}</td>
+              </tr>
               {{end}}
 
           </table>