From 32a2262e8c216dd28d31d25fdba035bf4d83e14e Mon Sep 17 00:00:00 2001 From: Vladimir Hodakov Date: Mon, 20 Dec 2021 16:53:38 +0400 Subject: [PATCH] Refactor and copyrights Move domains to internal/services, remove unnecessary versioning for services. Change copyright year. --- .gitignore | 1 + LICENSE | 6 ++--- cmd/massdl/massdl.go | 16 +++++------ domains/fetcher/v1/structs.go | 10 ------- go.mod | 10 ++++++- go.sum | 27 ------------------- internal/config/config.go | 4 +-- internal/context/context.go | 4 +-- internal/context/exported.go | 4 +-- .../services/fetcher}/exported.go | 6 ++--- .../services/fetcher}/fetcher.go | 2 +- .../v1 => internal/services/fetcher}/mover.go | 2 +- .../services/fetcher}/parser.go | 6 ++--- .../services/fetcher}/querier.go | 6 ++--- .../services/fetcher}/request.go | 6 ++--- internal/services/fetcher/structs.go | 10 +++++++ .../services/loginer}/checks.go | 6 ++--- .../services/loginer}/exported.go | 6 ++--- .../v1 => internal/services/loginer}/login.go | 6 ++--- 19 files changed, 60 insertions(+), 78 deletions(-) delete mode 100644 domains/fetcher/v1/structs.go rename {domains/fetcher/v1 => internal/services/fetcher}/exported.go (94%) rename {domains/fetcher/v1 => internal/services/fetcher}/fetcher.go (99%) rename {domains/fetcher/v1 => internal/services/fetcher}/mover.go (98%) rename {domains/fetcher/v1 => internal/services/fetcher}/parser.go (96%) rename {domains/fetcher/v1 => internal/services/fetcher}/querier.go (86%) rename {domains/fetcher/v1 => internal/services/fetcher}/request.go (94%) create mode 100644 internal/services/fetcher/structs.go rename {domains/loginer/v1 => internal/services/loginer}/checks.go (77%) rename {domains/loginer/v1 => internal/services/loginer}/exported.go (87%) rename {domains/loginer/v1 => internal/services/loginer}/login.go (96%) diff --git a/.gitignore b/.gitignore index 861b4f7..9517992 100644 --- a/.gitignore +++ b/.gitignore @@ -1,3 +1,4 @@ .DS_Store .env dist/ +.idea diff --git a/LICENSE b/LICENSE index 3cf06db..e3c1309 100644 --- a/LICENSE +++ b/LICENSE @@ -1,4 +1,4 @@ -Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov -All Rights Reserved. +Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov +All Rights Reserved. Unauthorized copying of this file, via any medium is strictly prohibited. -Proprietary and confidentional. +Proprietary and confidential. diff --git a/cmd/massdl/massdl.go b/cmd/massdl/massdl.go index ea612e7..ebefc87 100644 --- a/cmd/massdl/massdl.go +++ b/cmd/massdl/massdl.go @@ -1,6 +1,6 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov package main @@ -8,9 +8,9 @@ import ( "fmt" "runtime/debug" - fetcherv1 "gitlab.com/fat0troll/uploader_tools/domains/fetcher/v1" - loginerv1 "gitlab.com/fat0troll/uploader_tools/domains/loginer/v1" "gitlab.com/fat0troll/uploader_tools/internal/context" + "gitlab.com/fat0troll/uploader_tools/internal/services/fetcher" + "gitlab.com/fat0troll/uploader_tools/internal/services/loginer" ) // In production builds these variables are set by goreleaser @@ -38,11 +38,11 @@ func main() { Msg("Загрузчик торрентов из разделов NNM-Club начинает свою работу") c.InitConfig() - loginerv1.New(c) - fetcherv1.New(c) + loginer.New(c) + fetcher.New(c) c.Flagger.Parse() - loginerv1.Process() - fetcherv1.Process() + loginer.Process() + fetcher.Process() } diff --git a/domains/fetcher/v1/structs.go b/domains/fetcher/v1/structs.go deleted file mode 100644 index 32d0d39..0000000 --- a/domains/fetcher/v1/structs.go +++ /dev/null @@ -1,10 +0,0 @@ -// NNM-Club torrent filess mass downloader -// Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov - -package fetcherv1 - -type forumTopic struct { - Link string - Name string -} diff --git a/go.mod b/go.mod index 6d7b37d..49d4289 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module gitlab.com/fat0troll/uploader_tools -go 1.13 +go 1.17 require ( github.com/PuerkitoBio/goquery v1.5.0 @@ -12,3 +12,11 @@ require ( gitlab.com/pztrn/flagger v0.0.0-20190122123836-d429d7149cc9 golang.org/x/text v0.3.0 ) + +require ( + github.com/anacrolix/missinggo v1.2.1 // indirect + github.com/andybalholm/cascadia v1.0.0 // indirect + github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c // indirect + github.com/huandu/xstrings v1.0.0 // indirect + golang.org/x/net v0.0.0-20190628185345-da137c7871d7 // indirect +) diff --git a/go.sum b/go.sum index 82f3661..5a2b84a 100644 --- a/go.sum +++ b/go.sum @@ -2,7 +2,6 @@ bazil.org/fuse v0.0.0-20180421153158-65cc252bf669/go.mod h1:Xbm+BRKSBEpa4q4hTSxo github.com/PuerkitoBio/goquery v1.5.0 h1:uGvmFXOA73IKluu/F84Xd1tt/z07GYm8X49XKHP7EJk= github.com/PuerkitoBio/goquery v1.5.0/go.mod h1:qD2PgZ9lccMbQlc7eEOjaeRlFQON7xY8kdmcsrnKqMg= github.com/RoaringBitmap/roaring v0.4.7/go.mod h1:8khRDP4HmeXns4xIj9oGrKSz7XTQiJx2zgh7AcNke4w= -github.com/RoaringBitmap/roaring v0.4.18 h1:nh8Ngxctxt5QAoMLuR7MHJe4jEqpn+EnsdgDWPryQWo= github.com/RoaringBitmap/roaring v0.4.18/go.mod h1:D3qVegWTmfCaX4Bl5CrBE9hfrSrrXIr8KVNvRsDi1NI= github.com/alexflint/go-arg v1.1.0/go.mod h1:3Rj4baqzWaGGmZA2+bVTV8zQOZEjBQAPBnL5xLT+ftY= github.com/alexflint/go-scalar v1.0.0/go.mod h1:GpHzbCOZXEKMEcygYQ5n/aa4Aq84zbxjy3MxYW0gjYw= @@ -14,10 +13,8 @@ github.com/anacrolix/envpprof v0.0.0-20180404065416-323002cec2fa/go.mod h1:KgHhU github.com/anacrolix/envpprof v1.0.0/go.mod h1:KgHhUaQMc8cC0+cEflSgCFNFbKwi5h54gqtVn8yhP7c= github.com/anacrolix/envpprof v1.0.1/go.mod h1:My7T5oSqVfEn4MD4Meczkw/f5lSIndGAKu/0SM/rkf4= github.com/anacrolix/go-libutp v0.0.0-20180522111405-6baeb806518d/go.mod h1:beQSaSxwH2d9Eeu5ijrEnHei5Qhk+J6cDm1QkWFru4E= -github.com/anacrolix/go-libutp v1.0.2 h1:cL2SfTCO418V+DQRdMEW+RNfO2InLqW6PsSLqHwmGR4= github.com/anacrolix/go-libutp v1.0.2/go.mod h1:uIH0A72V++j0D1nnmTjjZUiH/ujPkFxYWkxQ02+7S0U= github.com/anacrolix/log v0.0.0-20180412014343-2323884b361d/go.mod h1:sf/7c2aTldL6sRQj/4UKyjgVZBu2+M2z9wf7MmwPiew= -github.com/anacrolix/log v0.3.0 h1:Btxh7GkT4JYWvWJ1uKOwgobf+7q/1eFQaDdCUXCtssw= github.com/anacrolix/log v0.3.0/go.mod h1:lWvLTqzAnCWPJA08T2HCstZi0L1y2Wyvm3FJgwU9jwU= github.com/anacrolix/missinggo v0.0.0-20180522035225-b4a5853e62ff/go.mod h1:b0p+7cn+rWMIphK1gDH2hrDuwGOcbB6V4VXeSsEfHVk= github.com/anacrolix/missinggo v0.0.0-20180725070939-60ef2fbf63df/go.mod h1:kwGiTUTZ0+p4vAz3VbAI5a30t2YbvemcmspjKwrAz5s= @@ -25,14 +22,11 @@ github.com/anacrolix/missinggo v0.2.1-0.20190310234110-9fbdc9f242a8/go.mod h1:MB github.com/anacrolix/missinggo v1.1.2-0.20190815015349-b888af804467/go.mod h1:MBJu3Sk/k3ZfGYcS7z18gwfu72Ey/xopPFJJbTi5yIo= github.com/anacrolix/missinggo v1.2.1 h1:0IE3TqX5y5D0IxeMwTyIgqdDew4QrzcXaaEnJQyjHvw= github.com/anacrolix/missinggo v1.2.1/go.mod h1:J5cMhif8jPmFoC3+Uvob3OXXNIhOUikzMt+uUjeM21Y= -github.com/anacrolix/missinggo/perf v1.0.0 h1:7ZOGYziGEBytW49+KmYGTaNfnwUqP1HBsy6BqESAJVw= github.com/anacrolix/missinggo/perf v1.0.0/go.mod h1:ljAFWkBuzkO12MQclXzZrosP5urunoLS0Cbvb4V0uMQ= github.com/anacrolix/mmsg v0.0.0-20180515031531-a4a3ba1fc8bb/go.mod h1:x2/ErsYUmT77kezS63+wzZp8E3byYB0gzirM/WMBLfw= -github.com/anacrolix/mmsg v1.0.0 h1:btC7YLjOn29aTUAExJiVUhQOuf/8rhm+/nWCMAnL3Hg= github.com/anacrolix/mmsg v1.0.0/go.mod h1:x8kRaJY/dCrY9Al0PEcj1mb/uFHwP6GCJ9fLl4thEPc= github.com/anacrolix/sync v0.0.0-20171108081538-eee974e4f8c1/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w= github.com/anacrolix/sync v0.0.0-20180611022320-3c4cb11f5a01/go.mod h1:+u91KiUuf0lyILI6x3n/XrW7iFROCZCG+TjgK8nW52w= -github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778 h1:XpCDEixzXOB8yaTW/4YBzKrJdMcFI0DzpPTYNv75wzk= github.com/anacrolix/sync v0.0.0-20180808010631-44578de4e778/go.mod h1:s735Etp3joe/voe2sdaXLcqDdJSay1O0OPnM0ystjqk= github.com/anacrolix/tagflag v0.0.0-20180109131632-2146c8d41bf0/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= github.com/anacrolix/tagflag v0.0.0-20180605133421-f477c8c2f14c/go.mod h1:1m2U/K6ZT+JZG0+bdMK6qauP49QT4wE5pmhJXOKKCHw= @@ -40,18 +34,15 @@ github.com/anacrolix/tagflag v0.0.0-20180803105420-3a8ff5428f76/go.mod h1:1m2U/K github.com/anacrolix/torrent v0.0.0-20180622074351-fefeef4ee9eb/go.mod h1:3vcFVxgOASslNXHdivT8spyMRBanMCenHRpe0u5vpBs= github.com/anacrolix/torrent v1.7.1 h1:bjdseks8qJZg8W/HfzJaDskwjPSWrfu40rdgvxOn1Zo= github.com/anacrolix/torrent v1.7.1/go.mod h1:uvOcdpOjjrAq3uMP/u1Ide35f6MJ/o8kMnFG8LV3y6g= -github.com/anacrolix/upnp v0.1.1 h1:v5C+wBiku2zmwFR5B+pUfdNBL5TfPtyO+sWuw+/VEDg= github.com/anacrolix/upnp v0.1.1/go.mod h1:LXsbsp5h+WGN7YR+0A7iVXm5BL1LYryDev1zuJMWYQo= github.com/anacrolix/utp v0.0.0-20180219060659-9e0e1d1d0572/go.mod h1:MDwc+vsGEq7RMw6lr2GKOEqjWny5hO5OZXRVNaBJ2Dk= github.com/andybalholm/cascadia v1.0.0 h1:hOCXnnZ5A+3eVDX8pvgl4kofXv2ELss0bKcqRySc45o= github.com/andybalholm/cascadia v1.0.0/go.mod h1:GsXiBklL0woXo1j/WYWtSYYC4ouU9PqHO0sqidkEA4Y= -github.com/boltdb/bolt v1.3.1 h1:JQmyP4ZBrce+ZQu0dY660FMfatumYDLun9hBCUVIkF4= github.com/boltdb/bolt v1.3.1/go.mod h1:clJnj/oiGkjum5o1McbSZDSLxVThjynRyGBgiAx27Ps= github.com/bradfitz/iter v0.0.0-20140124041915-454541ec3da2/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c h1:FUUopH4brHNO2kJoNN3pV+OBEYmgraLT/KHZrMM69r0= github.com/bradfitz/iter v0.0.0-20190303215204-33e6a9893b0c/go.mod h1:PyRFw1Lt2wKX4ZVSQ2mk+PeDa1rxyObEDlApuIsUKuo= github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4= -github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8= github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= @@ -60,19 +51,15 @@ github.com/dustin/go-humanize v0.0.0-20180421182945-02af3965c54e/go.mod h1:Htrtb github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/edsrzf/mmap-go v0.0.0-20170320065105-0bce6a688712/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= -github.com/edsrzf/mmap-go v1.0.0 h1:CEBF7HpRnUCSJgGUb5h1Gm7e3VkmVDrR8lvWVLtrOFw= github.com/edsrzf/mmap-go v1.0.0/go.mod h1:YO35OhQPt3KJa3ryjFM5Bs14WD66h8eGKpfaBNrHW5M= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= github.com/glycerine/go-unsnap-stream v0.0.0-20180323001048-9f0cb55181dd/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= -github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2 h1:Ujru1hufTHVb++eG6OuNDKMxZnGIvF6o/u8q/8h2+I4= github.com/glycerine/go-unsnap-stream v0.0.0-20181221182339-f9677308dec2/go.mod h1:/20jfyN9Y5QPEAprSgKAUr+glWDY39ZiUEAYOEv5dsE= github.com/glycerine/goconvey v0.0.0-20180728074245-46e3a41ad493/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/glycerine/goconvey v0.0.0-20190315024820-982ee783a72e/go.mod h1:Ogl1Tioa0aV7gstGFO7KhffUsb9M4ydbEbbxpcEDc24= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= -github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= github.com/golang/snappy v0.0.1/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/google/btree v0.0.0-20180124185431-e89373fe6b4a/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= -github.com/google/btree v1.0.0 h1:0udJVsspx3VBr5FwtLhQQtuAsVc79tTq0ocGIPAU6qo= github.com/google/btree v1.0.0/go.mod h1:lNA+9X1NB3Zf8V7Ke586lFgjr2dZNuvo3lPJSGZ5JPQ= github.com/gopherjs/gopherjs v0.0.0-20181017120253-0766667cb4d1/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= github.com/gopherjs/gopherjs v0.0.0-20181103185306-d547d1d9531e/go.mod h1:wJfORRmW1u3UXTncJ5qlYoELFm8eSnnEO6hX4iZ3EWY= @@ -95,26 +82,21 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/mattn/go-isatty v0.0.7/go.mod h1:Iq45c/XA43vh69/j3iqttzPXn0bhXyGjM0Hdxcsrc5s= github.com/mattn/go-sqlite3 v1.7.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= -github.com/mattn/go-sqlite3 v1.10.0 h1:jbhqpg7tQe4SupckyijYiy0mJJ/pRyHvXf7JdWK860o= github.com/mattn/go-sqlite3 v1.10.0/go.mod h1:FPy6KqzDD04eiIsT53CuJW3U88zkxoIYsOqkbpncsNc= github.com/mschoch/smat v0.0.0-20160514031455-90eadee771ae/go.mod h1:qAyveg+e4CE+eKJXWVjKXM4ck2QobLqTDytGJbLLhJg= -github.com/philhofer/fwd v1.0.0 h1:UbZqGr5Y38ApvM/V/jEljVxwocdweyH+vmYvRPBnbqQ= github.com/philhofer/fwd v1.0.0/go.mod h1:gk3iGcWd9+svBvR0sR+KPcfE+RNWozjowpeBVG3ZVNU= -github.com/pkg/errors v0.8.1 h1:iURUrRGxPUNPdy5/HRSm+Yj6okJ6UtLINN0Q9M4+h3I= github.com/pkg/errors v0.8.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0= github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM= github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4= github.com/rs/xid v1.2.1/go.mod h1:+uKXf+4Djp6Md1KODXJxgGQPKngRmWyn10oCKFzNHOQ= github.com/rs/zerolog v1.15.0 h1:uPRuwkWF4J6fGsJ2R0Gn2jB1EQiav9k3S6CSdygQJXY= github.com/rs/zerolog v1.15.0/go.mod h1:xYTKnLHcpfU2225ny5qZjxnj9NvkumZYjJHlAThCjNc= -github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46 h1:GHRpF1pTW19a8tTFrMLUcfWwyC0pnifVo2ClaLq+hP8= github.com/ryszard/goskiplist v0.0.0-20150312221310-2dfbae5fcf46/go.mod h1:uAQ5PCi+MFsC7HjREoAz1BU+Mq60+05gifQSsHSDG/8= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/assertions v0.0.0-20190215210624-980c5ac6f3ac/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v0.0.0-20181108003508-044398e4856c/go.mod h1:XDJAKZRPZ1CvBcN2aX5YOUTYGHki24fSF0Iv48Ibg0s= github.com/smartystreets/goconvey v0.0.0-20190306220146-200a235640ff/go.mod h1:KSQcGKpxUMHk3nbYzs/tIBAM2iDooCn0BmttHOJEbLs= github.com/spaolacci/murmur3 v0.0.0-20180118202830-f09979ecbc72/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= -github.com/spaolacci/murmur3 v1.1.0 h1:7c1g84S4BPRrfL5Xrdp6fOJ206sU9y293DDHaoy0bLI= github.com/spaolacci/murmur3 v1.1.0/go.mod h1:JwIasOWyU6f++ZhiEuf87xNszmSA2myDM2Kzu9HwQUA= github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME= github.com/stretchr/testify v1.2.1/go.mod h1:a8OnRcib4nhh0OaRAV+Yts87kKdq0PP7pXfy6kDkUVs= @@ -124,14 +106,11 @@ github.com/stretchr/testify v1.4.0 h1:2E4SXV/wtOkTonXsotYi4li6zVWxYlZuYNCXe9XRJy github.com/stretchr/testify v1.4.0/go.mod h1:j7eGeouHqKxXV5pUuKE4zz7dFj8WfuZ+81PSLYec5m4= github.com/syncthing/syncthing v0.14.48-rc.4/go.mod h1:nw3siZwHPA6M8iSfjDCWQ402eqvEIasMQOE8nFOxy7M= github.com/tinylib/msgp v1.0.2/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= -github.com/tinylib/msgp v1.1.0 h1:9fQd+ICuRIu/ue4vxJZu6/LzxN0HwMds2nq/0cFvxHU= github.com/tinylib/msgp v1.1.0/go.mod h1:+d+yLhGm8mzTaHzB+wgMYrodPfmZrzkirds8fDWklFE= github.com/willf/bitset v1.1.3/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bitset v1.1.9/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= -github.com/willf/bitset v1.1.10 h1:NotGKqX0KwQ72NUzqrjZq5ipPNDQex9lo3WpaS8L2sc= github.com/willf/bitset v1.1.10/go.mod h1:RjeCKbqT1RxIR/KWY6phxZiaY1IyutSBfGjNPySAYV4= github.com/willf/bloom v0.0.0-20170505221640-54e3b963ee16/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8= -github.com/willf/bloom v2.0.3+incompatible h1:QDacWdqcAUI1MPOwIQZRy9kOR7yxfyEmxX8Wdm2/JPA= github.com/willf/bloom v2.0.3+incompatible/go.mod h1:MmAltL9pDMNTrvUkxdg0k0q5I0suxmuwp3KbyrZLOZ8= github.com/zenazn/goji v0.9.0/go.mod h1:7S9M489iMyHBNxwZnk9/EHS098H4/F6TATF2mIxtB1Q= gitlab.com/pztrn/flagger v0.0.0-20190122123836-d429d7149cc9 h1:qLlIZybSEr3MSCaE+cJZpT6O/1q3IsBPV7GcZJc05vs= @@ -140,26 +119,20 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/net v0.0.0-20180218175443-cbe0f9307d01/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20180524181706-dfa909b99c79/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= golang.org/x/net v0.0.0-20181114220301-adae6a3d119a/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4= -golang.org/x/net v0.0.0-20190311183353-d8887717615a h1:oWX7TPOiFAMXLq8o0ikBYfCJVlRHBcsciT5bXOrH628= golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190318221613-d196dffd7c2b/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= golang.org/x/net v0.0.0-20190628185345-da137c7871d7 h1:rTIdg5QFRR7XCaK4LCjBiPbx8j4DQRpdYMnGn/bJUEU= golang.org/x/net v0.0.0-20190628185345-da137c7871d7/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20190926025831-c00fd9afed17 h1:qPnAdmjNA41t3QBTx2mFGf/SD1IoslhYu7AmdsVzCcs= golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190222072716-a9d3bda3a223/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7 h1:LepdCS8Gf/MVejFIt8lsiexZATdoGVyp5bcyS+rYoUI= golang.org/x/sys v0.0.0-20190712062909-fae7ac547cb7/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/time v0.0.0-20180412165947-fbb02b2291d2/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= -golang.org/x/time v0.0.0-20190308202827-9d24e82272b4 h1:SvFZT6jyqRaOeXpc5h/JSfZenJ2O330aBsf7JfSUXmQ= golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ= golang.org/x/tools v0.0.0-20190425163242-31fd60d6bfdc/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q= -golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7 h1:9zdDQZ7Thm29KFXgAX/+yaf3eVbP7djjWp/dXAppNCc= golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= -gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405 h1:yhCVgyC4o1eVCa2tZl7eS0r+SDo693bJlVdllGtEeKM= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw= diff --git a/internal/config/config.go b/internal/config/config.go index 1be6010..6a60b77 100644 --- a/internal/config/config.go +++ b/internal/config/config.go @@ -1,6 +1,6 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov package config diff --git a/internal/context/context.go b/internal/context/context.go index 998e75e..8ded326 100644 --- a/internal/context/context.go +++ b/internal/context/context.go @@ -1,6 +1,6 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov package context diff --git a/internal/context/exported.go b/internal/context/exported.go index bdbe88e..a6c2660 100644 --- a/internal/context/exported.go +++ b/internal/context/exported.go @@ -1,6 +1,6 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov package context diff --git a/domains/fetcher/v1/exported.go b/internal/services/fetcher/exported.go similarity index 94% rename from domains/fetcher/v1/exported.go rename to internal/services/fetcher/exported.go index acb1875..7b2ffcb 100644 --- a/domains/fetcher/v1/exported.go +++ b/internal/services/fetcher/exported.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package fetcherv1 +package fetcher import ( "net/http" diff --git a/domains/fetcher/v1/fetcher.go b/internal/services/fetcher/fetcher.go similarity index 99% rename from domains/fetcher/v1/fetcher.go rename to internal/services/fetcher/fetcher.go index b25a66c..7c27685 100644 --- a/domains/fetcher/v1/fetcher.go +++ b/internal/services/fetcher/fetcher.go @@ -2,7 +2,7 @@ // Created for Uploaders group // Copyright (c) 2012-2020 Vladimir "fat0troll" Hodakov -package fetcherv1 +package fetcher import ( "os" diff --git a/domains/fetcher/v1/mover.go b/internal/services/fetcher/mover.go similarity index 98% rename from domains/fetcher/v1/mover.go rename to internal/services/fetcher/mover.go index bd17ef3..efc9f88 100644 --- a/domains/fetcher/v1/mover.go +++ b/internal/services/fetcher/mover.go @@ -2,7 +2,7 @@ // Created for Uploaders group // Copyright (c) 2012-2020 Vladimir "fat0troll" Hodakov -package fetcherv1 +package fetcher import ( "fmt" diff --git a/domains/fetcher/v1/parser.go b/internal/services/fetcher/parser.go similarity index 96% rename from domains/fetcher/v1/parser.go rename to internal/services/fetcher/parser.go index 562b500..1bc4710 100644 --- a/domains/fetcher/v1/parser.go +++ b/internal/services/fetcher/parser.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package fetcherv1 +package fetcher import ( "strings" diff --git a/domains/fetcher/v1/querier.go b/internal/services/fetcher/querier.go similarity index 86% rename from domains/fetcher/v1/querier.go rename to internal/services/fetcher/querier.go index 6bf1b30..7673999 100644 --- a/domains/fetcher/v1/querier.go +++ b/internal/services/fetcher/querier.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package fetcherv1 +package fetcher import ( "errors" diff --git a/domains/fetcher/v1/request.go b/internal/services/fetcher/request.go similarity index 94% rename from domains/fetcher/v1/request.go rename to internal/services/fetcher/request.go index 8bd18a4..f59b638 100644 --- a/domains/fetcher/v1/request.go +++ b/internal/services/fetcher/request.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package fetcherv1 +package fetcher import ( "io" diff --git a/internal/services/fetcher/structs.go b/internal/services/fetcher/structs.go new file mode 100644 index 0000000..c69d524 --- /dev/null +++ b/internal/services/fetcher/structs.go @@ -0,0 +1,10 @@ +// NNM-Club torrent files mass downloader +// Created for Uploaders group +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov + +package fetcher + +type forumTopic struct { + Link string + Name string +} diff --git a/domains/loginer/v1/checks.go b/internal/services/loginer/checks.go similarity index 77% rename from domains/loginer/v1/checks.go rename to internal/services/loginer/checks.go index f216762..ed6ddd9 100644 --- a/domains/loginer/v1/checks.go +++ b/internal/services/loginer/checks.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package loginerv1 +package loginer // checkConfig checks if there's some errors in config file func checkConfig() { diff --git a/domains/loginer/v1/exported.go b/internal/services/loginer/exported.go similarity index 87% rename from domains/loginer/v1/exported.go rename to internal/services/loginer/exported.go index 48e7b5b..4fdd516 100644 --- a/domains/loginer/v1/exported.go +++ b/internal/services/loginer/exported.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package loginerv1 +package loginer import ( "github.com/rs/zerolog" diff --git a/domains/loginer/v1/login.go b/internal/services/loginer/login.go similarity index 96% rename from domains/loginer/v1/login.go rename to internal/services/loginer/login.go index b6871fa..d95e4b2 100644 --- a/domains/loginer/v1/login.go +++ b/internal/services/loginer/login.go @@ -1,8 +1,8 @@ -// NNM-Club torrent filess mass downloader +// NNM-Club torrent files mass downloader // Created for Uploaders group -// Copyright (c) 2012-2019 Vladimir "fat0troll" Hodakov +// Copyright (c) 2012-2022 Vladimir "fat0troll" Hodakov -package loginerv1 +package loginer import ( "bufio"