Move edit icon to the left on remote path mappings

Fixes: #6686

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.css

@@ -1,23 +1,20 @@
 .remotePathMapping {
   display: flex;
-  align-items: stretch;
+  align-items: left;
   margin-bottom: 10px;
   height: 30px;
   border-bottom: 1px solid $borderColor;
   line-height: 30px;
 }
 
+.actions {
+  flex: 0 0 25px;
+}
+
 .host {
-  flex: 0 0 300px;
+  flex: 1 0 300px;
 }
 
 .path {
-  flex: 0 0 400px;
-}
-
-.actions {
-  display: flex;
-  justify-content: flex-end;
-  flex: 1 0 auto;
-  padding-right: 10px;
+  flex: 1 0 400px;
 }

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMapping.js

@@ -66,9 +66,6 @@ class RemotePathMapping extends Component {
           styles.remotePathMapping
         )}
       >
-        <div className={styles.host}>{host}</div>
-        <div className={styles.path}>{remotePath}</div>
-        <div className={styles.path}>{localPath}</div>
 
         <div className={styles.actions}>
           <Link
@@ -78,6 +75,10 @@ class RemotePathMapping extends Component {
           </Link>
         </div>
 
+        <div className={styles.host}>{host}</div>
+        <div className={styles.path}>{remotePath}</div>
+        <div className={styles.path}>{localPath}</div>
+
         <EditRemotePathMappingModalConnector
           id={id}
           isOpen={this.state.isEditRemotePathMappingModalOpen}

frontend/src/Settings/DownloadClients/RemotePathMappings/RemotePathMappings.css

@@ -4,17 +4,19 @@
   font-weight: bold;
 }
 
+.actions {
+  flex: 0 0 25px;
+}
+
 .host {
-  flex: 0 0 300px;
+  flex: 1 0 300px;
 }
 
 .path {
-  flex: 0 0 400px;
+  flex: 1 0 400px;
 }
 
 .addRemotePathMapping {
-  display: flex;
-  justify-content: flex-end;
   padding-right: 10px;
 }
 

src/NzbDrone.Core.Test/ParserTests/ParserFixture.cs

@@ -62,10 +62,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("G.I.Movie.Movie.2013.THEATRiCAL.COMPLETE.BLURAY-GLiMMER", "G.I. Movie Movie")]
         [TestCase("www.Torrenting.org - Movie.2008.720p.X264-DIMENSION", "Movie")]
         [TestCase("The.French.Movie.2013.720p.BluRay.x264 - ROUGH[PublicHD]", "The French Movie")]
-        [TestCase("Movie.Title.1984.2020", "Movie Title 1984")]
-        [TestCase("1929 (2020)", "1929")]
-        [TestCase("1929 2020", "1929")]
-
         public void should_parse_movie_title(string postTitle, string title)
         {
             Parser.Parser.ParseMovieTitle(postTitle).PrimaryMovieTitle.Should().Be(title);
@@ -83,9 +79,6 @@ namespace NzbDrone.Core.Test.ParserTests
         [TestCase("Life.Movie.2014.German.DL.PAL.DVDR-ETM", "Life Movie", "", 2014)]
         [TestCase("Joe.Movie.2.EXTENDED.EDITION.2015.German.DL.PAL.DVDR-ETM", "Joe Movie 2", "EXTENDED EDITION", 2015)]
         [TestCase("Movie.EXTENDED.2011.HDRip.AC3.German.XviD-POE", "Movie", "EXTENDED", 2011)]
-        [TestCase("Movie.Title.1984.2020", "Movie Title 1984", "", 2020)]
-        [TestCase("1929 (2020)", "1929", "", 2020)]
-        [TestCase("1929 2020", "1929", "", 2020)]
 
         //Special cases (see description)
         [TestCase("Movie.Klasse.von.1999.1990.German.720p.HDTV.x264-NORETAiL", "Movie Klasse von 1999", "", 1990, Description = "year in the title")]

src/NzbDrone.Core/Parser/Parser.cs

@@ -42,12 +42,6 @@ namespace NzbDrone.Core.Parser
 
             //As a last resort for movies that have ( or [ in their title.
             new Regex(@"^(?<title>.+?)?(?:(?:[-_\W](?<![)\[!]))*(?<year>(1(8|9)|20)\d{2}(?!p|i|\d+|\]|\W\d+)))+(\W+|_|$)(?!\\)", RegexOptions.IgnoreCase | RegexOptions.Compiled),
-
-            // Year in Title
-            new Regex(@"^(?<title>.+?)(?:\W|_)?(?<year>\d{4})", RegexOptions.IgnoreCase | RegexOptions.Compiled),
-
-            // Maybe the Title is a Year only
-            new Regex(@"^(?<title>.+?)(?:\W|_|\.)?(?<year>\d{4}(?<![ _.]\d{4}))", RegexOptions.IgnoreCase | RegexOptions.Compiled),
         };
 
         private static readonly Regex[] ReportMovieTitleFolderRegex = new[]
@@ -134,6 +128,9 @@ namespace NzbDrone.Core.Parser
         private static readonly Regex AnimeReleaseGroupRegex = new Regex(@"^(?:\[(?<subgroup>(?!\s).+?(?<!\s))\](?:_|-|\s|\.)?)",
                                                                 RegexOptions.IgnoreCase | RegexOptions.Compiled);
 
+        private static readonly Regex YearInTitleRegex = new Regex(@"^(?<title>.+?)(?:\W|_)?(?<year>\d{4})",
+                                                                RegexOptions.IgnoreCase | RegexOptions.Compiled);
+
         //Handle Exception Release Groups that don't follow -RlsGrp; Manual List
         //First Group is groups whose releases end with RlsGroup) or RlsGroup]  second group (entries after `(?=\]|\))|`) is name only...BE VERY CAREFUL WITH THIS, HIGH CHANCE OF FALSE POSITIVES
         private static readonly Regex ExceptionReleaseGroupRegex = new Regex(@"(?<releasegroup>(Tigole|Joy|YIFY|YTS.MX|YTS.LT|FreetheFish|afm72|Anna|Bandi|Ghost|Kappa|MONOLITH|Qman|RZeroX|SAMPA|Silence|theincognito|t3nzin|Vyndros)(?=\]|\))|KRaLiMaRKo|E\.N\.D|D\-Z0N3)",