mirror
/
Jackett
mirror of https://github.com/Jackett/Jackett
1
0
Fork 0
Code Issues Releases Wiki Activity

Abstracted common "time ago" date string parsing logic

This commit is contained in:
unknown 2015-07-22 23:16:13 -06:00
parent bb10442216
commit 1e5aedea9d
8 changed files with 54 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/Jackett/Indexers/BB.cs
View File

@ -130,28 +130,7 @@ namespace Jackett.Indexers
release.Link = new Uri(BaseUrl + "/" + qDownload.Attr("href"));
var dateStr = row.ChildElements.ElementAt(3).Cq().Text().Trim().Replace(" and", "");
var dateParts = dateStr.Split(new char[] { ' ' }, StringSplitOptions.RemoveEmptyEntries);
TimeSpan timeAgo = TimeSpan.Zero;
for (var i = 0; i < dateParts.Length / 2; i++)
{
var val = ParseUtil.CoerceInt(dateParts[i * 2]);
var unit = dateParts[i * 2 + 1];
if (unit.Contains("sec"))
timeAgo += TimeSpan.FromSeconds(val);
else if (unit.Contains("min"))
timeAgo += TimeSpan.FromMinutes(val);
else if (unit.Contains("hour"))
timeAgo += TimeSpan.FromHours(val);
else if (unit.Contains("day"))
timeAgo += TimeSpan.FromDays(val);
else if (unit.Contains("week"))
timeAgo += TimeSpan.FromDays(val * 7);
else if (unit.Contains("month"))
timeAgo += TimeSpan.FromDays(val * 30);
else if (unit.Contains("year"))
timeAgo += TimeSpan.FromDays(val * 365);
}
release.PublishDate = DateTime.SpecifyKind(DateTime.Now - timeAgo, DateTimeKind.Local);
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeStr = row.ChildElements.ElementAt(4).Cq().Text().Trim();
var sizeParts = sizeStr.Split(' ');

19
src/Jackett/Indexers/BeyondHD.cs
View File

@ -114,24 +114,7 @@ namespace Jackett.Indexers
release.Guid = release.Comments;
var dateStr = descCol.ChildElements.Last().Cq().Text().Split('|').Last().ToLowerInvariant().Replace("ago.", "").Trim();
var dateParts = dateStr.Split(new char[] { ' ', ' ' }, StringSplitOptions.RemoveEmptyEntries);
var timeSpan = TimeSpan.Zero;
for (var i = 0; i < dateParts.Length / 2; i++)
{
var timeVal = ParseUtil.CoerceInt(dateParts[i * 2]);
var timeUnit = dateParts[i * 2 + 1];
if (timeUnit.Contains("year"))
timeSpan += TimeSpan.FromDays(365 * timeVal);
else if (timeUnit.Contains("month"))
timeSpan += TimeSpan.FromDays(30 * timeVal);
else if (timeUnit.Contains("day"))
timeSpan += TimeSpan.FromDays(timeVal);
else if (timeUnit.Contains("hour"))
timeSpan += TimeSpan.FromHours(timeVal);
else if (timeUnit.Contains("min"))
timeSpan += TimeSpan.FromMinutes(timeVal);
}
release.PublishDate = DateTime.SpecifyKind(DateTime.Now - timeSpan, DateTimeKind.Local);
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeEl = row.ChildElements.ElementAt(7);
var sizeVal = ParseUtil.CoerceFloat(sizeEl.ChildNodes.First().NodeValue);

17
src/Jackett/Indexers/HDTorrents.cs
View File

@ -169,22 +169,7 @@ namespace Jackett.Indexers
string fullSize = qRow.Find("td.mainblockcontent").Get(6).InnerText;
string[] sizeSplit = fullSize.Split(' ');
switch (sizeSplit[1].ToLower())
{
case "kb":
size = ReleaseInfo.BytesFromKB(ParseUtil.CoerceFloat(sizeSplit[0]));
break;
case "mb":
size = ReleaseInfo.BytesFromMB(ParseUtil.CoerceFloat(sizeSplit[0]));
break;
case "gb":
size = ReleaseInfo.BytesFromGB(ParseUtil.CoerceFloat(sizeSplit[0]));
break;
default:
size = null;
break;
}
release.Size = size;
release.Size = ReleaseInfo.GetBytes(sizeSplit[1], ParseUtil.CoerceFloat(sizeSplit[0]));
release.Guid = new Uri(SiteLink + "/" + qRow.Find("td.mainblockcontent b a").Attr("href"));
release.Link = new Uri(SiteLink + "/" + qRow.Find("td.mainblockcontent").Get(3).FirstChild.GetAttribute("href"));

35
src/Jackett/Indexers/IPTorrents.cs
View File

@ -33,7 +33,7 @@ namespace Jackett.Indexers
logger: l)
{
SearchUrl = SiteLink + "t?q=";
webclient =wc;
webclient = wc;
}
public Task<ConfigurationData> GetConfigurationForSetup()
@ -58,7 +58,8 @@ namespace Jackett.Indexers
Url = SiteLink.ToString(),
PostData = pairs,
Referer = SiteLink.ToString(),
Type = RequestType.POST
Type = RequestType.POST,
AutoRedirect = true
});
cookieHeader = response.Cookies;
@ -91,16 +92,7 @@ namespace Jackett.Indexers
}
}
HttpRequestMessage CreateHttpRequest(Uri uri)
{
var message = new HttpRequestMessage();
message.Method = HttpMethod.Get;
message.RequestUri = uri;
message.Headers.UserAgent.ParseAdd(BrowserUtil.ChromeUserAgent);
return message;
}
public void LoadFromSavedConfiguration(Newtonsoft.Json.Linq.JToken jsonConfig)
public void LoadFromSavedConfiguration(JToken jsonConfig)
{
cookieHeader = (string)jsonConfig["cookies"];
IsConfigured = true;
@ -137,27 +129,10 @@ namespace Jackett.Indexers
release.Guid = new Uri(SiteLink + qTitleLink.Attr("href"));
release.Comments = release.Guid;
DateTime pubDate;
var descString = qRow.Find(".t_ctime").Text();
var dateString = descString.Split('|').Last().Trim();
dateString = dateString.Split(new string[] { " by " }, StringSplitOptions.None)[0];
var dateValue = ParseUtil.CoerceFloat(dateString.Split(' ')[0]);
var dateUnit = dateString.Split(' ')[1];
if (dateUnit.Contains("minute"))
pubDate = DateTime.Now - TimeSpan.FromMinutes(dateValue);
else if (dateUnit.Contains("hour"))
pubDate = DateTime.Now - TimeSpan.FromHours(dateValue);
else if (dateUnit.Contains("day"))
pubDate = DateTime.Now - TimeSpan.FromDays(dateValue);
else if (dateUnit.Contains("week"))
pubDate = DateTime.Now - TimeSpan.FromDays(7 * dateValue);
else if (dateUnit.Contains("month"))
pubDate = DateTime.Now - TimeSpan.FromDays(30 * dateValue);
else if (dateUnit.Contains("year"))
pubDate = DateTime.Now - TimeSpan.FromDays(365 * dateValue);
else
pubDate = DateTime.MinValue;
release.PublishDate = pubDate;
release.PublishDate = DateTimeUtil.FromTimeAgo(dateString);
var qLink = row.ChildElements.ElementAt(3).Cq().Children("a");
release.Link = new Uri(SiteLink + qLink.Attr("href"));

19
src/Jackett/Indexers/TorrentDay.cs
View File

@ -137,24 +137,7 @@ namespace Jackett.Indexers
release.Size = ReleaseInfo.GetBytes(sizeParts[1], ParseUtil.CoerceFloat(sizeParts[0]));
var dateStr = qRow.Find(".ulInfo").Text().Split('|').Last().Trim();
var dateParts = dateStr.Split(' ');
var dateValue = ParseUtil.CoerceInt(dateParts[0]);
TimeSpan ts = TimeSpan.Zero;
if (dateStr.Contains("sec"))
ts = TimeSpan.FromSeconds(dateValue);
else if (dateStr.Contains("min"))
ts = TimeSpan.FromMinutes(dateValue);
else if (dateStr.Contains("hour"))
ts = TimeSpan.FromHours(dateValue);
else if (dateStr.Contains("day"))
ts = TimeSpan.FromDays(dateValue);
else if (dateStr.Contains("week"))
ts = TimeSpan.FromDays(dateValue * 7);
else if (dateStr.Contains("month"))
ts = TimeSpan.FromDays(dateValue * 30);
else if (dateStr.Contains("year"))
ts = TimeSpan.FromDays(dateValue * 365);
release.PublishDate = DateTime.Now - ts;
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
release.Seeders = ParseUtil.CoerceInt(qRow.Find(".seedersInfo").Text());
release.Peers = ParseUtil.CoerceInt(qRow.Find(".leechersInfo").Text()) + release.Seeders;

26
src/Jackett/Indexers/TorrentShack.cs
View File

@ -118,31 +118,7 @@ namespace Jackett.Indexers
release.Link = new Uri(SiteLink + "/" + qRow.Find(".torrent_handle_links > a").First().Attr("href"));
var dateStr = qRow.Find(".time").Text().Trim();
if (dateStr.ToLower().Contains("just now"))
release.PublishDate = DateTime.Now;
else
{
var dateParts = dateStr.Split(' ');
var dateValue = ParseUtil.CoerceInt(dateParts[0]);
TimeSpan ts = TimeSpan.Zero;
if (dateStr.Contains("Just now"))
ts = TimeSpan.Zero;
else if (dateStr.Contains("sec"))
ts = TimeSpan.FromSeconds(dateValue);
else if (dateStr.Contains("min"))
ts = TimeSpan.FromMinutes(dateValue);
else if (dateStr.Contains("hour"))
ts = TimeSpan.FromHours(dateValue);
else if (dateStr.Contains("day"))
ts = TimeSpan.FromDays(dateValue);
else if (dateStr.Contains("week"))
ts = TimeSpan.FromDays(dateValue * 7);
else if (dateStr.Contains("month"))
ts = TimeSpan.FromDays(dateValue * 30);
else if (dateStr.Contains("year"))
ts = TimeSpan.FromDays(dateValue * 365);
release.PublishDate = DateTime.Now - ts;
}
release.PublishDate = DateTimeUtil.FromTimeAgo(dateStr);
var sizeStr = qRow.Find(".size")[0].ChildNodes[0].NodeValue.Trim();
var sizeParts = sizeStr.Split(' ');

38
src/Jackett/Utils/DateTimeUtil.cs
View File

@ -14,5 +14,43 @@ namespace Jackett.Utils
long unixTimeStampInTicks = (long)(unixTime * TimeSpan.TicksPerSecond);
return new DateTime(unixStart.Ticks + unixTimeStampInTicks);
}
// ex: "2 hours 1 day"
public static DateTime FromTimeAgo(string str)
{
str = str.ToLowerInvariant();
if (str.Contains("now"))
{
return DateTime.SpecifyKind(DateTime.Now, DateTimeKind.Local);
}
var dateParts = str.Split(new char[0], StringSplitOptions.RemoveEmptyEntries);
TimeSpan timeAgo = TimeSpan.Zero;
for (var i = 0; i < dateParts.Length / 2; i++)
{
var val = ParseUtil.CoerceFloat(dateParts[i * 2]);
var unit = dateParts[i * 2 + 1];
if (unit.Contains("sec"))
timeAgo += TimeSpan.FromSeconds(val);
else if (unit.Contains("min"))
timeAgo += TimeSpan.FromMinutes(val);
else if (unit.Contains("hour"))
timeAgo += TimeSpan.FromHours(val);
else if (unit.Contains("day"))
timeAgo += TimeSpan.FromDays(val);
else if (unit.Contains("week"))
timeAgo += TimeSpan.FromDays(val * 7);
else if (unit.Contains("month"))
timeAgo += TimeSpan.FromDays(val * 30);
else if (unit.Contains("year"))
timeAgo += TimeSpan.FromDays(val * 365);
else
{
throw new Exception("TimeAgo parsing failed");
}
}
return DateTime.SpecifyKind(DateTime.Now - timeAgo, DateTimeKind.Local);
}
}
}

12
src/Jackett/Utils/ParseUtil.cs
View File

@ -11,33 +11,33 @@ namespace Jackett.Utils
{
public static float CoerceFloat(string str)
{
return float.Parse(str, NumberStyles.Any, CultureInfo.InvariantCulture);
return float.Parse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture);
}
public static int CoerceInt(string str)
{
return int.Parse(str, NumberStyles.Any, CultureInfo.InvariantCulture);
return int.Parse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture);
}
public static long CoerceLong(string str)
{
return long.Parse(str, NumberStyles.Any, CultureInfo.InvariantCulture);
return long.Parse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture);
}
public static bool TryCoerceFloat(string str, out float result)
{
return float.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
return float.TryParse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out result);
}
public static bool TryCoerceInt(string str, out int result)
{
return int.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
return int.TryParse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out result);
}
public static bool TryCoerceLong(string str, out long result)
{
return long.TryParse(str, NumberStyles.Any, CultureInfo.InvariantCulture, out result);
return long.TryParse(str.Trim(), NumberStyles.Any, CultureInfo.InvariantCulture, out result);
}
}