cardigann: minor changes (#14071)

Jackett · Feb 23, 2023 · d3df214 · d3df214
1 parent cd800b5
commit d3df214
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/src/Jackett.Common/Indexers/CardigannIndexer.cs b/src/Jackett.Common/Indexers/CardigannIndexer.cs
@@ -1126,18 +1126,15 @@ protected string applyFilters(string Data, List<filterBlock> Filters, Dictionary
                         break;
                     case "hexdump":
                         // this is mainly for debugging invisible special char related issues
-                        var HexData = string.Join("", Data.Select(c => c + "(" + ((int)c).ToString("X2") + ")"));
-                        logger.Debug(string.Format("CardigannIndexer ({0}): strdump: {1}", Id, HexData));
+                        var hexData = string.Join("", Data.Select(c => c + "(" + ((int)c).ToString("X2") + ")"));
+                        logger.Debug($"CardigannIndexer ({Id}): strdump: {hexData}");
                         break;
                     case "strdump":
                         // for debugging
-                        var DebugData = Data.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\xA0", "\\xA0");
+                        var debugData = Data.Replace("\r", "\\r").Replace("\n", "\\n").Replace("\xA0", "\\xA0");
                         var strTag = (string)Filter.Args;
-                        if (strTag != null)
-                            strTag = string.Format("({0}):", strTag);
-                        else
-                            strTag = ":";
-                        logger.Debug(string.Format("CardigannIndexer ({0}): strdump{1} {2}", Id, strTag, DebugData));
+                        strTag = strTag != null ? $"({strTag}):" : ":";
+                        logger.Debug($"CardigannIndexer ({Id}): strdump{strTag} {debugData}");
                         break;
                     case "validate":
                         char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
@@ -1433,10 +1430,11 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
                 {
                     if (response.Status != HttpStatusCode.OK)
                         throw new Exception($"Error Parsing Json Response: Status={response.Status} Response={results}");
+
                     if (response.Status == HttpStatusCode.OK
                         && SearchPath.Response != null
                         && SearchPath.Response.NoResultsMessage != null
-                        && (SearchPath.Response.NoResultsMessage != String.Empty && results.Contains(SearchPath.Response.NoResultsMessage) || (SearchPath.Response.NoResultsMessage == String.Empty && results == String.Empty)))
+                        && (SearchPath.Response.NoResultsMessage != string.Empty && results.Contains(SearchPath.Response.NoResultsMessage) || (SearchPath.Response.NoResultsMessage == string.Empty && results == string.Empty)))
                         continue;
                     var parsedJson = JToken.Parse(results);
                     if (parsedJson == null)
@@ -1445,14 +1443,16 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
                     if (Search.Rows.Count != null)
                     {
                         var countVal = handleJsonSelector(Search.Rows.Count, parsedJson, variables);
-                        if (int.TryParse(countVal, out var count))
-                            if (count < 1)
-                                continue;
+
+                        if (int.TryParse(countVal, out var count) && count < 1)
+                            continue;
                     }
 
                     var rowsArray = JsonParseRowsSelector(parsedJson, Search.Rows.Selector);
+
                     if (rowsArray == null && Search.Rows.MissingAttributeEquals0Results)
                         continue;
+
                     if (rowsArray == null)
                         throw new Exception("Error Parsing Rows Selector. There are 0 rows.");
 
@@ -2106,12 +2106,10 @@ private string ParseFields(string value, string FieldName, ReleaseInfo release,
                     value = release.DoubanId.ToString();
                     break;
                 case "genre":
-                    if (release.Genres == null)
-                        release.Genres = new List<string>();
+                    release.Genres ??= new List<string>();
                     char[] delimiters = { ',', ' ', '/', ')', '(', '.', ';', '[', ']', '"', '|', ':' };
                     var releaseGenres = release.Genres.Union(value.Split(delimiters, StringSplitOptions.RemoveEmptyEntries));
-                    releaseGenres = releaseGenres.Select(x => x.Replace("_", " "));
-                    release.Genres = releaseGenres.ToList();
+                    release.Genres = releaseGenres.Select(x => x.Replace("_", " ")).ToList();
                     value = string.Join(",", release.Genres);
                     break;
                 case "year":

diff --git a/src/Jackett.Common/Utils/DateTimeUtil.cs b/src/Jackett.Common/Utils/DateTimeUtil.cs
@@ -294,13 +294,15 @@ public static DateTime ParseDateTimeGoLang(string date, string layout, DateTime?
             try
             {
                 var dateTime = DateTime.ParseExact(date, pattern, CultureInfo.InvariantCulture);
+
                 if (!pattern.Contains("yy") && dateTime > now)
                     dateTime = dateTime.AddYears(-1);
+
                 return dateTime;
             }
             catch (FormatException ex)
             {
-                throw new FormatException($"Error while parsing DateTime \"{date}\", using layout \"{layout}\" ({pattern}): {ex.Message}");
+                throw new FormatException($"Error while parsing DateTime \"{date}\", using layout \"{layout}\" ({pattern}): {ex.Message}", ex);
             }
         }