Fixed TitleSlug For Realz!

src/NzbDrone.Core/Datastore/Migration/118_update_movie_slug.cs

@@ -0,0 +1,71 @@
+using System.Data;
+using FluentMigrator;
+using NzbDrone.Core.Datastore.Migration.Framework;
+using System.Text;
+using System.Text.RegularExpressions;
+
+namespace NzbDrone.Core.Datastore.Migration
+{
+    [Migration(118)]
+    public class update_movie_slug : 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.GetInt32(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,6 +13,7 @@ using NzbDrone.Core.MetadataSource;
 using NzbDrone.Core.Tv;
 using Newtonsoft.Json;
 using System.Text.RegularExpressions;
+using System.Text;
 
 namespace NzbDrone.Core.MetadataSource.SkyHook
 {
@@ -88,7 +89,7 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             movie.TmdbId = TmdbId;
             movie.ImdbId = resource.imdb_id;
             movie.Title = resource.title;
-            movie.TitleSlug = movie.Title.ToLower().Replace(" ", "-");
+            movie.TitleSlug = ToUrlSlug(movie.Title);
             movie.CleanTitle = Parser.Parser.CleanSeriesTitle(movie.Title);
             movie.SortTitle = Parser.Parser.NormalizeTitle(movie.Title);
             movie.Overview = resource.overview;
@@ -99,11 +100,6 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                 movie.Year = movie.InCinemas.Value.Year;
             }
 
-            var slugResult = _movieService.FindByTitleSlug(movie.TitleSlug);
-            if (slugResult != null)
-            {
-                _logger.Debug("Movie with this title slug already exists. Adding year...");
-            }
             movie.TitleSlug += "-" + movie.Year.ToString();
 
             movie.Images.Add(_configService.GetCoverForURL(resource.poster_path, MediaCoverTypes.Poster));//TODO: Update to load image specs from tmdb page!
@@ -330,21 +326,18 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
             {
                 imdbMovie.SortTitle = Parser.Parser.NormalizeTitle(result.title);
                 imdbMovie.Title = result.title;
-                string titleSlug = result.title;
+                string titleSlug = ToUrlSlug(result.title);
                 imdbMovie.TitleSlug = titleSlug.ToLower().Replace(" ", "-");
 
                 if (result.release_date.IsNotNullOrWhiteSpace())
                 {
                     imdbMovie.Year = DateTime.Parse(result.release_date).Year;
                 }
-
+                //var slugResult = _movieService.FindByTitleSlug(imdbMovie.TitleSlug);
-
+                //if (slugResult != null)
-
+                //{
-                var slugResult = _movieService.FindByTitleSlug(imdbMovie.TitleSlug);
+                //    _logger.Debug("Movie with this title slug already exists. Adding year...");
-                if (slugResult != null)
+                //}
-                {
-                    _logger.Debug("Movie with this title slug already exists. Adding year...");
-                }
                 imdbMovie.TitleSlug += "-" + imdbMovie.Year.ToString();
 
                 imdbMovie.Images = new List<MediaCover.MediaCover>();
@@ -525,5 +518,29 @@ namespace NzbDrone.Core.MetadataSource.SkyHook
                     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

@@ -183,6 +183,7 @@
     <Compile Include="Datastore\Migration\002_remove_tvrage_imdb_unique_constraint.cs" />
     <Compile Include="Datastore\Migration\003_remove_clean_title_from_scene_mapping.cs" />
     <Compile Include="Datastore\Migration\004_updated_history.cs" />
+    <Compile Include="Datastore\Migration\118_update_movie_slug.cs" />
     <Compile Include="Datastore\Migration\117_update_movie_file.cs" />
     <Compile Include="Datastore\Migration\116_update_movie_sorttitle_again.cs" />
     <Compile Include="Datastore\Migration\115_update_movie_sorttitle.cs" />