diff --git a/errors.go b/errors.go index f020df3..0637e8c 100644 --- a/errors.go +++ b/errors.go @@ -1,6 +1,6 @@ package main -import "git.tordarus.net/Tordarus/adverr" +import "git.milar.in/milarin/adverr" var ( ErrNoSuitableParser = adverr.NewErrTmpl("ErrNoSuitableParser", "could not parse torrent with ID %s because no suitable parser found") diff --git a/go.mod b/go.mod index 578ea0b..94c7d16 100644 --- a/go.mod +++ b/go.mod @@ -1,15 +1,14 @@ -module git.milar.in/animan/downloader +module git.milar.in/nyaanime/downloader go 1.18 require ( - git.milar.in/animan/model v0.0.0-20220815125824-0716848c4a4d - git.milar.in/animan/parsers v0.0.0-20220815122943-517518dd3064 git.milar.in/milarin/adverr v0.2.1 git.milar.in/milarin/anilist v1.5.0 git.milar.in/milarin/channel v0.0.7 git.milar.in/milarin/envvars v1.0.3 - git.tordarus.net/Tordarus/adverr v0.2.0 + git.milar.in/nyaanime/model v0.0.0-20220815143950-c3d8a5af20c3 + git.milar.in/nyaanime/parsers v0.0.0-20220815144327-52de61265e27 github.com/PuerkitoBio/goquery v1.8.0 golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e ) diff --git a/go.sum b/go.sum index 7433d90..f9e6e59 100644 --- a/go.sum +++ b/go.sum @@ -1,58 +1,21 @@ -git.milar.in/animan/model v0.0.0-20220803215306-905563410463 h1:M7Xxqbv7WQ3xwW66APwI7KQ8wD8IN/v6ZZbq1JB1T2M= -git.milar.in/animan/model v0.0.0-20220803215306-905563410463/go.mod h1:FmgisUVGJd8EEvGP4uk9pEv6Ic9aiEhAy5eZF8zZsgU= -git.milar.in/animan/model v0.0.0-20220803222302-20b8d45495c4 h1:dh98Tu+uSh02ivBsGKPq6klzPTWP4oHieUPYpMHxxtQ= -git.milar.in/animan/model v0.0.0-20220803222302-20b8d45495c4/go.mod h1:FmgisUVGJd8EEvGP4uk9pEv6Ic9aiEhAy5eZF8zZsgU= -git.milar.in/animan/model v0.0.0-20220804134914-691506ccc5f0 h1:Q3Co0PrCAmPGtBSW/p8j4xns8i7bs8yIxnwqiajfN7Y= -git.milar.in/animan/model v0.0.0-20220804134914-691506ccc5f0/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220804144536-96f16f9e0584 h1:T7xYzMtu15ZzFM9ERhuN+5V2ZMFBGalb+2/13ShXtOY= -git.milar.in/animan/model v0.0.0-20220804144536-96f16f9e0584/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220804154959-f8b66e8c9eda h1:9XG7Dn+UtyLwwNcuol10EdHcBQjYD+1WzmnJbRUJQfs= -git.milar.in/animan/model v0.0.0-20220804154959-f8b66e8c9eda/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220804163811-82537cb1f6e4 h1:fdtvkK2LJ9O3bP20wcqsL8gpOFr5nLoCn+Qb+SbyilU= -git.milar.in/animan/model v0.0.0-20220804163811-82537cb1f6e4/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815093549-fe9b565a9dd2 h1:vNbYNp8VJQ6FBENgZMHA1IFOfPkQEA+TIaN8PFF8m48= -git.milar.in/animan/model v0.0.0-20220815093549-fe9b565a9dd2/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815103315-0378bec21c68 h1:UiX2wucO/SkWHCuaxFGr7hw5yqhjR8LYk5gxesRDFec= -git.milar.in/animan/model v0.0.0-20220815103315-0378bec21c68/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815122339-9ce113fc9042 h1:rYaoxRO2rKuUm199yq/sIhRRZqe/9kXDSRbFHdWKeMM= -git.milar.in/animan/model v0.0.0-20220815122339-9ce113fc9042/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815123155-23f657024bd0 h1:lWAANKFbwvZah9HHOE851FXNHbId8tbv7OGwmH+BBrE= -git.milar.in/animan/model v0.0.0-20220815123155-23f657024bd0/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815124104-e3f2c831ee81 h1:b6xJxC2GCB0NgVV0Smh5lmhesB1qSen2bje/570P0Wk= -git.milar.in/animan/model v0.0.0-20220815124104-e3f2c831ee81/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815125235-67e9015e4253 h1:ZCz7aBf6v6pCVavPsUULsvqi84DAo9PpjafmUjfIH6w= -git.milar.in/animan/model v0.0.0-20220815125235-67e9015e4253/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815125506-350681318c43 h1:z6BId1oJWLRj4PalwtsVPG8Ezm2YYot82YFzrd3Iymk= -git.milar.in/animan/model v0.0.0-20220815125506-350681318c43/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/model v0.0.0-20220815125824-0716848c4a4d h1:oy50tLPhaLG0zKrrlQcsPbjfbgtXi7g9LK5NJt+v5qE= -git.milar.in/animan/model v0.0.0-20220815125824-0716848c4a4d/go.mod h1:oXDr3slnzXoccIrci2wotX0cWwMVuAQ9dSvmh1buE4c= -git.milar.in/animan/parsers v0.0.0-20220803220519-b516177d7cff h1:KN5IznBS1xvqrwjZNmp71FyfqkILvHgwkOreoqQ5zFk= -git.milar.in/animan/parsers v0.0.0-20220803220519-b516177d7cff/go.mod h1:2x+xW6lKKkVVG39sbJFR2B7r7WxHkbmwxyVIkj1R1h4= -git.milar.in/animan/parsers v0.0.0-20220804161341-2a3194c37eb6 h1:TNXl6LGxACimnllnoBgPEV7PpMv//+Evqte7C8K4X1M= -git.milar.in/animan/parsers v0.0.0-20220804161341-2a3194c37eb6/go.mod h1:X2VK8tKVbtA8nhzjJfRjXZycE4HMwDHnAUWQXU7/gIU= -git.milar.in/animan/parsers v0.0.0-20220815114013-d4e5e659350a h1:73ELbFmLE3ejVkiTimDzIz2n6FI1K6raMc4KRw1wJOc= -git.milar.in/animan/parsers v0.0.0-20220815114013-d4e5e659350a/go.mod h1:ffYwJnlRMtebp4wE01i+Tyz85yVasw0RSUkG38XeKdI= -git.milar.in/animan/parsers v0.0.0-20220815122943-517518dd3064 h1:1gbx3Tzrw8zb5lspRG/vzJ1KdosSOR3brP+9IoXII9g= -git.milar.in/animan/parsers v0.0.0-20220815122943-517518dd3064/go.mod h1:ffYwJnlRMtebp4wE01i+Tyz85yVasw0RSUkG38XeKdI= git.milar.in/milarin/adverr v0.2.1 h1:eyXFGC+Ui/kcNt2+NqP3HiAplwxzqeNr9DfitsUb3c4= git.milar.in/milarin/adverr v0.2.1/go.mod h1:wwfglcey4R3vqjNL/d8mbnvFJGzETRXzAEolIHZY32w= git.milar.in/milarin/anilist v1.5.0 h1:fSiAXY/topNk4ISEp2QtcG9HHKLJfMc8w05iqc+Paf0= git.milar.in/milarin/anilist v1.5.0/go.mod h1:8PTHXFMA45JpfRFIpcdrKwDHue8fbT/wwV1BuHFn6c0= git.milar.in/milarin/channel v0.0.7 h1:cVKtwgH/EE7U+XTHcoFCClJ4LR349KanzjX9xKwRcNg= git.milar.in/milarin/channel v0.0.7/go.mod h1:We83LTI8S7u7II3pD+A2ChCDWJfCkcBUCUqii9HjTtM= -git.milar.in/milarin/envvars v1.0.2 h1:FjN9qczW7u2LVzJv/hYf8a4m1MZMUkFiqvEjzHJDYgc= -git.milar.in/milarin/envvars v1.0.2/go.mod h1:rLh/HN6S254h6m2lklnImcpsy4kHFxaOjM6+Nv9GHKI= git.milar.in/milarin/envvars v1.0.3 h1:go6pYExUzPx+aLvJ5BKNkaANkBNmcrlRJ8TtWsk4uWY= git.milar.in/milarin/envvars v1.0.3/go.mod h1:rLh/HN6S254h6m2lklnImcpsy4kHFxaOjM6+Nv9GHKI= -git.tordarus.net/Tordarus/adverr v0.2.0 h1:kLYjR2/Vb2GHiSAMvAv+WPNaHR9BRphKanf8H/pCZdA= -git.tordarus.net/Tordarus/adverr v0.2.0/go.mod h1:XRf0+7nhOkIEr0gi9DUG4RvV2KaOFB0fYPDaR1KLenw= +git.milar.in/nyaanime/model v0.0.0-20220815143950-c3d8a5af20c3 h1:GyAhYs3Nl8CuzfOeLKmWwRe/Z+pEEtnWty39HfGz6iE= +git.milar.in/nyaanime/model v0.0.0-20220815143950-c3d8a5af20c3/go.mod h1:OzhQgj0b/Hf9fg8VXYxYt8ONQOvHm8xC44TmS9kQ150= +git.milar.in/nyaanime/parsers v0.0.0-20220815144327-52de61265e27 h1:0+5j9MMJQS8+Luss19hD6hvNFxcBDRal2XwSUTyq7WU= +git.milar.in/nyaanime/parsers v0.0.0-20220815144327-52de61265e27/go.mod h1:qm6fIFBFs90uz7IJ8RKgDir0K8Fa8isixGLgrtC6kgU= github.com/PuerkitoBio/goquery v1.8.0 h1:PJTF7AmFCFKk1N6V6jmKfrNH9tV5pNE6lZMkG0gta/U= github.com/PuerkitoBio/goquery v1.8.0/go.mod h1:ypIiRMtY7COPGk+I/YbZLbxsxn9g5ejnI2HSMtkjZvI= github.com/andybalholm/cascadia v1.3.1 h1:nhxRkql1kdYCc8Snf7D5/D3spOX+dBgjA6u8x004T2c= github.com/andybalholm/cascadia v1.3.1/go.mod h1:R4bJ1UQfqADjvDa4P6HZHLh/3OxWWEqc0Sk8XGwHqvA= golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e h1:+WEEuIdZHnUeJJmEUjyYC2gfUMj69yZXw17EnHg/otA= golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e/go.mod h1:Kr81I6Kryrl9sr8s2FK3vxD90NdsKWRuOIl2O4CvYbA= -golang.org/x/net v0.0.0-20210916014120-12bc252f5db8 h1:/6y1LfuqNuQdHAm0jjtPtgRcxIxjVZgm5OTu8/QhZvk= golang.org/x/net v0.0.0-20210916014120-12bc252f5db8/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y= golang.org/x/net v0.0.0-20220812174116-3211cb980234 h1:RDqmgfe7SvlMWoqC3xwQ2blLO3fcWcxMa3eBLRdRW7E= golang.org/x/net v0.0.0-20220812174116-3211cb980234/go.mod h1:YDH+HFinaLZZlnHAfSS6ZXJJ9M9t4Dl22yv3iI2vPwk= diff --git a/main.go b/main.go index c4e6cc5..40dc5e3 100644 --- a/main.go +++ b/main.go @@ -5,9 +5,9 @@ import ( "math" "time" - "git.milar.in/animan/model" "git.milar.in/milarin/adverr" "git.milar.in/milarin/envvars" + "git.milar.in/nyaanime/model" ) var ( diff --git a/nyaa.go b/nyaa.go index b2496c9..8ffdd18 100644 --- a/nyaa.go +++ b/nyaa.go @@ -8,7 +8,7 @@ import ( "strings" "time" - "git.milar.in/animan/model" + "git.milar.in/nyaanime/model" "github.com/PuerkitoBio/goquery" ) diff --git a/torrent_filter.go b/torrent_filter.go index 4e97b66..e0f903d 100644 --- a/torrent_filter.go +++ b/torrent_filter.go @@ -1,7 +1,7 @@ package main import ( - "git.milar.in/animan/model" + "git.milar.in/nyaanime/model" "golang.org/x/exp/slices" ) diff --git a/torrent_parse.go b/torrent_parse.go index 73e017c..f5c1d7e 100644 --- a/torrent_parse.go +++ b/torrent_parse.go @@ -4,9 +4,9 @@ import ( "errors" "fmt" - "git.milar.in/animan/model" - "git.milar.in/animan/parsers" "git.milar.in/milarin/adverr" + "git.milar.in/nyaanime/model" + "git.milar.in/nyaanime/parsers" ) func ParseTorrent(torrent *model.Torrent) (*model.ParsedTorrent, error) { diff --git a/torrent_sort.go b/torrent_sort.go index fb79c3b..7068fca 100644 --- a/torrent_sort.go +++ b/torrent_sort.go @@ -1,6 +1,6 @@ package main -import "git.milar.in/animan/model" +import "git.milar.in/nyaanime/model" func SortTorrentsByPreferredProperties(torrents map[model.AnimeEpisode][]*model.ParsedTorrent) { // TODO