diff --git a/.github/duplicate_issue.md b/.github/duplicate_issue.md index eb77e4769..0a5a711c5 100644 --- a/.github/duplicate_issue.md +++ b/.github/duplicate_issue.md @@ -1,7 +1,7 @@ -Duplicate of #{{ firstIssueWithTitle }} +Duplicate of #{{ chosenIssue.number }} Hi @{{ payload.sender.login }}, -This issue looks similar to #{{ firstIssueWithTitle }}. +This issue looks similar to #{{ chosenIssue.number }}. -To prevent issue tracker clutter, this issue will now be closed. If you feel this issue isn't a duplicate of #{{ firstIssueWithTitle }}, then feel free to re-open this issue. +To prevent issue tracker clutter, this issue will now be closed. If you feel this issue isn't a duplicate of #{{ chosenIssue.number }}, then feel free to post a comment on this issue stating why it's not a duplicate. Your comment will automatically re-open this issue. diff --git a/.github/no_information_provided.md b/.github/no_information_provided.md index bf826460e..7dbae946d 100644 --- a/.github/no_information_provided.md +++ b/.github/no_information_provided.md @@ -1,6 +1,6 @@ Hi @{{ payload.sender.login }}, -You've created an issue, but haven't provided any details to allow the community to assist you. To prevent issue tracker clutter, this issue will now be closed. Please provide the information needed below and then re-open the issue. +You've created an issue, but haven't provided any details to allow the community to assist you. To prevent issue tracker clutter, this issue will now be closed. Please provide the information needed below and your comment will automatically re-open this issue. Provide a description of the feature request or bug, the more details the better. If you are experiencing an issue with a tracker, a **full enhanced log must be included**. Instructions for obtaining logs are here: https://github.com/Jackett/Jackett#troubleshooting diff --git a/.github/no_response.md b/.github/no_response.md new file mode 100644 index 000000000..e5a6275ea --- /dev/null +++ b/.github/no_response.md @@ -0,0 +1,3 @@ +Hi @{{ payload.data.user.login }}, + +No response has been received for {{ days }} days. To prevent issue tracker clutter, this issue will now be closed. To re-open the issue, please provide the information requested and the issue will automatically re-open. diff --git a/.github/pull_request_readme.md b/.github/pull_request_readme.md new file mode 100644 index 000000000..4883bacb1 --- /dev/null +++ b/.github/pull_request_readme.md @@ -0,0 +1,7 @@ +Hi @{{ payload.pull_request.user.login }}, + +Thanks for your contribution to Jackett! + +If you are adding a new indexer, please ensure that you've added it to the readme as well + +A human will be along soon to review diff --git a/.gitignore b/.gitignore index c715d4dd8..690190827 100644 --- a/.gitignore +++ b/.gitignore @@ -199,3 +199,4 @@ FakesAssemblies/ /Artifacts /TestResults *.DS_Store +.idea/ diff --git a/src/Jackett.Common/Definitions/nyaa-pantsu.yml b/src/Jackett.Common/Definitions/nyaa-pantsu.yml index a82b933d9..7ee617767 100644 --- a/src/Jackett.Common/Definitions/nyaa-pantsu.yml +++ b/src/Jackett.Common/Definitions/nyaa-pantsu.yml @@ -113,3 +113,7 @@ filters: - name: replace args: ["Unknown", "0"] + downloadvolumefactor: + text: "0" + uploadvolumefactor: + text: "1" diff --git a/src/Jackett.Common/Definitions/nyaasi.yml b/src/Jackett.Common/Definitions/nyaasi.yml index 2486c9145..7e8f7815a 100644 --- a/src/Jackett.Common/Definitions/nyaasi.yml +++ b/src/Jackett.Common/Definitions/nyaasi.yml @@ -122,3 +122,7 @@ selector: td:nth-child(7) grabs: selector: td:nth-child(8) + downloadvolumefactor: + text: "0" + uploadvolumefactor: + text: "1" diff --git a/src/Jackett.Common/Definitions/sukebei-pantsu.yml b/src/Jackett.Common/Definitions/sukebei-pantsu.yml index c38526247..560e773e5 100644 --- a/src/Jackett.Common/Definitions/sukebei-pantsu.yml +++ b/src/Jackett.Common/Definitions/sukebei-pantsu.yml @@ -99,3 +99,7 @@ filters: - name: replace args: ["Unknown", "0"] + downloadvolumefactor: + text: "0" + uploadvolumefactor: + text: "1" diff --git a/src/Jackett.Common/Definitions/sukebeinyaasi.yml b/src/Jackett.Common/Definitions/sukebeinyaasi.yml index eb5a6dade..c8e0e3c28 100644 --- a/src/Jackett.Common/Definitions/sukebeinyaasi.yml +++ b/src/Jackett.Common/Definitions/sukebeinyaasi.yml @@ -92,3 +92,7 @@ selector: td:nth-child(7) grabs: selector: td:nth-child(8) + downloadvolumefactor: + text: "0" + uploadvolumefactor: + text: "1" diff --git a/src/Jackett.Common/Indexers/TorrentLeech.cs b/src/Jackett.Common/Indexers/TorrentLeech.cs index 9762371cf..516e563d2 100644 --- a/src/Jackett.Common/Indexers/TorrentLeech.cs +++ b/src/Jackett.Common/Indexers/TorrentLeech.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using System.Globalization; -using System.Linq; using System.Net; using System.Text; using System.Threading.Tasks; @@ -10,9 +9,9 @@ using Jackett.Common.Models; using Jackett.Common.Models.IndexerConfig; using Jackett.Common.Services.Interfaces; using Jackett.Common.Utils; +using Newtonsoft.Json; using Newtonsoft.Json.Linq; using NLog; -using Newtonsoft.Json; namespace Jackett.Common.Indexers { @@ -174,7 +173,7 @@ namespace Jackett.Common.Indexers release.Link = new Uri(SiteLink + "download/" + torrent.fid + "/" + torrent.filename); - release.PublishDate = DateTimeUtil.UnixTimestampToDateTime(ParseUtil.CoerceLong(torrent.addedTimestamp.ToString())); + release.PublishDate = DateTime.ParseExact(torrent.addedTimestamp.ToString(), "yyyy-MM-dd HH:mm:ss", CultureInfo.InvariantCulture, DateTimeStyles.AssumeLocal); release.Size = (long)torrent.size;