Merge branch 'master' into master

2017-05-05 11:31:47 +10:00 · 2017-05-05 11:31:47 +10:00 · e9d0138b73
Parent 90f33bcb7a b9a5c6d965
--- a/.gitignore
+++ b/.gitignore
@ -2,4 +2,6 @@
 *.db
 main
 nyaa
-nyaa-master.exe
+nyaa.exe
+nyaa-master.exe
+*.zip
--- a/index.html
+++ b/index.html
@ -107,6 +107,8 @@
                  <th>Id</th>
                  <th>Name</th>
                  <th>Hash</th>
+                  <th>Date</th>
+                  <th>Size</th>
                  <th>Links</th>
              </tr>
              {{ range .ListTorrents}}
@ -114,8 +116,10 @@
                  {{if eq .Status 3}}class="trusted"{{end}}
                  {{if eq .Status 4}}class="aplus"{{end}}>
                  <td>{{.Id}}</td>
-                  <td>{{.Name}}</td>
+                  <td><a href="/view/{{.Id}}">{{.Name}}</a></td>
                  <td>{{.Hash}}</td>
+                  <td>{{.Date}}</td>
+                  <td>{{.Filesize}}</td>


                  <td><a href="{{.Magnet}}" title="Magnet link" ><span class="glyphicon glyphicon-magnet" aria-hidden="true"></span></a>
--- a/main.go
+++ b/main.go
@ -16,7 +16,7 @@ import (
 )

 var db *gorm.DB
-var templates = template.Must(template.ParseFiles("index.html", "FAQ.html"))
+var templates = template.Must(template.ParseFiles("index.html", "FAQ.html", "view.html"))
 var debugLogger *log.Logger
 var trackers = "&tr=udp://zer0day.to:1337/announce&tr=udp://tracker.leechers-paradise.org:6969&tr=udp://explodie.org:6969&tr=udp://tracker.opentrackr.org:1337&tr=udp://tracker.coppersurfer.tk:6969"

@ -64,7 +64,7 @@ func apiHandler(w http.ResponseWriter, r *http.Request) {
 	}
 }

-func singleapiHandler(w http.ResponseWriter, r *http.Request) {
+func apiViewHandler(w http.ResponseWriter, r *http.Request) {

 	vars := mux.Vars(r)
 	id := vars["id"]
@ -197,6 +197,23 @@ func rssHandler(w http.ResponseWriter, r *http.Request) {
 		http.Error(w, err.Error(), http.StatusInternalServerError)
 	}
 }
+func viewHandler(w http.ResponseWriter, r *http.Request) {
+
+	vars := mux.Vars(r)
+	id := vars["id"]
+	b := []TorrentsJson{}
+
+	torrent, err := getTorrentById(id)
+	res := torrent.toJson()
+	b = append(b, res)
+
+	htv := HomeTemplateVariables{b, getAllCategories(false), "", "", "_", 1, 1}
+
+	err = templates.ExecuteTemplate(w, "view.html", htv)
+	if err != nil {
+		http.Error(w, err.Error(), http.StatusInternalServerError)
+	}
+}

 func rootHandler(w http.ResponseWriter, r *http.Request) {
 	vars := mux.Vars(r)
@ -245,9 +262,10 @@ func main() {
 	router.HandleFunc("/search", searchHandler)
 	router.HandleFunc("/search/{page}", searchHandler)
 	router.HandleFunc("/api/{page}", apiHandler).Methods("GET")
-	router.HandleFunc("/api/torrent/{id}", singleapiHandler).Methods("GET")
+	router.HandleFunc("/api/view/{id}", apiViewHandler).Methods("GET")
 	router.HandleFunc("/faq", faqHandler)
 	router.HandleFunc("/feed.xml", rssHandler)
+	router.HandleFunc("/view/{id}", viewHandler)

 	http.Handle("/", router)

--- a/models.go
+++ b/models.go
@ -67,11 +67,13 @@ type CategoryJson struct {
 }

 type TorrentsJson struct {
-	Id     string       `json: "id"` // Is there a need to put the ID?
-	Name   string       `json: "name"`
-	Status int          `json: "status"`
-	Hash   string       `json: "hash"`
-	Magnet template.URL `json: "magnet"`
+	Id       string       `json: "id"` // Is there a need to put the ID?
+	Name     string       `json: "name"`
+	Status   int          `json: "status"`
+	Hash     string       `json: "hash"`
+	Date     int          `json: "date"`
+	Filesize string       `json: "filesize"`
+	Magnet   template.URL `json: "magnet"`
 }

 type WhereParams struct {
@ -194,11 +196,13 @@ func getAllCategories(populatedWithTorrents bool) []Categories {
 func (t *Torrents) toJson() TorrentsJson {
 	magnet := "magnet:?xt=urn:btih:" + strings.TrimSpace(t.Hash) + "&dn=" + t.Name + trackers
 	res := TorrentsJson{
-		Id:     strconv.Itoa(t.Id),
-		Name:   html.UnescapeString(t.Name),
-		Status: t.Status_id,
-		Hash:   t.Hash,
-		Magnet: safe(magnet)}
+		Id:       strconv.Itoa(t.Id),
+		Name:     html.UnescapeString(t.Name),
+		Status:   t.Status_id,
+		Hash:     t.Hash,
+		Date:     t.Date,
+		Filesize: t.Filesize,
+		Magnet:   safe(magnet)}
 	return res
 }

--- a/package.sh
+++ b/package.sh
@ -0,0 +1,20 @@
+#!/usr/bin/env bash
+# Helper script to ease building binary packages for multiple targets.
+# Requires the linux64 and mingw64 gcc compilers and zip.
+# On Debian-based distros install mingw-w64.
+
+version=$(git describe --tags)
+declare -a OSes
+OSes[0]='linux;x86_64-linux-gnu-gcc'
+OSes[1]='windows;x86_64-w64-mingw32-gcc'
+
+for i in "${OSes[@]}"; do
+	arr=(${i//;/ })
+	os=${arr[0]}
+	cc=${arr[1]}
+	rm -f nyaa nyaa.exe
+	echo -e "\nBuilding $os..."
+	echo GOOS=$os GOARCH=amd64 CC=$cc CGO_ENABLED=1 go build -v
+	GOOS=$os GOARCH=amd64 CC=$cc CGO_ENABLED=1 go build -v
+	zip -9 -q nyaa-${version}_${os}_amd64.zip css js *.md *.html nyaa nyaa.exe
+done
--- a/view.html
+++ b/view.html
@ -0,0 +1,139 @@
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
+    <!-- The above 3 meta tags *must* come first in the head; any other head content must come *after* these tags -->
+    <title>Nyaa Pantsu</title>
+    <!-- Latest compiled and minified CSS -->
+    <link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/css/bootstrap.min.css" integrity="sha384-BVYiiSIFeK1dGmJRAkycuHAHRg32OmUcww7on3RYdg4Va+PmSTsz/K68vbdEjh4u" crossorigin="anonymous">
+
+    <!-- Bootstrap -->
+
+    <!-- HTML5 shim and Respond.js for IE8 support of HTML5 elements and media queries -->
+    <!-- WARNING: Respond.js doesn't work if you view the page via file:// -->
+    <!--[if lt IE 9]>
+      <script src="https://oss.maxcdn.com/html5shiv/3.7.3/html5shiv.min.js"></script>
+      <script src="https://oss.maxcdn.com/respond/1.4.2/respond.min.js"></script>
+    <![endif]-->
+
+    <!-- Website CSS -->
+    <link rel="stylesheet" href="https://nyaa.pantsu.cat/css/style.css">
+  </head>
+  <body>
+      <nav class="navbar navbar-default">
+          <div class="container">
+              <div class="navbar-header">
+                  <button type="button" class="navbar-toggle collapsed" data-toggle="collapse" data-target="#bs-example-navbar-collapse-1" aria-expanded="false">
+                      <span class="sr-only">Toggle navigation</span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                      <span class="icon-bar"></span>
+                  </button>
+                  <a class="navbar-brand" href="https://nyaa.pantsu.cat">Nyaa Pantsu</a>
+              </div>
+              <div class="collapse navbar-collapse" id="bs-example-navbar-collapse-1">
+                  <ul class="nav navbar-nav">
+                      <li><a href="https://sukebei.pantsu.cat">Sukebei Pantsu</a></li>
+                      <li><a href="https://nyaa.pantsu.cat/faq">Faq</a></li>
+
+                  </ul>
+                  <form class="navbar-form navbar-right" role="search" action="/search" method="get">
+                      <div class="form-group">
+                          <select name="c" class="form-control input-sm" value>
+                            <option value="_">All categories</option>
+                            <option value="1_" {{if eq .Category "1_"}}selected{{end}}>Software</option>
+                            <option value="1_1" {{if eq .Category "1_1"}}selected{{end}}>Software - Applications</option>
+                            <option value="1_2" {{if eq .Category "1_2"}}selected{{end}}>Software - Games</option>
+                            <option value="2_" {{if eq .Category "2_"}}selected{{end}}>Audio</option>
+                            <option value="2_3" {{if eq .Category "2_3"}}selected{{end}}>Audio - Lossless</option>
+                            <option value="2_4" {{if eq .Category "2_4"}}selected{{end}}>Audio - Lossy</option>
+                            <option value="3_" {{if eq .Category "3_"}}selected{{end}}>Anime</option>
+                            <option value="3_5" {{if eq .Category "3_5"}}selected{{end}}>Anime - English-translated</option>
+                            <option value="3_6" {{if eq .Category "3_6"}}selected{{end}}>Anime - Raw</option>
+                            <option value="4_" {{if eq .Category "4_"}}selected{{end}}>Literature</option>
+                            <option value="4_7" {{if eq .Category "4_7"}}selected{{end}}>Literature - English-translated</option>
+                            <option value="4_8" {{if eq .Category "4_8"}}selected{{end}}>Literature - Raw</option>
+                            <option value="5_" {{if eq .Category "5_"}}selected{{end}}>Live Action</option>
+                            <option value="5_9" {{if eq .Category "5_9"}}selected{{end}}>Live Action - English-translated</option>
+                            <option value="5_10" {{if eq .Category "5_10"}}selected{{end}}>Live Action - Idol/Promotional Video</option>
+                            <option value="5_11" {{if eq .Category "5_11"}}selected{{end}}>Live Action - Raw</option>
+                          </select>
+                          <select name="s" class="form-control input-sm">
+                            <option value="">Search all</option>
+                            <option value="2" {{if eq .Status "2"}}selected{{end}}>Remakes</option>
+                            <option value="3" {{if eq .Status "3"}}selected{{end}}>Trusted</option>
+                            <option value="4" {{if eq .Status "4"}}selected{{end}}>A+</option>
+                          </select>
+                          <input name="q" class="form-control input-sm" placeholder="Search" type="text" value={{.Query}}>
+                          <select name="max" class="form-control input-sm" value>
+                            <option value="">No Items per Page</option>
+                            <option value="5" {{if eq .QueryRecordCount 5}}selected{{end}}>5</option>
+                            <option value="10" {{if eq .QueryRecordCount 10}}selected{{end}}>10</option>
+                            <option value="15" {{if eq .QueryRecordCount 15}}selected{{end}}>15</option>
+                            <option value="20" {{if eq .QueryRecordCount 20}}selected{{end}}>20</option>
+                            <option value="25" {{if eq .QueryRecordCount 25}}selected{{end}}>25</option>
+                            <option value="30" {{if eq .QueryRecordCount 30}}selected{{end}}>30</option>
+                            <option value="35" {{if eq .QueryRecordCount 35}}selected{{end}}>35</option>
+                            <option value="40" {{if eq .QueryRecordCount 40}}selected{{end}}>40</option>
+                            <option value="45" {{if eq .QueryRecordCount 45}}selected{{end}}>45</option>
+                            <option value="50" {{if eq .QueryRecordCount 50}}selected{{end}}>50</option>
+                            <option value="70" {{if eq .QueryRecordCount 70}}selected{{end}}>70</option>
+                            <option value="100" {{if eq .QueryRecordCount 100}}selected{{end}}>100</option>
+                            <option value="150" {{if eq .QueryRecordCount 150}}selected{{end}}>150</option>
+                            <option value="200" {{if eq .QueryRecordCount 200}}selected{{end}}>200</option>
+                            <option value="300" {{if eq .QueryRecordCount 300}}selected{{end}}>300</option>
+                          </select>
+                      </div>
+                      <button type="submit" class="btn btn-default">Search</button>
+                  </form>
+              </div>
+          </div>
+      </nav>
+
+      <div class="container">
+          <table class="table">
+              {{ range .ListTorrents}}
+              <tr {{if eq .Status 2}}class="remake"{{end}}
+                  {{if eq .Status 3}}class="trusted"{{end}}
+                  {{if eq .Status 4}}class="aplus"{{end}}>
+                  <td>Id</td>
+                  <td>{{.Id}}</td>
+              </tr>
+              <tr>
+                  <td>Name</td>
+                  <td>{{.Name}}</td>
+              </tr>
+              <tr>
+                  <td>Hash</td>
+                  <td>{{.Hash}}</td>
+              </tr>
+              <tr>
+                  <td>Date</td>
+                  <td>{{.Date}}</td>
+              </tr>
+              <tr>
+                  <td>FileSize</td>
+                  <td>{{.Filesize}}</td>
+              </tr>
+              tr
+              <tr>
+                  <td>Links</td>
+                  <td><a href="{{.Magnet}}" title="Magnet link" ><span class="glyphicon glyphicon-magnet" aria-hidden="true"></span></a>
+                      <a href="https://itorrents.org/torrent/{{.Hash}}.torrent" title="Torrent file"><span class="glyphicon glyphicon-floppy-save" aria-hidden="true"></span></a>
+                  </td>
+              </tr>
+              {{end}}
+
+          </table>
+      </div>
+
+    <!-- jQuery (necessary for Bootstrap's JavaScript plugins) -->
+    <script src="https://ajax.googleapis.com/ajax/libs/jquery/1.12.4/jquery.min.js"></script>
+    <!-- Include all compiled plugins (below), or include individual files as needed -->
+    <!-- Latest compiled and minified JavaScript -->
+    <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js" integrity="sha384-Tc5IQib027qvyjSMfHjOMaLkfuWVxZxUPnCJA7l2mCWNIpG9mGCD8wGNIcPD7Txa" crossorigin="anonymous"></script>
+
+</body>
+</html>