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

add a option to select the extrathumb size on manual scraping #23

Merged
merged 14 commits into from
Jun 18, 2012
Merged

add a option to select the extrathumb size on manual scraping #23

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
db02cc1
add a option to select the extrathumb size on manual scraping
DanCooper Apr 26, 2012
1c7964c
add ManualETSize and TrailerTMDBPref
DanCooper May 1, 2012
29a2cc0
add ManualETSize and TrailerTMDBPref
DanCooper May 1, 2012
8f8478e
add ManualETSize and TrailerTMDBPref
DanCooper May 1, 2012
3b48c3c
add ManualETSize and TrailerTMDBPref
DanCooper May 1, 2012
69fa98e
add ManualETSize and TrailerTMDBPref
DanCooper May 1, 2012
71b1527
better stacking solution if the filename "avatar.part1.avi" (stack no…
DanCooper May 1, 2012
2d12b3a
better stacking solution if the filename "avatar.part1.avi" (stack no…
DanCooper May 1, 2012
ae2b677
change the default size to "thumb"
DanCooper May 2, 2012
7392b2b
add banner.jpg support (button and save function)
DanCooper May 2, 2012
19dbee6
add banner.jpg support (button and save function)
DanCooper May 2, 2012
fa48e48
add banner.jpg support (button and save function)
DanCooper May 2, 2012
4e80dfe
change the default size to "thumb"
DanCooper May 5, 2012
7b18e82
Fixed the problem that no images are stored when the selection matche…
DanCooper May 6, 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
49 changes: 29 additions & 20 deletions Addons/scraper.EmberCore/Scraper/clsScrapeTMDB.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
' ################################################################################
' ################################################################################
' # EMBER MEDIA MANAGER #
' ################################################################################
' ################################################################################
Expand Down Expand Up @@ -127,6 +127,9 @@ Namespace TMDB
Public Function GetTrailers(ByVal imdbID As String) As String
Dim xmlTMDB As XDocument
Dim sHTTP As New HTTP
Dim tLang As String

tLang = AdvancedSettings.GetSetting("UseTMDBTrailerPref", "en")

If bwTMDB.CancellationPending Then Return Nothing
Try
Expand All @@ -150,32 +153,39 @@ Namespace TMDB
If tmdbNode.Count > 0 Then
If Not tmdbNode(0).Value = "Your query didn't return any results." Then
Dim movieID As String = xmlTMDB...<OpenSearchDescription>...<movies>...<movie>...<id>.Value
Dim i As Integer

sHTTP = New HTTP
ApiXML = sHTTP.DownloadData(String.Format("http://api.themoviedb.org/2.1/Movie.getInfo/en/xml/{0}/{1}", APIKey, movieID))
sHTTP = Nothing

If Not String.IsNullOrEmpty(ApiXML) Then
For i = 0 To 1 Step 1
sHTTP = New HTTP
ApiXML = sHTTP.DownloadData(String.Format("http://api.themoviedb.org/2.1/Movie.getInfo/{0}/xml/{1}/{2}", tLang, APIKey, movieID))
sHTTP = Nothing

Try
xmlTMDB = XDocument.Parse(ApiXML)
Catch
Return String.Empty
End Try
If Not String.IsNullOrEmpty(ApiXML) Then

If bwTMDB.WorkerReportsProgress Then
bwTMDB.ReportProgress(2)
End If
Try
xmlTMDB = XDocument.Parse(ApiXML)
Catch
Return String.Empty
End Try

If bwTMDB.WorkerReportsProgress Then
bwTMDB.ReportProgress(2)
End If

If bwTMDB.CancellationPending Then Return Nothing
If bwTMDB.CancellationPending Then Return Nothing

Dim Trailers = From tNode In xmlTMDB...<OpenSearchDescription>...<movies>...<movie> Select tNode.<trailer>
If Trailers.Count > 0 AndAlso Not String.IsNullOrEmpty(Trailers(0).Value) Then
If Trailers(0).Value.ToLower.IndexOf("youtube.com") > 0 Then
Dim Trailers = From tNode In xmlTMDB...<OpenSearchDescription>...<movies>...<movie> Select tNode.<trailer>
If Trailers.Count > 0 AndAlso Not String.IsNullOrEmpty(Trailers(0).Value) Then
If Trailers(0).Value.ToLower.IndexOf("youtube.com") > 0 Then
Return Trailers(0).Value
i += 1
End If
Else
tLang = "en"
End If
End If
End If
Next
End If
End If
End If
Expand Down Expand Up @@ -230,5 +240,4 @@ Namespace TMDB

End Class

End Namespace

End Namespace
38 changes: 30 additions & 8 deletions Addons/scraper.EmberCore/Scraper/dlgImgSelect.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
' ################################################################################
' ################################################################################
' # EMBER MEDIA MANAGER #
' ################################################################################
' ################################################################################
Expand Down Expand Up @@ -362,11 +362,14 @@ Public Class dlgImgSelect
'\\
Dim thumbLink As String = String.Empty
Dim savePath As String = String.Empty
Dim extrathumbSize As String = String.Empty

extrathumbSize = AdvancedSettings.GetSetting("ManualETSize", "thumb")

'Only download the posters themselves that match the cover criteria for display purposes, no need to download them all.
Dim posters As MediaContainers.Image()
If Me.DLType = Enums.ImageType.Fanart Then
posters = TMDBPosters.Where(Function(s) s.Description = "thumb").ToArray()
posters = TMDBPosters.Where(Function(s) s.Description = extrathumbSize).ToArray()
Else
posters = TMDBPosters.Where(Function(s) s.Description = "cover").ToArray()
End If
Expand Down Expand Up @@ -882,6 +885,9 @@ Public Class dlgImgSelect
Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click
Try
Dim tmpPathPlus As String = String.Empty
Dim extrathumbSize As String

extrathumbSize = AdvancedSettings.GetSetting("ManualETSize", "thumb")

If DLType = Enums.ImageType.Fanart Then
tmpPathPlus = Path.Combine(Master.TempPath, "fanart.jpg")
Expand Down Expand Up @@ -910,21 +916,37 @@ Public Class dlgImgSelect
If Master.eSettings.UseImgCache Then
tmpImage.FromFile(Path.Combine(CachePath, String.Concat("poster_(original)_(url=", Me.rbXLarge.Tag, ").jpg")))
Else
Me.tmpImage.FromWeb(Me.rbXLarge.Tag.ToString)
If extrathumbSize = "original" And DLType = Enums.ImageType.Fanart Then
Me.tmpImage.Image = Me.pbImage(selIndex).Image
Else
Me.tmpImage.FromWeb(Me.rbXLarge.Tag.ToString)
End If
End If
Case Me.rbLarge.Checked
If Master.eSettings.UseImgCache Then
Me.tmpImage.FromFile(Path.Combine(CachePath, String.Concat("poster_(mid)_(url=", Me.rbLarge.Tag, ").jpg")))
Else
Me.tmpImage.FromWeb(Me.rbLarge.Tag.ToString)
If extrathumbSize = "w1280" And DLType = Enums.ImageType.Fanart Or Not DLType = Enums.ImageType.Fanart Then
Me.tmpImage.Image = Me.pbImage(selIndex).Image
Else
Me.tmpImage.FromWeb(Me.rbLarge.Tag.ToString)
End If
End If
Case Me.rbMedium.Checked
Me.tmpImage.Image = Me.pbImage(selIndex).Image
If extrathumbSize = "poster" And DLType = Enums.ImageType.Fanart Then
Me.tmpImage.Image = Me.pbImage(selIndex).Image
Else
Me.tmpImage.FromWeb(Me.rbMedium.Tag.ToString)
End If
Case Me.rbSmall.Checked
If Master.eSettings.UseImgCache Then
Me.tmpImage.FromFile(Path.Combine(CachePath, String.Concat("poster_(thumb)_(url=", Me.rbSmall.Tag, ").jpg")))
If Master.eSettings.UseImgCache Then
Me.tmpImage.FromFile(Path.Combine(CachePath, String.Concat("poster_(thumb)_(url=", Me.rbSmall.Tag, ").jpg")))
Else
Me.tmpImage.FromWeb(Me.rbSmall.Tag.ToString)
If extrathumbSize = "thumb" And DLType = Enums.ImageType.Fanart Then
Me.tmpImage.Image = Me.pbImage(selIndex).Image
Else
Me.tmpImage.FromWeb(Me.rbSmall.Tag.ToString)
End If
End If
End Select

Expand Down
81 changes: 77 additions & 4 deletions Addons/scraper.EmberCore/frmMediaSettingsHolder.Designer.vb
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 12 additions & 2 deletions Addons/scraper.EmberCore/frmMediaSettingsHolder.vb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
' ################################################################################
' ################################################################################
' # EMBER MEDIA MANAGER #
' ################################################################################
' ################################################################################
Expand Down Expand Up @@ -77,6 +77,7 @@ Public Class frmMediaSettingsHolder

Private Sub chkTrailerTMDB_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkTrailerTMDB.CheckedChanged
chkTrailerTMDBXBMC.Enabled = chkTrailerTMDB.Checked
cbTrailerTMDBPref.Enabled = chkTrailerTMDB.Checked
RaiseEvent ModuleSettingsChanged()
End Sub

Expand Down Expand Up @@ -106,6 +107,7 @@ Public Class frmMediaSettingsHolder
End Sub

Private Sub chkUseTMDB_CheckedChanged(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles chkUseTMDB.CheckedChanged
cbManualETSize.Enabled = chkUseTMDB.Checked
RaiseEvent ModuleSettingsChanged()
End Sub

Expand Down Expand Up @@ -146,6 +148,14 @@ Public Class frmMediaSettingsHolder
RaiseEvent ModuleSettingsChanged()
End Sub

#End Region 'Methods
Private Sub cbManualETSize_SelectedIndexChanged(ByVal sender As System.Object, e As System.EventArgs) Handles cbManualETSize.SelectedIndexChanged
RaiseEvent ModuleSettingsChanged()
End Sub

Private Sub cbTrailerTMDBPref_SelectedIndexChanged(ByVal sender As System.Object, e As System.EventArgs) Handles cbTrailerTMDBPref.SelectedIndexChanged
RaiseEvent ModuleSettingsChanged()
End Sub

#End Region 'Methods

End Class
Loading