Merge branch 'develop'

Author: l3uddz

cmd/movies.go

@@ -111,6 +111,7 @@ func init() {
 	_ = moviesCmd.MarkFlagRequired("search-type")
 
 	// optional flags
+	moviesCmd.Flags().BoolVar(&flagNoFilter, "no-filter", false, "No filter expression checking.")
 	moviesCmd.Flags().IntVar(&flagLimit, "limit", 0, "Max accepted items to add.")
 
 	moviesCmd.Flags().StringVar(&flagQueryStr, "query", "", "Query for search.")

cmd/root.go

@@ -26,6 +26,7 @@ var (
 	flagLogFile      = "activity.log"
 
 	flagSearchType string
+	flagNoFilter   bool
 	flagLimit      int
 
 	flagQueryStr string
@@ -158,6 +159,10 @@ func parseValidateInputs(args []string) error {
 }
 
 func shouldAcceptMediaItem(mediaItem *config.MediaItem) bool {
+	if flagNoFilter {
+		// when no-filter is enabled, dont check ignore filters
+		return true
+	}
 
 	if ignore, err := pvr.ShouldIgnore(mediaItem); err != nil {
 		log.WithError(err).Error("Failed evaluating ignore expressions against: %+v", mediaItem)

cmd/shows.go

@@ -113,6 +113,7 @@ func init() {
 	_ = showsCmd.MarkFlagRequired("search-type")
 
 	// optional flags
+	showsCmd.Flags().BoolVar(&flagNoFilter, "no-filter", false, "No filter expression checking.")
 	showsCmd.Flags().IntVar(&flagLimit, "limit", 0, "Max accepted items to add.")
 
 	showsCmd.Flags().StringVar(&flagQueryStr, "query", "", "Query for search.")

config/mediaitem.go

@@ -9,6 +9,7 @@ import (
 
 type MediaItem struct {
 	Provider  string
+	Endpoint  string
 	TvdbId    string
 	TmdbId    string
 	ImdbId    string
@@ -23,6 +24,7 @@ type MediaItem struct {
 	Status    string
 	Genres    []string
 	Languages []string
+	Character string
 }
 
 type ExprEnv struct {
@@ -39,7 +41,7 @@ func GetExprEnv(media *MediaItem) *ExprEnv {
 }
 
 func (m *MediaItem) String() string {
-	if strings.Contains(m.Title, "(" + strconv.Itoa(m.Year) + ")") {
+	if strings.Contains(m.Title, "("+strconv.Itoa(m.Year)+")") {
 		return m.Title
 	}
 

provider/tmdb.go

@@ -403,6 +403,7 @@ func (p *Tmdb) getMovies(endpoint string, logic map[string]interface{}, params m
 			// init media item
 			mediaItem := config.MediaItem{
 				Provider:  "tmdb",
+				Endpoint:  endpoint,
 				TvdbId:    "",
 				TmdbId:    itemId,
 				ImdbId:    "",

provider/trakt.go

@@ -68,11 +68,13 @@ type TraktMovie struct {
 	AvailableTranslations []string      `json:"available_translations"`
 	Genres                []string      `json:"genres"`
 	Certification         string        `json:"certification"`
+	Character             string        `json:"character"`
 }
 
 type TraktMoviesResponse struct {
 	TraktMovie
-	Movie *TraktMovie `json:"movie"`
+	Character *string     `json:"character"`
+	Movie     *TraktMovie `json:"movie"`
 }
 
 type TraktPersonMovieCastResponse struct {
@@ -111,11 +113,13 @@ type TraktShow struct {
 	AvailableTranslations []string     `json:"available_translations"`
 	Genres                []string     `json:"genres"`
 	AiredEpisodes         int          `json:"aired_episodes"`
+	Character             string       `json:"character"`
 }
 
 type TraktShowsResponse struct {
 	TraktShow
-	Show *TraktShow `json:"show"`
+	Character *string    `json:"character"`
+	Show      *TraktShow `json:"show"`
 }
 
 /* Initializer */
@@ -328,7 +332,12 @@ func (p *Trakt) getRequestParams(params map[string]string) req.Param {
 
 func (p *Trakt) translateMovie(response TraktMoviesResponse) *TraktMovie {
 	if response.Movie != nil {
-		return response.Movie
+		m := response.Movie
+		if response.Character != nil && *response.Character != "" {
+			m.Character = *response.Character
+		}
+
+		return m
 	}
 
 	return &TraktMovie{
@@ -355,12 +364,18 @@ func (p *Trakt) translateMovie(response TraktMoviesResponse) *TraktMovie {
 		AvailableTranslations: response.AvailableTranslations,
 		Genres:                response.Genres,
 		Certification:         response.Certification,
+		Character:             "",
 	}
 }
 
 func (p *Trakt) translateShow(response TraktShowsResponse) *TraktShow {
 	if response.Show != nil {
-		return response.Show
+		s := response.Show
+		if response.Character != nil && *response.Character != "" {
+			s.Character = *response.Character
+		}
+
+		return s
 	}
 
 	return &TraktShow{
@@ -505,6 +520,7 @@ func (p *Trakt) getMovies(endpoint string, logic map[string]interface{}, params
 			// init media item
 			mediaItem := config.MediaItem{
 				Provider:  "trakt",
+				Endpoint:  endpoint,
 				TvdbId:    "",
 				TmdbId:    itemId,
 				ImdbId:    movieItem.Ids.Imdb,
@@ -519,6 +535,7 @@ func (p *Trakt) getMovies(endpoint string, logic map[string]interface{}, params
 				Status:    movieItem.Status,
 				Genres:    movieItem.Genres,
 				Languages: []string{movieItem.Language},
+				Character: movieItem.Character,
 			}
 
 			// does the pvr already have this item?
@@ -683,6 +700,7 @@ func (p *Trakt) getShows(endpoint string, logic map[string]interface{}, params m
 			// init media item
 			mediaItem := config.MediaItem{
 				Provider:  "trakt",
+				Endpoint:  endpoint,
 				TvdbId:    itemId,
 				TmdbId:    strconv.Itoa(showItem.Ids.Tmdb),
 				ImdbId:    showItem.Ids.Imdb,
@@ -697,6 +715,7 @@ func (p *Trakt) getShows(endpoint string, logic map[string]interface{}, params m
 				Status:    showItem.Status,
 				Genres:    showItem.Genres,
 				Languages: []string{showItem.Language},
+				Character: showItem.Character,
 			}
 
 			// does the pvr already have this item?

provider/tvmaze.go

@@ -252,6 +252,7 @@ func (p *TvMaze) getScheduleShows(logic map[string]interface{}, params map[strin
 		// init media item
 		mediaItem := config.MediaItem{
 			Provider:  "tvmaze",
+			Endpoint:  "/schedule/full",
 			TvdbId:    itemId,
 			ImdbId:    item.Embedded.Show.Externals.Imdb,
 			Title:     item.Embedded.Show.Name,