Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Nfo multi values #35

Merged
merged 4 commits into from Sep 7, 2012
Merged

Nfo multi values #35

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3c74e5f
EmberAPI: Store multiple genres in seperate <genre> nodes.
nomad2k Aug 20, 2012
09644ca
EmberAPI: Store multiple directors in seperate <director> nodes.
nomad2k Aug 20, 2012
ea01633
EmberAPI: Store multiple credits in seperate <credits> nodes.
nomad2k Aug 20, 2012
85a522c
EmberAPI: Store multiple countires in seperate <country> nodes.
nomad2k Aug 20, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Addons/scraper.EmberCore.XML/scraperMovieXMLModule.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -392,7 +392,7 @@ Public Class EmberXMLScraperModule
End If
If Options.bCountry Then DBMovie.Movie.Country = Web.HttpUtility.HtmlDecode(Strings.Join(lMediaTag.Country.ToArray(), " / "))
If Options.bVotes Then DBMovie.Movie.Votes = lMediaTag.Votes.ToString
If Options.bWriters Then DBMovie.Movie.Credits = Web.HttpUtility.HtmlDecode(Strings.Join(lMediaTag.Writers.ToArray, " / "))
If Options.bWriters Then DBMovie.Movie.OldCredits = Web.HttpUtility.HtmlDecode(Strings.Join(lMediaTag.Writers.ToArray, " / "))
If Options.bYear Then DBMovie.Movie.Year = lMediaTag.Year.ToString
DBMovie.Movie.PlayCount = lMediaTag.PlayCount.ToString
DBMovie.Movie.ID = If(String.IsNullOrEmpty(lMediaTag.ID), DBMovie.Movie.ID, lMediaTag.ID)
Expand Down
8 changes: 4 additions & 4 deletions Addons/scraper.EmberCore/Scraper/clsScrapeIMDB.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,7 +540,7 @@ mPlot:
Select Writer = Web.HttpUtility.HtmlDecode(String.Concat(DirectCast(M, Match).Groups("name").ToString, If(FullCrew, " (writer)", String.Empty)))

If q.Count > 0 Then
IMDBMovie.Credits = Strings.Join(q.ToArray, " / ").Trim
IMDBMovie.OldCredits = Strings.Join(q.ToArray, " / ").Trim
End If
End If
End If
Expand Down Expand Up @@ -569,7 +569,7 @@ mPlot:
Select Producer = Web.HttpUtility.HtmlDecode(String.Concat(P1.Groups("name").ToString, " (producer)"))

If Pr.Count > 0 Then
IMDBMovie.Credits = String.Concat(IMDBMovie.Credits, " / ", Strings.Join(Pr.ToArray, " / ").Trim)
IMDBMovie.OldCredits = String.Concat(IMDBMovie.OldCredits, " / ", Strings.Join(Pr.ToArray, " / ").Trim)
End If
End If

Expand All @@ -581,7 +581,7 @@ mPlot:
Select Musician = Web.HttpUtility.HtmlDecode(String.Concat(M1.Groups("name").ToString, " (music by)"))

If Mu.Count > 0 Then
IMDBMovie.Credits = String.Concat(IMDBMovie.Credits, " / ", Strings.Join(Mu.ToArray, " / ").Trim)
IMDBMovie.OldCredits = String.Concat(IMDBMovie.OldCredits, " / ", Strings.Join(Mu.ToArray, " / ").Trim)
End If
End If

Expand All @@ -599,7 +599,7 @@ mPlot:
Where Not String.IsNullOrEmpty(DirectCast(P1, Match).Groups("name").ToString) _
Select Studio = Web.HttpUtility.HtmlDecode(DirectCast(P1, Match).Groups("name").ToString)
If Ps.Count > 0 Then
IMDBMovie.Credits = String.Concat(IMDBMovie.Credits, " / ", Strings.Join(Ps.ToArray, " / ").Trim)
IMDBMovie.OldCredits = String.Concat(IMDBMovie.OldCredits, " / ", Strings.Join(Ps.ToArray, " / ").Trim)
End If
End If
End If
Expand Down
6 changes: 3 additions & 3 deletions Ember Media Manager/dlgEditMovie.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -644,8 +644,8 @@ Public Class dlgEditMovie
.txtDirector.Text = Master.currMovie.Movie.Director
End If

If Not String.IsNullOrEmpty(Master.currMovie.Movie.Credits) Then
.txtCredits.Text = Master.currMovie.Movie.Credits
If Not String.IsNullOrEmpty(Master.currMovie.Movie.OldCredits) Then
.txtCredits.Text = Master.currMovie.Movie.OldCredits
End If


Expand Down Expand Up @@ -1225,7 +1225,7 @@ Public Class dlgEditMovie
Master.currMovie.Movie.Rating = .tmpRating
Master.currMovie.Movie.Runtime = .txtRuntime.Text.Trim
Master.currMovie.Movie.ReleaseDate = .txtReleaseDate.Text.Trim
Master.currMovie.Movie.Credits = .txtCredits.Text.Trim
Master.currMovie.Movie.OldCredits = .txtCredits.Text.Trim
Master.currMovie.Movie.Trailer = .txtTrailer.Text.Trim
Master.currMovie.Movie.Studio = .txtStudio.Text.Trim

Expand Down
4 changes: 2 additions & 2 deletions EmberAPI/clsAPIDatabase.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -566,7 +566,7 @@ Public Class Database
If Not DBNull.Value.Equals(SQLreader("ReleaseDate")) Then .ReleaseDate = SQLreader("ReleaseDate").ToString
If Not DBNull.Value.Equals(SQLreader("Studio")) Then .Studio = SQLreader("Studio").ToString
If Not DBNull.Value.Equals(SQLreader("Director")) Then .Director = SQLreader("Director").ToString
If Not DBNull.Value.Equals(SQLreader("Credits")) Then .Credits = SQLreader("Credits").ToString
If Not DBNull.Value.Equals(SQLreader("Credits")) Then .OldCredits = SQLreader("Credits").ToString
If Not DBNull.Value.Equals(SQLreader("PlayCount")) Then .PlayCount = SQLreader("PlayCount").ToString
If Not DBNull.Value.Equals(SQLreader("Watched")) Then .Watched = SQLreader("Watched").ToString
If Not DBNull.Value.Equals(SQLreader("FanartURL")) AndAlso Not Master.eSettings.NoSaveImagesToNfo Then .Fanart.URL = SQLreader("FanartURL").ToString
Expand Down Expand Up @@ -1156,7 +1156,7 @@ Public Class Database
parRuntime.Value = _movieDB.Movie.Runtime
parReleaseDate.Value = _movieDB.Movie.ReleaseDate
parDirector.Value = _movieDB.Movie.Director
parCredits.Value = _movieDB.Movie.Credits
parCredits.Value = _movieDB.Movie.OldCredits
parPlaycount.Value = _movieDB.Movie.PlayCount
parWatched.Value = _movieDB.Movie.Watched
parTrailer.Value = _movieDB.Movie.Trailer
Expand Down
Loading