Skip to content

Commit

Permalink
added: Episode Actor/GuestStars and TV Show Actors Limit
Browse files Browse the repository at this point in the history
  • Loading branch information
DanCooper committed Nov 16, 2017
1 parent 73a4ff0 commit feb1289
Show file tree
Hide file tree
Showing 6 changed files with 818 additions and 698 deletions.
30 changes: 30 additions & 0 deletions EmberAPI/XML Serialization/clsXMLSettings.vb
Expand Up @@ -425,10 +425,12 @@ Partial Public Class clsXMLSettings
Private _tvscrapercleanfields As Boolean
Private _tvscraperdurationruntimeformat As String
Private _tvscraperepisodeactors As Boolean
Private _tvscraperepisodeactorslimit As Integer
Private _tvscraperepisodeaired As Boolean
Private _tvscraperepisodecredits As Boolean
Private _tvscraperepisodedirector As Boolean
Private _tvscraperepisodegueststars As Boolean
Private _tvscraperepisodegueststarslimit As Integer
Private _tvscraperepisodegueststarstoactors As Boolean
Private _tvscraperepisodeplot As Boolean
Private _tvscraperepisoderating As Boolean
Expand All @@ -441,6 +443,7 @@ Partial Public Class clsXMLSettings
Private _tvscraperseasonplot As Boolean
Private _tvscraperseasontitle As Boolean
Private _tvscrapershowactors As Boolean
Private _tvscrapershowactorslimit As Integer
Private _tvscrapershowcert As Boolean
Private _tvscrapershowcertformpaa As Boolean
Private _tvscrapershowcertformpaafallback As Boolean
Expand Down Expand Up @@ -1011,6 +1014,33 @@ Partial Public Class clsXMLSettings
End Set
End Property

Public Property TVScraperEpisodeActorsLimit() As Integer
Get
Return Me._tvscraperepisodeactorslimit
End Get
Set(ByVal value As Integer)
Me._tvscraperepisodeactorslimit = value
End Set
End Property

Public Property TVScraperEpisodeGuestStarsLimit() As Integer
Get
Return Me._tvscraperepisodegueststarslimit
End Get
Set(ByVal value As Integer)
Me._tvscraperepisodegueststarslimit = value
End Set
End Property

Public Property TVScraperShowActorsLimit() As Integer
Get
Return Me._tvscrapershowactorslimit
End Get
Set(ByVal value As Integer)
Me._tvscrapershowactorslimit = value
End Set
End Property

Public Property MovieActorThumbsKeepExisting() As Boolean
Get
Return Me._movieactorthumbskeepexisting
Expand Down
24 changes: 18 additions & 6 deletions EmberAPI/clsAPINFO.vb
Expand Up @@ -547,6 +547,10 @@ Public Class NFO
FilterOnlyPersonsWithImage(scrapedshow.Actors)
End If

If Master.eSettings.TVScraperShowActorsLimit > 0 AndAlso scrapedshow.Actors.Count > Master.eSettings.TVScraperShowActorsLimit Then
scrapedshow.Actors.RemoveRange(Master.eSettings.TVScraperShowActorsLimit, scrapedshow.Actors.Count - Master.eSettings.TVScraperShowActorsLimit)
End If

'added check if there's any actors left to add, if not then try with results of following scraper...
If scrapedshow.ActorsSpecified Then
ReorderPersons(scrapedshow.Actors)
Expand Down Expand Up @@ -1058,9 +1062,9 @@ Public Class NFO
FilterOnlyPersonsWithImage(scrapedepisode.Actors)
End If

'If Master.eSettings.TVScraperEpisodeCastLimit > 0 AndAlso scrapedepisode.Actors.Count > Master.eSettings.TVScraperEpisodeCastLimit Then
' scrapedepisode.Actors.RemoveRange(Master.eSettings.TVScraperEpisodeCastLimit, scrapedepisode.Actors.Count - Master.eSettings.TVScraperEpisodeCastLimit)
'End If
If Master.eSettings.TVScraperEpisodeActorsLimit > 0 AndAlso scrapedepisode.Actors.Count > Master.eSettings.TVScraperEpisodeActorsLimit Then
scrapedepisode.Actors.RemoveRange(Master.eSettings.TVScraperEpisodeActorsLimit, scrapedepisode.Actors.Count - Master.eSettings.TVScraperEpisodeActorsLimit)
End If

'added check if there's any actors left to add, if not then try with results of following scraper...
If scrapedepisode.ActorsSpecified Then
Expand Down Expand Up @@ -1108,9 +1112,9 @@ Public Class NFO
FilterOnlyPersonsWithImage(scrapedepisode.GuestStars)
End If

'If Master.eSettings.TVScraperEpisodeCastLimit > 0 AndAlso scrapedepisode.Actors.Count > Master.eSettings.TVScraperEpisodeCastLimit Then
' scrapedepisode.Actors.RemoveRange(Master.eSettings.TVScraperEpisodeCastLimit, scrapedepisode.Actors.Count - Master.eSettings.TVScraperEpisodeCastLimit)
'End If
If Master.eSettings.TVScraperEpisodeGuestStarsLimit > 0 AndAlso scrapedepisode.GuestStars.Count > Master.eSettings.TVScraperEpisodeGuestStarsLimit Then
scrapedepisode.GuestStars.RemoveRange(Master.eSettings.TVScraperEpisodeGuestStarsLimit, scrapedepisode.GuestStars.Count - Master.eSettings.TVScraperEpisodeGuestStarsLimit)
End If

'added check if there's any actors left to add, if not then try with results of following scraper...
If scrapedepisode.GuestStarsSpecified Then
Expand Down Expand Up @@ -1201,6 +1205,14 @@ Public Class NFO
'Add GuestStars to Actors
If DBTVEpisode.TVEpisode.GuestStarsSpecified AndAlso Master.eSettings.TVScraperEpisodeGuestStarsToActors AndAlso Not Master.eSettings.TVLockEpisodeActors Then
DBTVEpisode.TVEpisode.Actors.AddRange(DBTVEpisode.TVEpisode.GuestStars)

'run the limit filter again
If Master.eSettings.TVScraperEpisodeActorsLimit > 0 AndAlso DBTVEpisode.TVEpisode.Actors.Count > Master.eSettings.TVScraperEpisodeActorsLimit Then
DBTVEpisode.TVEpisode.Actors.RemoveRange(Master.eSettings.TVScraperEpisodeActorsLimit, DBTVEpisode.TVEpisode.Actors.Count - Master.eSettings.TVScraperEpisodeActorsLimit)
End If

'reorder again
ReorderPersons(DBTVEpisode.TVEpisode.Actors)
End If

'TV Show Runtime for Episode Runtime
Expand Down
30 changes: 30 additions & 0 deletions EmberAPI/clsAPISettings.vb
Expand Up @@ -57,6 +57,33 @@ Public Class Settings
End Set
End Property

Public Property TVScraperEpisodeActorsLimit() As Integer
Get
Return Settings._XMLSettings.TVScraperEpisodeActorsLimit
End Get
Set(ByVal value As Integer)
Settings._XMLSettings.TVScraperEpisodeActorsLimit = value
End Set
End Property

Public Property TVScraperEpisodeGuestStarsLimit() As Integer
Get
Return Settings._XMLSettings.TVScraperEpisodeGuestStarsLimit
End Get
Set(ByVal value As Integer)
Settings._XMLSettings.TVScraperEpisodeGuestStarsLimit = value
End Set
End Property

Public Property TVScraperShowActorsLimit() As Integer
Get
Return Settings._XMLSettings.TVScraperShowActorsLimit
End Get
Set(ByVal value As Integer)
Settings._XMLSettings.TVScraperShowActorsLimit = value
End Set
End Property

Public Property MovieActorThumbsKeepExisting() As Boolean
Get
Return Settings._XMLSettings.MovieActorThumbsKeepExisting
Expand Down Expand Up @@ -7335,10 +7362,12 @@ Public Class Settings
TVScraperCleanFields = False
TVScraperDurationRuntimeFormat = "<m>"
TVScraperEpisodeActors = True
TVScraperEpisodeActorsLimit = 0
TVScraperEpisodeAired = True
TVScraperEpisodeCredits = True
TVScraperEpisodeDirector = True
TVScraperEpisodeGuestStars = True
TVScraperEpisodeGuestStarsLimit = 0
TVScraperEpisodeGuestStarsToActors = False
TVScraperEpisodePlot = True
TVScraperEpisodeRating = True
Expand All @@ -7351,6 +7380,7 @@ Public Class Settings
TVScraperSeasonPlot = True
TVScraperSeasonTitle = False
TVScraperShowActors = True
TVScraperShowActorsLimit = 0
TVScraperShowCert = False
TVScraperShowCertForMPAA = False
TVScraperShowCertForMPAAFallback = False
Expand Down

0 comments on commit feb1289

Please sign in to comment.