Skip to content

Commit

Permalink
cardigann: switch to standard datetime format (#14072)
Browse files Browse the repository at this point in the history
  • Loading branch information
mynameisbogdan committed Feb 23, 2023
1 parent 37fb4b3 commit 4f9b221
Show file tree
Hide file tree
Showing 31 changed files with 51 additions and 43 deletions.
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/acervos-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/aither-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/animetracker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/animeworld-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/blutopia-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/brsociety-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/danishbytes-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/datascene-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/desitorrents-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/generationfree-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/hawke-uno.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,7 +120,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/hd-unit3d-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/hdolimpo-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/jme-reunit3d-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/lat-team-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/locadora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/lst.yml
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/portugas-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/racing4everyone-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/redbits-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/reelflix-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -136,7 +136,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/shareisland-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/skipthecommercials-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/skipthetrailers.yml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/tellytorrent-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/thedarkcommunity-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/theoldschool-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,7 +183,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/theshinning-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -142,7 +142,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
2 changes: 1 addition & 1 deletion src/Jackett.Common/Definitions/torrentseeds-api.yml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ search:
- name: append
args: " +00:00" # GMT
- name: dateparse
args: "01/02/2006 15:04:05 -07:00"
args: "MM/dd/yyyy HH:mm:ss zzz"
size:
selector: size
downloadvolumefactor:
Expand Down
23 changes: 16 additions & 7 deletions src/Jackett.Common/Indexers/CardigannIndexer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.Specialized;
using System.Globalization;
using System.Linq;
using System.Net;
using System.Text;
Expand Down Expand Up @@ -1011,14 +1012,20 @@ protected string applyFilters(string Data, List<filterBlock> Filters, Dictionary
case "timeparse":
case "dateparse":
var layout = (string)Filter.Args;
try
{
var Date = DateTimeUtil.ParseDateTimeGoLang(Data, layout);
Data = Date.ToString(DateTimeUtil.Rfc1123ZPattern);
}
catch (FormatException ex)

if (layout.Contains("yy") && DateTime.TryParseExact(Data, layout, CultureInfo.InvariantCulture, DateTimeStyles.None, out var parsedDate))
Data = parsedDate.ToString(DateTimeUtil.Rfc1123ZPattern);
else
{
logger.Debug(ex.Message);
try
{
var datetime = DateTimeUtil.ParseDateTimeGoLang(Data, layout);
Data = datetime.ToString(DateTimeUtil.Rfc1123ZPattern);
}
catch (FormatException ex)
{
logger.Debug(ex.Message);
}
}
break;
case "regexp":
Expand Down Expand Up @@ -1436,7 +1443,9 @@ protected override async Task<IEnumerable<ReleaseInfo>> PerformQuery(TorznabQuer
&& SearchPath.Response.NoResultsMessage != null
&& (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)
throw new Exception("Error Parsing Json Response");

Expand Down
13 changes: 6 additions & 7 deletions src/Jackett.Common/Utils/DateTimeUtil.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
using System;
using System.Globalization;
using System.Linq;
using System.Text.RegularExpressions;

namespace Jackett.Common.Utils
Expand Down Expand Up @@ -114,6 +115,11 @@ public static DateTime FromUnknown(string str, string format = null, DateTime? r
{
str = ParseUtil.NormalizeSpace(str);
var now = relativeFrom ?? DateTime.Now;

// try parsing the str as an unix timestamp
if (str.All(char.IsDigit) && long.TryParse(str, out var unixTimeStamp))
return UnixTimestampToDateTime(unixTimeStamp);

if (str.ToLower().Contains("now"))
return now;

Expand Down Expand Up @@ -187,13 +193,6 @@ public static DateTime FromUnknown(string str, string format = null, DateTime? r
return dt;
}

// try parsing the str as an unix timestamp
if (long.TryParse(str, out var unixTimeStamp))
{
return UnixTimestampToDateTime(unixTimeStamp);
}
// it wasn't a timestamp, continue....

// add missing year
match = _MissingYearRegexp.Match(str);
if (match.Success)
Expand Down

0 comments on commit 4f9b221

Please sign in to comment.