Sortitle won't be scraped and set automatically

DanCooper · Sep 20, 2014 · c60ee6f · c60ee6f
1 parent c87ca9c
commit c60ee6f
Show file tree

Hide file tree

Showing 7 changed files with 2 additions and 16 deletions.
diff --git a/Addons/generic.EmberCore.BulkRename/dlgBulkRename.vb b/Addons/generic.EmberCore.BulkRename/dlgBulkRename.vb
@@ -111,7 +111,7 @@ Public Class dlgBulkRenamer
                                                 MovieFile.Title = _curMovie.Movie.Title
                                             End If
                                             If String.IsNullOrEmpty(_curMovie.Movie.SortTitle) Then
-                                                MovieFile.SortTitle = MovieFile.Title
+                                                ' MovieFile.SortTitle = MovieFile.Title
                                             Else
                                                 MovieFile.SortTitle = _curMovie.Movie.SortTitle
                                             End If

diff --git a/Addons/scraper.IMDB.Data/IMDB_Data.vb b/Addons/scraper.IMDB.Data/IMDB_Data.vb
@@ -552,7 +552,6 @@ Public Class IMDB_Data
 
         If Not String.IsNullOrEmpty(DBMovie.Movie.Title) Then
             tTitle = StringUtils.FilterTokens_Movie(DBMovie.Movie.Title)
-            If Not OldTitle = DBMovie.Movie.Title OrElse String.IsNullOrEmpty(DBMovie.Movie.SortTitle) Then DBMovie.Movie.SortTitle = tTitle
             If Master.eSettings.MovieDisplayYear AndAlso Not String.IsNullOrEmpty(DBMovie.Movie.Year) Then
                 DBMovie.ListTitle = String.Format("{0} ({1})", tTitle, DBMovie.Movie.Year)
             Else
@@ -570,7 +569,6 @@ Public Class IMDB_Data
                     DBMovie.ListTitle = StringUtils.FilterName(Path.GetFileNameWithoutExtension(DBMovie.Filename))
                 End If
             End If
-            If Not OldTitle = DBMovie.Movie.Title OrElse String.IsNullOrEmpty(DBMovie.Movie.SortTitle) Then DBMovie.Movie.SortTitle = DBMovie.ListTitle
         End If
 
         logger.Trace("Finished IMDB ScraperNew")

diff --git a/Addons/scraper.IMDB.Data/Scraper/clsScrapeIMDB.vb b/Addons/scraper.IMDB.Data/Scraper/clsScrapeIMDB.vb
@@ -213,9 +213,6 @@ Namespace IMDB
                             nMovie.Title = nMovie.OriginalTitle.Trim
                         End If
                     End If
-                    If String.IsNullOrEmpty(oldOTitle) OrElse Not oldOTitle = nMovie.OriginalTitle Then
-                        nMovie.SortTitle = String.Empty
-                    End If
                 End If
 
                 If bwIMDB.CancellationPending Then Return Nothing

diff --git a/Addons/scraper.TMDB.Data/TMDB_Data.vb b/Addons/scraper.TMDB.Data/TMDB_Data.vb
@@ -862,7 +862,6 @@ Public Class TMDB_Data
 
         If Not String.IsNullOrEmpty(DBMovie.Movie.Title) Then
             tTitle = StringUtils.FilterTokens_Movie(DBMovie.Movie.Title)
-            If Not OldTitle = DBMovie.Movie.Title OrElse String.IsNullOrEmpty(DBMovie.Movie.SortTitle) Then DBMovie.Movie.SortTitle = tTitle
             If Master.eSettings.MovieDisplayYear AndAlso Not String.IsNullOrEmpty(DBMovie.Movie.Year) Then
                 DBMovie.ListTitle = String.Format("{0} ({1})", tTitle, DBMovie.Movie.Year)
             Else
@@ -880,7 +879,6 @@ Public Class TMDB_Data
                     DBMovie.ListTitle = StringUtils.FilterName(Path.GetFileNameWithoutExtension(DBMovie.Filename))
                 End If
             End If
-            If Not OldTitle = DBMovie.Movie.Title OrElse String.IsNullOrEmpty(DBMovie.Movie.SortTitle) Then DBMovie.Movie.SortTitle = DBMovie.ListTitle
         End If
 
 

diff --git a/EmberAPI/clsAPIScanner.vb b/EmberAPI/clsAPIScanner.vb
@@ -878,11 +878,9 @@ Public Class Scanner
                     End If
                 End If
 
-                If String.IsNullOrEmpty(tmpMovieDB.Movie.SortTitle) Then tmpMovieDB.Movie.SortTitle = tmpMovieDB.ListTitle
 
             Else
                 Dim tTitle As String = StringUtils.FilterTokens_Movie(tmpMovieDB.Movie.Title)
-                If String.IsNullOrEmpty(tmpMovieDB.Movie.SortTitle) Then tmpMovieDB.Movie.SortTitle = tTitle
                 If Master.eSettings.MovieDisplayYear AndAlso Not String.IsNullOrEmpty(tmpMovieDB.Movie.Year) Then
                     tmpMovieDB.ListTitle = String.Format("{0} ({1})", tTitle, tmpMovieDB.Movie.Year)
                 Else

diff --git a/EmberMediaManager/dlgOfflineHolder.vb b/EmberMediaManager/dlgOfflineHolder.vb
@@ -472,7 +472,7 @@ Public Class dlgOfflineHolder
 
         If Not String.IsNullOrEmpty(Args.dMovie.Movie.Title) Then
             Dim tTitle As String = StringUtils.FilterTokens_Movie(Args.dMovie.Movie.Title)
-            Args.dMovie.Movie.SortTitle = tTitle
+
             If Master.eSettings.MovieDisplayYear AndAlso Not String.IsNullOrEmpty(Args.dMovie.Movie.Year) Then
                 Args.dMovie.ListTitle = String.Format("{0} ({1})", tTitle, Args.dMovie.Movie.Year)
             Else
@@ -482,7 +482,6 @@ Public Class dlgOfflineHolder
             Args.dMovie.ListTitle = MovieName.Replace("[Offline]", String.Empty).Trim
         End If
 
-        Args.dMovie.Movie.SortTitle = Args.dMovie.ListTitle
 
         If Me.bwCreateDummyFile.CancellationPending Then
             e.Cancel = True

diff --git a/EmberMediaManager/frmMain.vb b/EmberMediaManager/frmMain.vb
@@ -9625,10 +9625,8 @@ doCancel:
                                             Master.currMovie.ListTitle = StringUtils.FilterName(Path.GetFileNameWithoutExtension(sFile.Filename))
                                         End If
                                     End If
-                                    If String.IsNullOrEmpty(Master.currMovie.Movie.SortTitle) Then Master.currMovie.Movie.SortTitle = Master.currMovie.ListTitle
                                 Else
                                     Dim tTitle As String = StringUtils.FilterTokens_Movie(Master.currMovie.Movie.Title)
-                                    If String.IsNullOrEmpty(Master.currMovie.Movie.SortTitle) Then Master.currMovie.Movie.SortTitle = tTitle
                                     If Master.eSettings.MovieDisplayYear AndAlso Not String.IsNullOrEmpty(Master.currMovie.Movie.Year) Then
                                         Master.currMovie.ListTitle = String.Format("{0} ({1})", tTitle, Master.currMovie.Movie.Year)
                                     Else
@@ -12963,10 +12961,8 @@ doCancel:
                             tmpMovieDB.Movie.Title = StringUtils.FilterName(Path.GetFileNameWithoutExtension(tmpMovieDB.Filename), False)
                         End If
                     End If
-                    If Not OldTitle = tmpMovieDB.Movie.Title OrElse String.IsNullOrEmpty(tmpMovieDB.Movie.SortTitle) Then tmpMovieDB.Movie.SortTitle = tmpMovieDB.ListTitle
                 Else
                     Dim tTitle As String = StringUtils.FilterTokens_Movie(tmpMovieDB.Movie.Title)
-                    If Not OldTitle = tmpMovieDB.Movie.Title OrElse String.IsNullOrEmpty(tmpMovieDB.Movie.SortTitle) Then tmpMovieDB.Movie.SortTitle = tTitle
                     If Master.eSettings.MovieDisplayYear AndAlso Not String.IsNullOrEmpty(tmpMovieDB.Movie.Year) Then
                         tmpMovieDB.ListTitle = String.Format("{0} ({1})", tTitle, tmpMovieDB.Movie.Year)
                     Else