sorted files and tasks by added time

boypt · Aug 29, 2019 · 8797ed3 · 8797ed3
1 parent 6b540e4
commit 8797ed3
Show file tree

Hide file tree

Showing 8 changed files with 31 additions and 17 deletions.
diff --git a/engine/engine.go b/engine/engine.go
@@ -168,7 +168,10 @@ func (e *Engine) upsertTorrent(tt *torrent.Torrent) *Torrent {
 	ih := tt.InfoHash().HexString()
 	torrent, ok := e.ts[ih]
 	if !ok {
-		torrent = &Torrent{InfoHash: ih}
+		torrent = &Torrent{
+			InfoHash: ih,
+			AddedAt:  time.Now(),
+		}
 		e.ts[ih] = torrent
 	}
 	//update torrent fields using underlying torrent

diff --git a/engine/torrent.go b/engine/torrent.go
@@ -24,6 +24,7 @@ type Torrent struct {
 	DownloadRate  float32
 	UploadRate    float32
 	SeedRatio     float32
+	AddedAt       time.Time
 	Stats         torrent.TorrentStats
 	t             *torrent.Torrent
 	updatedAt     time.Time

diff --git a/go.mod b/go.mod
@@ -4,31 +4,20 @@ go 1.12
 
 require (
 	github.com/NYTimes/gziphandler v1.1.1
-	github.com/PuerkitoBio/goquery v1.5.0 // indirect
 	github.com/anacrolix/torrent v1.5.2
-	github.com/andrew-d/go-termutil v0.0.0-20150726205930-009166a695a2 // indirect
 	github.com/boypt/scraper v0.0.0-20190812010241-70ab02dcd31b
 	github.com/elazarl/go-bindata-assetfs v1.0.0
-	github.com/elithrar/simple-scrypt v1.3.0 // indirect
-	github.com/gorilla/websocket v1.4.0 // indirect
-	github.com/hashicorp/golang-lru v0.5.3 // indirect
-	github.com/jpillora/ansi v0.0.0-20170202005112-f496b27cd669 // indirect
 	github.com/jpillora/archive v0.0.0-20160301031048-e0b3681851f1
 	github.com/jpillora/backoff v0.0.0-20180909062703-3050d21c67d7
 	github.com/jpillora/cloud-torrent v0.0.0-00010101000000-000000000000
 	github.com/jpillora/cookieauth v0.0.0-20190219222732-2ae29b2a9c76
-	github.com/jpillora/eventsource v0.0.0-20170920003432-7ed8c999e167 // indirect
 	github.com/jpillora/opts v1.0.5
 	github.com/jpillora/requestlog v0.0.0-20181015073026-df8817be5f82
 	github.com/jpillora/scraper v0.0.0-20171020112404-0b5e5ce320ff
-	github.com/jpillora/sizestr v0.0.0-20160130011556-e2ea2fa42fb9 // indirect
 	github.com/jpillora/velox v0.0.0-20180825063758-42845d323220
-	github.com/mattbaird/jsonpatch v0.0.0-20171005235357-81af80346b1a // indirect
-	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7 // indirect
 	github.com/radovskyb/watcher v1.0.6
 	github.com/shirou/gopsutil v2.18.12+incompatible
 	github.com/skratchdot/open-golang v0.0.0-20190402232053-79abb63cd66e
-	github.com/tomasen/realip v0.0.0-20180522021738-f0c99a92ddce // indirect
 	golang.org/x/time v0.0.0-20190308202827-9d24e82272b4
 )
 

diff --git a/go.sum b/go.sum
@@ -144,6 +144,8 @@ github.com/gopherjs/gopherjs v0.0.0-20190309154008-847fc94819f9 h1:Z0f701LpR4dqO
 github.com/gopherjs/gopherjs v0.0.0-20190309154008-847fc94819f9/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY=
 github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q=
 github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ=
+github.com/gorilla/websocket v1.4.1 h1:q7AeDBpnBk8AogcD4DSag/Ukw/KV+YhzLj2bP5HvKCM=
+github.com/gorilla/websocket v1.4.1/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
 github.com/gosuri/uilive v0.0.0-20170323041506-ac356e6e42cd/go.mod h1:qkLSc0A5EXSP6B04TrN4oQoxqFI7A8XvoXSlJi8cwk8=
 github.com/gosuri/uilive v0.0.3/go.mod h1:qkLSc0A5EXSP6B04TrN4oQoxqFI7A8XvoXSlJi8cwk8=
 github.com/gosuri/uiprogress v0.0.0-20170224063937-d0567a9d84a1/go.mod h1:C1RTYn4Sc7iEyf6j8ft5dyoZ4212h8G1ol9QQluh5+0=

diff --git a/server/server_files.go b/server/server_files.go
@@ -8,6 +8,7 @@ import (
 	"net/http"
 	"os"
 	"path/filepath"
+	"sort"
 	"strings"
 	"time"
 
@@ -110,5 +111,11 @@ func list(path string, info os.FileInfo, node *fsNode, n *int) error {
 		node.Size += c.Size
 		node.Children = append(node.Children, c)
 	}
+
+	// sort by modified time
+	sort.Slice(node.Children, func(i, j int) bool {
+		return node.Children[i].Modified.Before(node.Children[j].Modified)
+	})
+
 	return nil
 }
diff --git a/static/files.go b/static/files.go
diff --git a/static/files/js/utils.js b/static/files/js/utils.js
@@ -125,6 +125,18 @@ app.filter("round", function() {
   };
 });
 
+app.filter('dictValuesArray', function () {
+  return function (obj) {
+      if (!(obj instanceof Object)) return obj;
+
+      var arr = [];
+      for (var key in obj) {
+          arr.push(obj[key]);
+      }
+      return arr;
+  }
+})
+
 app.directive("ngEnter", function() {
   return function(scope, element, attrs) {
     element.bind("keydown keypress", function(event) {

diff --git a/static/files/template/torrents.html b/static/files/template/torrents.html
@@ -11,7 +11,7 @@ <h5 class="right">
   <p>Add torrents above</p>
 </div>
 
-<div ng-repeat="(hash, t) in state.Torrents" ng-class="{open: t.open}" class="ui torrent segment">
+<div ng-repeat="t in state.Torrents | dictValuesArray | orderBy:'AddedAt'" ng-class="{open: t.open}" class="ui torrent segment">
 
   <div ng-if="!t.Loaded" class="ui active inverted dimmer">
     <div class="ui text loader">Loading</div>