Compare commits
4 Commits
ae7c752e43
...
0797588e40
Author | SHA1 | Date | |
---|---|---|---|
0797588e40 | |||
7f91b145eb | |||
eff6b6e19f | |||
9494cf571f |
@ -7,7 +7,8 @@ import (
|
||||
|
||||
"git.quimbo.fr/odwrtw/canape/backend/models"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
)
|
||||
|
||||
// TorrentEventer represents the Eventer for torrents
|
||||
@ -16,7 +17,7 @@ type TorrentEventer struct {
|
||||
done chan struct{}
|
||||
pClient *papi.Client
|
||||
// previous keep the previous data
|
||||
previous []*papi.Torrent
|
||||
previous []*polochon.Torrent
|
||||
// data holds the computed data
|
||||
data []*models.TorrentVideo
|
||||
}
|
||||
|
@ -130,7 +130,7 @@ func RefreshShows(env *web.Env) {
|
||||
|
||||
// Iterate over the map of shows to refresh them
|
||||
for id := range showMap {
|
||||
show := shows.New(id, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
show := shows.New(id)
|
||||
// Refresh the shows
|
||||
err := show.Refresh(env, env.Config.Show.Detailers)
|
||||
if err != nil {
|
||||
@ -196,7 +196,7 @@ func RefreshMovies(env *web.Env) {
|
||||
|
||||
// Iterate over the map of movies to refresh them
|
||||
for id := range movieMap {
|
||||
movie := movies.New(env, id, nil, nil, false)
|
||||
movie := movies.New(id, nil, nil, false)
|
||||
// Refresh the movie
|
||||
err := movie.Refresh(env, env.Config.Movie.Detailers)
|
||||
if err != nil {
|
||||
|
@ -80,7 +80,7 @@ func GetMovies(env *web.Env, user *models.User, source string, category string)
|
||||
// Fill all the movies infos from the list of IDs
|
||||
for _, id := range media.IDs {
|
||||
pMovie, _ := pMovies.Has(id)
|
||||
movie := movies.New(env, id, client, pMovie, moviesWishlist.IsMovieInWishlist(id))
|
||||
movie := movies.New(id, client, pMovie, moviesWishlist.IsMovieInWishlist(id))
|
||||
// First check in the DB
|
||||
before := []polochon.Detailer{env.Backend.Detailer}
|
||||
// Then with the default detailers
|
||||
@ -141,7 +141,7 @@ func GetShows(env *web.Env, user *models.User, source string, category string, f
|
||||
for _, id := range media.IDs {
|
||||
pShow, _ := pShows.Has(id)
|
||||
wShow, _ := wShows.IsShowInWishlist(id)
|
||||
show := shows.NewWithClient(&polochon.Show{ImdbID: id}, client, pShow, wShow, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
show := shows.NewWithClient(&polochon.Show{ImdbID: id}, client, pShow, wShow)
|
||||
|
||||
// First check in the DB
|
||||
before := []polochon.Detailer{env.Backend.Detailer}
|
||||
|
@ -6,7 +6,7 @@ import (
|
||||
"fmt"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/odwrtw/papi"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
)
|
||||
|
||||
const (
|
||||
|
@ -2,20 +2,19 @@ package models
|
||||
|
||||
import (
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// TorrentVideo reprensents a torrent embeding the video inforamtions
|
||||
type TorrentVideo struct {
|
||||
*papi.Torrent
|
||||
*polochon.Torrent
|
||||
Img string `json:"img"`
|
||||
Video polochon.Video `json:"video,omitempty"`
|
||||
}
|
||||
|
||||
// NewTorrentVideo returns a new TorrentVideo
|
||||
func NewTorrentVideo(t *papi.Torrent) *TorrentVideo {
|
||||
func NewTorrentVideo(t *polochon.Torrent) *TorrentVideo {
|
||||
torrent := &polochon.Torrent{
|
||||
ImdbID: t.ImdbID,
|
||||
Type: polochon.VideoType(t.Type),
|
||||
@ -57,7 +56,7 @@ func (t *TorrentVideo) Update(detailer polochon.Detailer, db *sqlx.DB, log *logr
|
||||
}
|
||||
|
||||
// NewTorrentVideos returns a new slice of TorrentVideo from papi torrents
|
||||
func NewTorrentVideos(detailer polochon.Detailer, db *sqlx.DB, log *logrus.Entry, torrents []*papi.Torrent) []*TorrentVideo {
|
||||
func NewTorrentVideos(detailer polochon.Detailer, db *sqlx.DB, log *logrus.Entry, torrents []*polochon.Torrent) []*TorrentVideo {
|
||||
tv := make([]*TorrentVideo, len(torrents))
|
||||
for i := range torrents {
|
||||
tv[i] = NewTorrentVideo(torrents[i])
|
||||
|
@ -4,10 +4,11 @@ import (
|
||||
"database/sql"
|
||||
"errors"
|
||||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/jmoiron/sqlx"
|
||||
"github.com/jmoiron/sqlx/types"
|
||||
"github.com/odwrtw/papi"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
)
|
||||
|
||||
const (
|
||||
@ -25,7 +26,15 @@ const (
|
||||
RETURNING *;`
|
||||
deleteUserQuery = `DELETE FROM users WHERE id=:id;`
|
||||
|
||||
getAllUsersQuery = `SELECT * FROM users order by created_at;`
|
||||
getAllUsersQuery = `
|
||||
SELECT u.*, tok.last_seen
|
||||
FROM users u
|
||||
LEFT OUTER JOIN (
|
||||
SELECT username, MAX(last_used) AS last_seen
|
||||
FROM tokens GROUP BY username
|
||||
) AS tok
|
||||
ON u.name = tok.username;
|
||||
`
|
||||
getPolochonUsersQuery = `SELECT * FROM users WHERE polochon_id = $1;`
|
||||
)
|
||||
|
||||
@ -51,6 +60,7 @@ type User struct {
|
||||
PolochonID sql.NullString `json:"polochon_id" db:"polochon_id"`
|
||||
PolochonActivated bool `json:"polochon_activated" db:"polochon_activated"`
|
||||
Polochon *Polochon `json:"polochon"`
|
||||
LastSeen *time.Time `json:"last_seen" db:"last_seen"`
|
||||
}
|
||||
|
||||
// NewPapiClient creates a new papi client for the given user
|
||||
|
@ -10,7 +10,6 @@ import (
|
||||
_ "github.com/odwrtw/polochon/modules/mock"
|
||||
_ "github.com/odwrtw/polochon/modules/openguessit"
|
||||
_ "github.com/odwrtw/polochon/modules/opensubtitles"
|
||||
_ "github.com/odwrtw/polochon/modules/pam"
|
||||
_ "github.com/odwrtw/polochon/modules/pushover"
|
||||
_ "github.com/odwrtw/polochon/modules/tmdb"
|
||||
_ "github.com/odwrtw/polochon/modules/tpb"
|
||||
|
@ -10,8 +10,8 @@ import (
|
||||
"git.quimbo.fr/odwrtw/canape/backend/subtitles"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@ -76,7 +76,7 @@ func RefreshMovieHandler(env *web.Env, w http.ResponseWriter, r *http.Request) e
|
||||
}
|
||||
|
||||
// Create a new movie
|
||||
m := New(env, id, client, pMovie, isWishlisted)
|
||||
m := New(id, client, pMovie, isWishlisted)
|
||||
|
||||
// Refresh the movie's infos
|
||||
if err := m.Refresh(env, env.Config.Movie.Detailers); err != nil {
|
||||
@ -141,7 +141,6 @@ func SearchMovie(env *web.Env, w http.ResponseWriter, r *http.Request) error {
|
||||
for _, m := range movies {
|
||||
pMovie, _ := pMovies.Has(m.ImdbID)
|
||||
movie := New(
|
||||
env,
|
||||
m.ImdbID,
|
||||
client,
|
||||
pMovie,
|
||||
@ -193,7 +192,7 @@ func PolochonDeleteHandler(env *web.Env, w http.ResponseWriter, r *http.Request)
|
||||
}
|
||||
|
||||
// Delete the movie
|
||||
return client.Delete(&papi.Movie{ImdbID: id})
|
||||
return client.Delete(&papi.Movie{Movie: &polochon.Movie{ImdbID: id}})
|
||||
}
|
||||
|
||||
// AddToWishlist adds a movie to the user's wishlist
|
||||
@ -251,7 +250,6 @@ func GetWishlistHandler(env *web.Env, w http.ResponseWriter, r *http.Request) er
|
||||
for _, imdbID := range moviesWishlist.List() {
|
||||
pMovie, _ := pMovies.Has(imdbID)
|
||||
movie := New(
|
||||
env,
|
||||
imdbID,
|
||||
client,
|
||||
pMovie,
|
||||
@ -295,7 +293,7 @@ func RefreshMovieSubtitlesHandler(env *web.Env, w http.ResponseWriter, r *http.R
|
||||
return env.RenderError(w, err)
|
||||
}
|
||||
|
||||
movie := &papi.Movie{ImdbID: id}
|
||||
movie := &papi.Movie{Movie: &polochon.Movie{ImdbID: id}}
|
||||
refreshSubs, err := client.UpdateSubtitles(movie)
|
||||
if err != nil {
|
||||
return env.RenderError(w, err)
|
||||
@ -329,7 +327,7 @@ func DownloadVVTSubtitle(env *web.Env, w http.ResponseWriter, r *http.Request) e
|
||||
return env.RenderError(w, err)
|
||||
}
|
||||
|
||||
url, err := client.SubtitleURL(&papi.Movie{ImdbID: id}, lang)
|
||||
url, err := client.SubtitleURL(&papi.Movie{Movie: &polochon.Movie{ImdbID: id}}, lang)
|
||||
if err != nil {
|
||||
return env.RenderError(w, err)
|
||||
}
|
||||
|
@ -11,8 +11,8 @@ import (
|
||||
"git.quimbo.fr/odwrtw/canape/backend/subtitles"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/odwrtw/errors"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@ -21,8 +21,6 @@ type Movie struct {
|
||||
*polochon.Movie
|
||||
client *papi.Client
|
||||
pMovie *papi.Movie
|
||||
publicDir string
|
||||
imgURLPrefix string
|
||||
Wishlisted bool `json:"wishlisted"`
|
||||
}
|
||||
|
||||
@ -54,7 +52,7 @@ func (m *Movie) MarshalJSON() ([]byte, error) {
|
||||
|
||||
// Get the metadata
|
||||
movieToMarshal.DateAdded = m.pMovie.DateAdded
|
||||
movieToMarshal.Quality = m.pMovie.Quality
|
||||
movieToMarshal.Quality = string(m.pMovie.Quality)
|
||||
movieToMarshal.AudioCodec = m.pMovie.AudioCodec
|
||||
movieToMarshal.VideoCodec = m.pMovie.VideoCodec
|
||||
movieToMarshal.Container = m.pMovie.Container
|
||||
@ -74,12 +72,10 @@ func (m *Movie) MarshalJSON() ([]byte, error) {
|
||||
}
|
||||
|
||||
// New returns a new Movie with all the needed infos
|
||||
func New(env *web.Env, imdbID string, client *papi.Client, pMovie *papi.Movie, isWishlisted bool) *Movie {
|
||||
func New(imdbID string, client *papi.Client, pMovie *papi.Movie, isWishlisted bool) *Movie {
|
||||
return &Movie{
|
||||
client: client,
|
||||
pMovie: pMovie,
|
||||
publicDir: env.Config.PublicDir,
|
||||
imgURLPrefix: env.Config.ImgURLPrefix,
|
||||
Wishlisted: isWishlisted,
|
||||
Movie: &polochon.Movie{
|
||||
ImdbID: imdbID,
|
||||
@ -241,7 +237,7 @@ func (m *Movie) imgURL() string {
|
||||
|
||||
// imgFile returns the image location on disk
|
||||
func (m *Movie) imgFile() string {
|
||||
return filepath.Join(m.publicDir, "img", m.imgURL())
|
||||
return filepath.Join(models.PublicDir, "img", m.imgURL())
|
||||
}
|
||||
|
||||
// getPolochonMovies returns an array of the user's polochon movies
|
||||
@ -269,7 +265,6 @@ func getPolochonMovies(user *models.User, env *web.Env) ([]*Movie, error) {
|
||||
// Create Movies objects from the movies retrieved
|
||||
for _, pmovie := range pmovies.List() {
|
||||
movie := New(
|
||||
env,
|
||||
pmovie.ImdbID,
|
||||
client,
|
||||
pmovie,
|
||||
|
@ -9,8 +9,8 @@ import (
|
||||
"git.quimbo.fr/odwrtw/canape/backend/subtitles"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/odwrtw/errors"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@ -39,13 +39,15 @@ func (e *Episode) MarshalJSON() ([]byte, error) {
|
||||
// Get the DownloadURL
|
||||
downloadURL, _ = e.show.client.DownloadURL(
|
||||
&papi.Episode{
|
||||
ShowEpisode: &polochon.ShowEpisode{
|
||||
ShowImdbID: e.ShowImdbID,
|
||||
Episode: e.Episode,
|
||||
Season: e.Season,
|
||||
},
|
||||
},
|
||||
)
|
||||
dateAdded = pEpisode.DateAdded
|
||||
quality = pEpisode.Quality
|
||||
quality = string(pEpisode.Quality)
|
||||
audioCodec = pEpisode.AudioCodec
|
||||
videoCodec = pEpisode.VideoCodec
|
||||
container = pEpisode.Container
|
||||
|
@ -14,8 +14,8 @@ import (
|
||||
"git.quimbo.fr/odwrtw/canape/backend/subtitles"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
)
|
||||
|
||||
// ErrPolochonUnavailable is an error returned if the polochon server is not available
|
||||
@ -43,7 +43,7 @@ func GetDetailsHandler(env *web.Env, w http.ResponseWriter, r *http.Request) err
|
||||
log.Println("Got error getting wishlisted show ", err)
|
||||
}
|
||||
|
||||
s := NewWithClient(&polochon.Show{ImdbID: id}, client, pShow, wShow, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
s := NewWithClient(&polochon.Show{ImdbID: id}, client, pShow, wShow)
|
||||
// First try from the db
|
||||
first := []polochon.Detailer{env.Backend.Detailer}
|
||||
// Then try from the polochon detailers
|
||||
@ -89,7 +89,7 @@ func RefreshShowHandler(env *web.Env, w http.ResponseWriter, r *http.Request) er
|
||||
log.Println("Got error getting wishlisted show ", err)
|
||||
}
|
||||
|
||||
s := NewWithClient(&polochon.Show{ImdbID: id}, client, pShow, wShow, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
s := NewWithClient(&polochon.Show{ImdbID: id}, client, pShow, wShow)
|
||||
// Refresh the polochon detailers
|
||||
detailers := env.Config.Show.Detailers
|
||||
err = s.Refresh(env, detailers)
|
||||
@ -163,7 +163,7 @@ func SearchShow(env *web.Env, w http.ResponseWriter, r *http.Request) error {
|
||||
for _, s := range shows {
|
||||
pShow, _ := pShows.Has(s.ImdbID)
|
||||
wShow, _ := wShows.IsShowInWishlist(s.ImdbID)
|
||||
show := NewWithClient(s, client, pShow, wShow, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
show := NewWithClient(s, client, pShow, wShow)
|
||||
|
||||
// First try from the db
|
||||
first := []polochon.Detailer{env.Backend.Detailer}
|
||||
@ -243,7 +243,7 @@ func GetWishlistHandler(env *web.Env, w http.ResponseWriter, r *http.Request) er
|
||||
for _, wishedShow := range wShows.List() {
|
||||
pShow, _ := pShows.Has(wishedShow.ImdbID)
|
||||
poloShow := &polochon.Show{ImdbID: wishedShow.ImdbID}
|
||||
show := NewWithClient(poloShow, client, pShow, wishedShow, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
show := NewWithClient(poloShow, client, pShow, wishedShow)
|
||||
|
||||
// First check in the DB
|
||||
before := []polochon.Detailer{env.Backend.Detailer}
|
||||
@ -312,8 +312,6 @@ func RefreshEpisodeHandler(env *web.Env, w http.ResponseWriter, r *http.Request)
|
||||
Show: &polochon.Show{ImdbID: id},
|
||||
client: client,
|
||||
pShow: pShow,
|
||||
publicDir: env.Config.PublicDir,
|
||||
imgURLPrefix: env.Config.ImgURLPrefix,
|
||||
}
|
||||
|
||||
e := NewEpisode(s, season, episode)
|
||||
@ -361,9 +359,11 @@ func RefreshEpisodeSubtitlesHandler(env *web.Env, w http.ResponseWriter, r *http
|
||||
}
|
||||
|
||||
e := &papi.Episode{
|
||||
ShowEpisode: &polochon.ShowEpisode{
|
||||
ShowImdbID: id,
|
||||
Season: season,
|
||||
Episode: episode,
|
||||
},
|
||||
}
|
||||
|
||||
refreshedSubs, err := client.UpdateSubtitles(e)
|
||||
@ -402,9 +402,11 @@ func DownloadVVTSubtitle(env *web.Env, w http.ResponseWriter, r *http.Request) e
|
||||
}
|
||||
|
||||
url, err := client.SubtitleURL(&papi.Episode{
|
||||
ShowEpisode: &polochon.ShowEpisode{
|
||||
ShowImdbID: id,
|
||||
Season: season,
|
||||
Episode: episode,
|
||||
},
|
||||
}, lang)
|
||||
if err != nil {
|
||||
return env.RenderError(w, err)
|
||||
|
@ -10,8 +10,8 @@ import (
|
||||
"git.quimbo.fr/odwrtw/canape/backend/models"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/odwrtw/errors"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/odwrtw/polochon/lib/papi"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
@ -22,8 +22,6 @@ type Show struct {
|
||||
*polochon.Show
|
||||
TrackedSeason *int `json:"tracked_season"`
|
||||
TrackedEpisode *int `json:"tracked_episode"`
|
||||
publicDir string
|
||||
imgURLPrefix string
|
||||
}
|
||||
|
||||
// MarshalJSON implements the Marshal interface
|
||||
@ -55,24 +53,20 @@ func (s *Show) MarshalJSON() ([]byte, error) {
|
||||
}
|
||||
|
||||
// New returns a new Show with a polochon ShowConfig
|
||||
func New(imdbID string, publicDir, imgURLPrefix string) *Show {
|
||||
func New(imdbID string) *Show {
|
||||
return &Show{
|
||||
Show: &polochon.Show{
|
||||
ImdbID: imdbID,
|
||||
},
|
||||
publicDir: publicDir,
|
||||
imgURLPrefix: imgURLPrefix,
|
||||
}
|
||||
}
|
||||
|
||||
// NewWithClient returns a new Show with a polochon ShowConfig
|
||||
func NewWithClient(show *polochon.Show, client *papi.Client, pShow *papi.Show, wShow *models.WishedShow, publicDir, imgURLPrefix string) *Show {
|
||||
func NewWithClient(show *polochon.Show, client *papi.Client, pShow *papi.Show, wShow *models.WishedShow) *Show {
|
||||
s := &Show{
|
||||
Show: show,
|
||||
client: client,
|
||||
pShow: pShow,
|
||||
publicDir: publicDir,
|
||||
imgURLPrefix: imgURLPrefix,
|
||||
}
|
||||
if wShow != nil {
|
||||
s.TrackedSeason = &wShow.Season
|
||||
@ -155,7 +149,7 @@ func (s *Show) GetImageURL(imgType string) string {
|
||||
if _, err := os.Stat(s.imgFile(imgType)); os.IsNotExist(err) {
|
||||
return ""
|
||||
}
|
||||
return s.imgURLPrefix + s.imgURL(imgType)
|
||||
return models.ImgURLPrefix + s.imgURL(imgType)
|
||||
}
|
||||
|
||||
// downloadImages will download the show images
|
||||
@ -217,12 +211,12 @@ func (s *Show) imgURL(imgType string) string {
|
||||
|
||||
// imgDirectory returns the directory containing all the show images
|
||||
func (s *Show) imgDirectory() string {
|
||||
return filepath.Join(s.publicDir, "img", fmt.Sprintf("shows/%s", s.ImdbID))
|
||||
return filepath.Join(models.PublicDir, "img", fmt.Sprintf("shows/%s", s.ImdbID))
|
||||
}
|
||||
|
||||
// imgFile returns the image location on disk
|
||||
func (s *Show) imgFile(imgType string) string {
|
||||
return filepath.Join(s.publicDir, "img", s.imgURL(imgType))
|
||||
return filepath.Join(models.PublicDir, "img", s.imgURL(imgType))
|
||||
}
|
||||
|
||||
// getPolochonShows returns all the Shows from the polochon of a user
|
||||
@ -248,7 +242,7 @@ func getPolochonShows(env *web.Env, user *models.User) ([]*Show, error) {
|
||||
// Create Shows objects from the shows retrieved
|
||||
for _, pShow := range pshows.List() {
|
||||
wShow, _ := wShows.IsShowInWishlist(pShow.ImdbID)
|
||||
show := NewWithClient(&polochon.Show{ImdbID: pShow.ImdbID}, client, pShow, wShow, env.Config.PublicDir, env.Config.ImgURLPrefix)
|
||||
show := NewWithClient(&polochon.Show{ImdbID: pShow.ImdbID}, client, pShow, wShow)
|
||||
shows = append(shows, show)
|
||||
}
|
||||
return shows, nil
|
||||
|
@ -10,14 +10,13 @@ import (
|
||||
"git.quimbo.fr/odwrtw/canape/backend/models"
|
||||
"git.quimbo.fr/odwrtw/canape/backend/web"
|
||||
"github.com/gorilla/mux"
|
||||
"github.com/odwrtw/papi"
|
||||
polochon "github.com/odwrtw/polochon/lib"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
|
||||
// DownloadHandler downloads a movie via polochon
|
||||
func DownloadHandler(env *web.Env, w http.ResponseWriter, r *http.Request) error {
|
||||
torrent := &papi.Torrent{}
|
||||
torrent := &polochon.Torrent{}
|
||||
err := json.NewDecoder(r.Body).Decode(torrent)
|
||||
if err != nil {
|
||||
return env.RenderError(w, errors.New("failed to get the url"))
|
||||
|
@ -1,4 +1,5 @@
|
||||
import React from "react";
|
||||
import moment from "moment";
|
||||
import PropTypes from "prop-types";
|
||||
import { useSelector } from "react-redux";
|
||||
|
||||
@ -7,10 +8,10 @@ import { UserEdit } from "./userEdit";
|
||||
export const User = ({ id }) => {
|
||||
const user = useSelector((state) => state.admin.users.get(id));
|
||||
const polochon = user.polochon;
|
||||
const lastSeen = moment(user.last_seen, "YYYY-MM-DDTHH:mm:ss.SZ");
|
||||
|
||||
return (
|
||||
<tr>
|
||||
<td>{user.id}</td>
|
||||
<td>{user.name}</td>
|
||||
<td>
|
||||
<span
|
||||
@ -32,6 +33,7 @@ export const User = ({ id }) => {
|
||||
}
|
||||
></span>
|
||||
</td>
|
||||
<td>{lastSeen.isValid() ? lastSeen.fromNow() : "-"}</td>
|
||||
<td>
|
||||
<UserEdit id={id} />
|
||||
</td>
|
||||
|
@ -24,13 +24,13 @@ export const UserList = () => {
|
||||
<table className="table table-striped">
|
||||
<thead className="table-secondary">
|
||||
<tr>
|
||||
<th>#</th>
|
||||
<th>Name</th>
|
||||
<th>Activated</th>
|
||||
<th>Admin</th>
|
||||
<th>Polochon URL</th>
|
||||
<th>Polochon token</th>
|
||||
<th>Polochon activated</th>
|
||||
<th>Last seen</th>
|
||||
<th>Actions</th>
|
||||
</tr>
|
||||
</thead>
|
||||
|
@ -51,7 +51,9 @@ export default (state = defaultState, action) =>
|
||||
});
|
||||
|
||||
let seasonMap = new Map();
|
||||
seasonNumbers.sort().forEach((n) => {
|
||||
seasonNumbers
|
||||
.sort((a, b) => a - b)
|
||||
.forEach((n) => {
|
||||
let episodes = [];
|
||||
seasons[n]
|
||||
.sort((a, b) => a.episode - b.episode)
|
||||
|
3
go.mod
3
go.mod
@ -15,8 +15,7 @@ require (
|
||||
github.com/mattn/go-sqlite3 v1.10.0 // indirect
|
||||
github.com/nfnt/resize v0.0.0-20180221191011-83c6a9932646
|
||||
github.com/odwrtw/errors v0.0.0-20170604160533-c747b9d17833
|
||||
github.com/odwrtw/papi v0.0.0-20200416090004-26e95d2feb66
|
||||
github.com/odwrtw/polochon v0.0.0-20200416085801-6331a40936bf
|
||||
github.com/odwrtw/polochon v0.0.0-20200416140115-2ad474aa633d
|
||||
github.com/phyber/negroni-gzip v0.0.0-20180113114010-ef6356a5d029
|
||||
github.com/pioz/tvdb v0.0.0-20190503215423-f45c687faba9 // indirect
|
||||
github.com/robfig/cron v1.1.0
|
||||
|
6
go.sum
6
go.sum
@ -134,10 +134,8 @@ github.com/odwrtw/guessit v0.0.0-20200131084001-f88613483547/go.mod h1:W22g7wtc0
|
||||
github.com/odwrtw/imdb-watchlist v0.0.0-20190417175016-b7a9f7503d69 h1:ow6b/4Jj7J5iYwU678/rbijvaNUJrYkg13j9Nivkung=
|
||||
github.com/odwrtw/imdb-watchlist v0.0.0-20190417175016-b7a9f7503d69/go.mod h1:o2tLH95CtNdqhDb0aS2NbU+1I4PmaNsODpr33Ry0JC0=
|
||||
github.com/odwrtw/papi v0.0.0-20190413103029-bd5bfea85ae6/go.mod h1:CXotdtODLpW0/yuFV5XH8Rmrj0eAfPLvdMKykPM2WCk=
|
||||
github.com/odwrtw/papi v0.0.0-20200416090004-26e95d2feb66 h1:E+UrY1WG5xp65UXs2rbtVVD4FdSffMR9E0lbd7xdf80=
|
||||
github.com/odwrtw/papi v0.0.0-20200416090004-26e95d2feb66/go.mod h1:eY0skvVHJBwbSJ18uq2c1T4SvhdEV8R0XFSb0zKh5Yo=
|
||||
github.com/odwrtw/polochon v0.0.0-20200416085801-6331a40936bf h1:zzsX9o1Gxe1esokjdcOMa5hMC2aqubWXQoAEqMCMyyY=
|
||||
github.com/odwrtw/polochon v0.0.0-20200416085801-6331a40936bf/go.mod h1:rBjekia21ToZoTxJqR/5Ued8EYwKTtamq+bo/XINOjA=
|
||||
github.com/odwrtw/polochon v0.0.0-20200416140115-2ad474aa633d h1:jquS1D5p2ldxmbbWW4Vg2FCmvXxIIhq5zeoHSpwGtLw=
|
||||
github.com/odwrtw/polochon v0.0.0-20200416140115-2ad474aa633d/go.mod h1:rBjekia21ToZoTxJqR/5Ued8EYwKTtamq+bo/XINOjA=
|
||||
github.com/odwrtw/tpb v0.0.0-20200130133144-c846aa382c6f h1:fwEIGT+o3e8+XkBqrwsE3/+9ketTQXflPhCkv3/w990=
|
||||
github.com/odwrtw/tpb v0.0.0-20200130133144-c846aa382c6f/go.mod h1:updLvMbQo2xHoz94MX9+GqmSoKhf6E8fs/J+wLvvu6A=
|
||||
github.com/odwrtw/trakttv v0.0.0-20200404161731-0d594827e4f9 h1:PuQLHO75MXUsJpf9BcTVxvR/FCkdn1MZnZt6h3o6cJI=
|
||||
|
Loading…
x
Reference in New Issue
Block a user