Revert "Fix movie title slugs"

src/NzbDrone.Core/Datastore/Migration/117_fix_movie_slugs.cs

@@ -1,72 +0,0 @@
-using System.Data;
-using FluentMigrator;
-using NzbDrone.Core.Datastore.Migration.Framework;
-using System.Text;
-using System.Text.RegularExpressions;
-
-namespace NzbDrone.Core.Datastore.Migration
-{
-    [Migration(117)]
-    public class fix_movie_slugs : NzbDroneMigrationBase
-    {
-        protected override void MainDbUpgrade()
-        {
-            Execute.WithConnection(SetTitleSlug);
-        }
-
-        private void SetTitleSlug(IDbConnection conn, IDbTransaction tran)
-        {
-            using (IDbCommand getSeriesCmd = conn.CreateCommand())
-            {
-                getSeriesCmd.Transaction = tran;
-                getSeriesCmd.CommandText = @"SELECT Id, Title, Year FROM Movies";
-                using (IDataReader seriesReader = getSeriesCmd.ExecuteReader())
-                {
-                    while (seriesReader.Read())
-                    {
-                        var id = seriesReader.GetInt32(0);
-                        var title = seriesReader.GetString(1);
-                        var year = seriesReader.GetString(2);
-
-                        var titleSlug = ToUrlSlug(title + "-" + year);
-
-                        using (IDbCommand updateCmd = conn.CreateCommand())
-                        {
-                            updateCmd.Transaction = tran;
-                            updateCmd.CommandText = "UPDATE Movies SET TitleSlug = ? WHERE Id = ?";
-                            updateCmd.AddParameter(titleSlug);
-                            updateCmd.AddParameter(id);
-
-                            updateCmd.ExecuteNonQuery();
-                        }
-                    }
-                }
-            }
-        }
-
-        public static string ToUrlSlug(string value)
-        {
-
-            //First to lower case
-            value = value.ToLowerInvariant();
-
-            //Remove all accents
-            var bytes = Encoding.GetEncoding("Cyrillic").GetBytes(value);
-            value = Encoding.ASCII.GetString(bytes);
-
-            //Replace spaces
-            value = Regex.Replace(value, @"\s", "-", RegexOptions.Compiled);
-
-            //Remove invalid chars
-            value = Regex.Replace(value, @"[^a-z0-9\s-_]", "", RegexOptions.Compiled);
-
-            //Trim dashes from end
-            value = value.Trim('-', '_');
-
-            //Replace double occurences of - or _
-            value = Regex.Replace(value, @"([-_]){2,}", "$1", RegexOptions.Compiled);
-
-            return value;
-        }
-    }
-}

src/NzbDrone.Core/MetadataSource/SkyHook/SkyHookProxy.cs

@@ -13,7 +13,6 @@
 using NzbDrone.Core.Tv;
 using Newtonsoft.Json;
 using System.Text.RegularExpressions;
-using System.Text;
 
 namespace NzbDrone.Core.MetadataSource.SkyHook
 {
@@ -89,7 +88,7 @@ public Movie GetMovieInfo(int TmdbId)
             movie.TmdbId = TmdbId;
             movie.ImdbId = resource.imdb_id;
             movie.Title = resource.title;
-            movie.TitleSlug = ToUrlSlug(movie.Title);
+            movie.TitleSlug = movie.Title.ToLower().Replace(" ", "-");
             movie.CleanTitle = Parser.Parser.CleanSeriesTitle(movie.Title);
             movie.SortTitle = Parser.Parser.NormalizeTitle(movie.Title);
             movie.Overview = resource.overview;
@@ -105,7 +104,6 @@ public Movie GetMovieInfo(int TmdbId)
             {
                 _logger.Debug("Movie with this title slug already exists. Adding year...");
             }
-            //movie.TitleSlug += "-" + movie.Year.ToString();
             movie.TitleSlug += "-" + movie.Year.ToString();
 
             movie.Images.Add(_configService.GetCoverForURL(resource.poster_path, MediaCoverTypes.Poster));//TODO: Update to load image specs from tmdb page!
@@ -181,8 +179,7 @@ private string StripTrailingTheFromTitle(string title)
             if(title.EndsWith(",the"))
             {
                 title = title.Substring(0, title.Length - 4);
-            }
+            } else if(title.EndsWith(", the"))
-            else if (title.EndsWith(", the"))
             {
                 title = title.Substring(0, title.Length - 5);
             }
@@ -333,8 +330,8 @@ private Movie MapMovie(MovieResult result)
             {
                 imdbMovie.SortTitle = Parser.Parser.NormalizeTitle(result.title);
                 imdbMovie.Title = result.title;
-                string titleSlug = ToUrlSlug(result.title);
+                string titleSlug = result.title;
-                // imdbMovie.TitleSlug = titleSlug.ToLower().Replace(" ", "-");
+                imdbMovie.TitleSlug = titleSlug.ToLower().Replace(" ", "-");
 
                 if (result.release_date.IsNotNullOrWhiteSpace())
                 {
@@ -343,16 +340,12 @@ private Movie MapMovie(MovieResult result)
 
 
 
-                //var slugResult = _movieService.FindByTitleSlug(titleSlug);
+                var slugResult = _movieService.FindByTitleSlug(imdbMovie.TitleSlug);
-                //if (slugResult != null)
+                if (slugResult != null)
-                //{
+                {
-                //    _logger.Debug("Movie with this title slug already exists. Adding year...");
+                    _logger.Debug("Movie with this title slug already exists. Adding year...");
-                //}
+                }
-                //imdbMovie.TitleSlug += "-" + imdbMovie.Year.ToString();
+                imdbMovie.TitleSlug += "-" + imdbMovie.Year.ToString();
-
-                titleSlug += "-" + imdbMovie.Year.ToString(); ;
-
-                imdbMovie.TitleSlug = titleSlug;
 
                 imdbMovie.Images = new List<MediaCover.MediaCover>();
                 imdbMovie.Overview = result.overview;
@@ -532,30 +525,5 @@ private static MediaCoverTypes MapCoverType(string coverType)
                     return MediaCoverTypes.Unknown;
             }
         }
-
-        public static string ToUrlSlug(string value)
-        {
-
-            //First to lower case
-            value = value.ToLowerInvariant();
-
-            //Remove all accents
-            var bytes = Encoding.GetEncoding("Cyrillic").GetBytes(value);
-            value = Encoding.ASCII.GetString(bytes);
-
-            //Replace spaces
-            value = Regex.Replace(value, @"\s", "-", RegexOptions.Compiled);
-
-            //Remove invalid chars
-            value = Regex.Replace(value, @"[^a-z0-9\s-_]", "", RegexOptions.Compiled);
-
-            //Trim dashes from end
-            value = value.Trim('-', '_');
-
-            //Replace double occurences of - or _
-            value = Regex.Replace(value, @"([-_]){2,}", "$1", RegexOptions.Compiled);
-
-            return value;
-        }
     }
 }

src/NzbDrone.Core/NzbDrone.Core.csproj

@@ -294,7 +294,6 @@
     </Compile>
     <Compile Include="Datastore\Migration\110_add_physical_release_to_table.cs" />
     <Compile Include="Datastore\Migration\109_add_movie_formats_to_naming_config.cs" />
-    <Compile Include="Datastore\Migration\117_fix_movie_slugs.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationContext.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationController.cs" />
     <Compile Include="Datastore\Migration\Framework\MigrationDbFactory.cs" />