From 0bd4570a8f158ce3099d641c160d04e1e3960f83 Mon Sep 17 00:00:00 2001 From: Xinzhao Xu Date: Thu, 13 Jan 2022 12:42:57 +0800 Subject: [PATCH] Rename annie to lux --- .github/workflows/builder.yml | 2 +- CONTRIBUTING.md | 7 +- README.md | 138 +++++++++++------------ compress.bat | 2 +- compress.sh | 2 +- downloader/downloader.go | 8 +- downloader/downloader_test.go | 2 +- downloader/utils.go | 4 +- extractors/acfun/acfun.go | 8 +- extractors/acfun/acfun_test.go | 4 +- extractors/bcy/bcy.go | 8 +- extractors/bcy/bcy_test.go | 4 +- extractors/bilibili/bilibili.go | 8 +- extractors/bilibili/bilibili_test.go | 4 +- extractors/douyin/douyin.go | 6 +- extractors/douyin/douyin_test.go | 4 +- extractors/douyu/douyu.go | 6 +- extractors/douyu/douyu_test.go | 4 +- extractors/eporner/eporner.go | 9 +- extractors/eporner/eporner_test.go | 4 +- extractors/extractors.go | 66 +++++------ extractors/facebook/facebook.go | 6 +- extractors/facebook/facebook_test.go | 4 +- extractors/geekbang/geekbang.go | 6 +- extractors/geekbang/geekbang_test.go | 4 +- extractors/haokan/haokan.go | 6 +- extractors/haokan/haokan_test.go | 4 +- extractors/hupu/hupu.go | 6 +- extractors/hupu/hupu_test.go | 4 +- extractors/instagram/instagram.go | 8 +- extractors/instagram/instagram_test.go | 4 +- extractors/iqiyi/iqiyi.go | 8 +- extractors/iqiyi/iqiyi_test.go | 4 +- extractors/mgtv/mgtv.go | 6 +- extractors/mgtv/mgtv_test.go | 4 +- extractors/miaopai/miaopai.go | 6 +- extractors/miaopai/miaopai_test.go | 4 +- extractors/netease/netease.go | 6 +- extractors/netease/netease_test.go | 4 +- extractors/pixivision/pixivision.go | 8 +- extractors/pixivision/pixivision_test.go | 4 +- extractors/pornhub/pornhub.go | 6 +- extractors/pornhub/pornhub_test.go | 4 +- extractors/qq/qq.go | 6 +- extractors/qq/qq_test.go | 4 +- extractors/streamtape/streamtape.go | 6 +- extractors/streamtape/streamtape_test.go | 6 +- extractors/tangdou/tangdou.go | 6 +- extractors/tangdou/tangdou_test.go | 4 +- extractors/tiktok/tiktok.go | 6 +- extractors/tiktok/tiktok_test.go | 4 +- extractors/tumblr/tumblr.go | 10 +- extractors/tumblr/tumblr_test.go | 4 +- extractors/twitter/twitter.go | 6 +- extractors/twitter/twitter_test.go | 4 +- extractors/udn/udn.go | 6 +- extractors/udn/udn_test.go | 4 +- extractors/universal/universal.go | 6 +- extractors/universal/universal_test.go | 4 +- extractors/vimeo/vimeo.go | 6 +- extractors/vimeo/vimeo_test.go | 4 +- extractors/weibo/weibo.go | 6 +- extractors/weibo/weibo_test.go | 4 +- extractors/xvideos/xvideos.go | 6 +- extractors/xvideos/xvideos_test.go | 4 +- extractors/yinyuetai/yinyuetai.go | 6 +- extractors/yinyuetai/yinyuetai_test.go | 4 +- extractors/youku/youku.go | 6 +- extractors/youku/youku_test.go | 4 +- extractors/youtube/youtube.go | 6 +- extractors/youtube/youtube_test.go | 4 +- go.mod | 2 +- main.go | 20 ++-- request/request.go | 2 +- static/logo.png | Bin 8856 -> 0 bytes test/utils.go | 2 +- utils/utils.go | 2 +- 77 files changed, 290 insertions(+), 300 deletions(-) delete mode 100644 static/logo.png diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index 1a6187ed0..c16fe6b8f 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -18,7 +18,7 @@ on: workflow_dispatch: env: - PRODUCT: annie + PRODUCT: lux CGO_ENABLED: 0 GO111MODULE: on diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f2c2a17d0..18a328d19 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -4,15 +4,13 @@ * [Build](#build) * [Features Requested](#features-requested) - ## Style Guide ### Code format -Annie uses [gofmt](https://golang.org/cmd/gofmt) to format the code, you must use [gofmt](https://golang.org/cmd/gofmt) to format your code before submitting. +Lux uses [gofmt](https://golang.org/cmd/gofmt) to format the code, you must use [gofmt](https://golang.org/cmd/gofmt) to format your code before submitting. ### linter We recommend using [golint](https://github.com/golang/lint) or [gometalinter](https://github.com/alecthomas/gometalinter) to check your code format. - ## Build Make sure that this folder is in `GOPATH`, then: @@ -21,6 +19,5 @@ Make sure that this folder is in `GOPATH`, then: $ go build ``` - ## Features Requested -There are several [features](https://github.com/iawia002/annie/issues?q=is%3Aissue+is%3Aopen+label%3Afeature-request) requested by the community. If you have any idea, feel free to fork the repo, follow the style guide above, push and merge it after passing the test. Besides, you are welcomed to propose new features through the issue. +There are several [features](https://github.com/iawia002/lux/issues?q=is%3Aissue+is%3Aopen+label%3Afeature-request) requested by the community. If you have any idea, feel free to fork the repo, follow the style guide above, push and merge it after passing the test. Besides, you are welcomed to propose new features through the issue. diff --git a/README.md b/README.md index a4757993c..e17673ac5 100644 --- a/README.md +++ b/README.md @@ -1,28 +1,24 @@ -

Annie

+

Lux

- - Codecov + + Codecov - - GitHub Workflow Status + + GitHub Workflow Status - - Go Report Card + + Go Report Card - - GitHub release + + GitHub release - - Homebrew - - - telegram + + Homebrew
- -👾 Annie is a fast, simple and clean video downloader built with Go. +👾 Lux is a fast and simple video downloader built with Go. - [Installation](#installation) - [Prerequisites](#prerequisites) @@ -77,42 +73,42 @@ The following dependencies are required and must be installed separately. ### Install via `go install` -To install Annie, use `go install`, or download the binary file from [Releases](https://github.com/iawia002/annie/releases) page. +To install Lux, use `go install`, or download the binary file from [Releases](https://github.com/iawia002/lux/releases) page. ```bash -$ go install github.com/iawia002/annie@latest +$ go install github.com/iawia002/lux@latest ``` ### Homebrew (macOS only) -For macOS users, you can install `annie` via: +For macOS users, you can install `lux` via: ```bash -$ brew install annie +$ brew install lux ``` ### Arch Linux -For Arch Users [AUR](https://aur.archlinux.org/packages/annie) package is available. +For Arch Users [AUR](https://aur.archlinux.org/packages/lux) package is available. ### Void Linux -For Void linux users, you can install `annie` via: +For Void linux users, you can install `lux` via: ``` -$ xbps-install -S annie +$ xbps-install -S lux ``` ### [Scoop](https://scoop.sh/) on Windows ```sh -$ scoop install annie +$ scoop install lux ``` ### [Chocolatey](https://chocolatey.org/) on Windows ``` -$ choco install annie +$ choco install lux ``` ## Getting Started @@ -120,13 +116,13 @@ $ choco install annie Usage: ``` -annie [OPTIONS] URL [URL...] +lux [OPTIONS] URL [URL...] ``` ### Download a video ```console -$ annie "https://www.youtube.com/watch?v=dQw4w9WgXcQ" +$ lux "https://www.youtube.com/watch?v=dQw4w9WgXcQ" Site: YouTube youtube.com Title: Rick Astley - Never Gonna Give You Up (Video) @@ -135,7 +131,7 @@ $ annie "https://www.youtube.com/watch?v=dQw4w9WgXcQ" [248] ------------------- Quality: 1080p video/webm; codecs="vp9" Size: 63.93 MiB (67038963 Bytes) - # download with: annie -f 248 ... + # download with: lux -f 248 ... 41.88 MiB / 63.93 MiB [=================>-------------] 65.51% 4.22 MiB/s 00m05s ``` @@ -143,7 +139,7 @@ $ annie "https://www.youtube.com/watch?v=dQw4w9WgXcQ" The `-i` option displays all available quality of video without downloading. ```console -$ annie -i "https://www.youtube.com/watch?v=dQw4w9WgXcQ" +$ lux -i "https://www.youtube.com/watch?v=dQw4w9WgXcQ" Site: YouTube youtube.com Title: Rick Astley - Never Gonna Give You Up (Video) @@ -152,39 +148,39 @@ $ annie -i "https://www.youtube.com/watch?v=dQw4w9WgXcQ" [248] ------------------- Quality: 1080p video/webm; codecs="vp9" Size: 49.29 MiB (51687554 Bytes) - # download with: annie -f 248 ... + # download with: lux -f 248 ... [137] ------------------- Quality: 1080p video/mp4; codecs="avc1.640028" Size: 43.45 MiB (45564306 Bytes) - # download with: annie -f 137 ... + # download with: lux -f 137 ... [398] ------------------- Quality: 720p video/mp4; codecs="av01.0.05M.08" Size: 37.12 MiB (38926432 Bytes) - # download with: annie -f 398 ... + # download with: lux -f 398 ... [136] ------------------- Quality: 720p video/mp4; codecs="avc1.4d401f" Size: 31.34 MiB (32867324 Bytes) - # download with: annie -f 136 ... + # download with: lux -f 136 ... [247] ------------------- Quality: 720p video/webm; codecs="vp9" Size: 31.03 MiB (32536181 Bytes) - # download with: annie -f 247 ... + # download with: lux -f 247 ... ``` -Use `annie -f stream "URL"` to download a specific stream listed in the output of `-i` option. +Use `lux -f stream "URL"` to download a specific stream listed in the output of `-i` option. ### Download anything else -If Annie is provided the URL of a specific resource, then it will be downloaded directly: +If Lux is provided the URL of a specific resource, then it will be downloaded directly: ```console -$ annie "https://img9.bcyimg.com/drawer/15294/post/1799t/1f5a87801a0711e898b12b640777720f.jpg" +$ lux "https://img9.bcyimg.com/drawer/15294/post/1799t/1f5a87801a0711e898b12b640777720f.jpg" -annie doesn't support this URL right now, but it will try to download it directly +lux doesn't support this URL right now, but it will try to download it directly Site: Universal Title: 1f5a87801a0711e898b12b640777720f @@ -192,7 +188,7 @@ annie doesn't support this URL right now, but it will try to download it directl Stream: [default] ------------------- Size: 1.00 MiB (1051042 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" 1.00 MiB / 1.00 MiB [===================================] 100.00% 1.21 MiB/s 0s ``` @@ -202,7 +198,7 @@ annie doesn't support this URL right now, but it will try to download it directl The `-p` option downloads an entire playlist instead of a single video. ```console -$ annie -i -p "https://www.bilibili.com/bangumi/play/ep198061" +$ lux -i -p "https://www.bilibili.com/bangumi/play/ep198061" Site: 哔哩哔哩 bilibili.com Title: Doctor X 第四季：第一集 @@ -211,7 +207,7 @@ $ annie -i -p "https://www.bilibili.com/bangumi/play/ep198061" [default] ------------------- Quality: 高清 1080P Size: 845.66 MiB (886738354 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" Site: 哔哩哔哩 bilibili.com @@ -221,7 +217,7 @@ $ annie -i -p "https://www.bilibili.com/bangumi/play/ep198061" [default] ------------------- Quality: 高清 1080P Size: 930.71 MiB (975919195 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" ...... ``` @@ -249,7 +245,7 @@ For bilibili playlists only: You can also download multiple URLs at once: ```console -$ annie -i "https://www.bilibili.com/video/av21877586" "https://www.bilibili.com/video/av21990740" +$ lux -i "https://www.bilibili.com/video/av21877586" "https://www.bilibili.com/video/av21990740" Site: 哔哩哔哩 bilibili.com Title: 【莓机会了】甜到虐哭的13集单集MAD「我现在什么都不想干,更不想看14集」 @@ -258,7 +254,7 @@ $ annie -i "https://www.bilibili.com/video/av21877586" "https://www.bilibili.com [default] ------------------- Quality: 高清 1080P Size: 51.88 MiB (54403767 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" Site: 哔哩哔哩 bilibili.com @@ -268,7 +264,7 @@ $ annie -i "https://www.bilibili.com/video/av21877586" "https://www.bilibili.com [default] ------------------- Quality: 高清 1080P Size: 77.63 MiB (81404093 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" ``` These URLs will be downloaded one by one. @@ -276,7 +272,7 @@ These URLs will be downloaded one by one. You can also use the `-F` option to read URLs from file: ```console -$ annie -F ~/Desktop/u.txt +$ lux -F ~/Desktop/u.txt Site: 微博 weibo.com Title: 在Google，我们设计什么？ via@阑夕 @@ -284,7 +280,7 @@ $ annie -F ~/Desktop/u.txt Stream: [default] ------------------- Size: 19.19 MiB (20118196 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" 19.19 MiB / 19.19 MiB [=================================] 100.00% 9.69 MiB/s 1s @@ -306,15 +302,15 @@ You can use the `-start`, `-end` or `-items` option to specify the download rang Ctrl+C interrupts a download. -A temporary `.download` file is kept in the output directory. If `annie` is ran with the same arguments, then the download progress will resume from the last session. +A temporary `.download` file is kept in the output directory. If `lux` is ran with the same arguments, then the download progress will resume from the last session. ### Auto retry -annie will auto retry when the download failed, you can specify the retry times by `-retry` option (default is 100). +lux will auto retry when the download failed, you can specify the retry times by `-retry` option (default is 100). ### Cookies -Cookies can be provided to `annie` with the `-c` option if they are required for accessing the video. +Cookies can be provided to `lux` with the `-c` option if they are required for accessing the video. Cookies can be the following format or [Netscape Cookie](https://curl.haxx.se/rfc/cookie_spec.html) format: @@ -327,28 +323,28 @@ Cookies can be a string or a text file, supply cookies in one of the two followi As a string: ```console -$ annie -c "name=value; name2=value2" "https://www.bilibili.com/video/av20203945" +$ lux -c "name=value; name2=value2" "https://www.bilibili.com/video/av20203945" ``` As a text file: ```console -$ annie -c cookies.txt "https://www.bilibili.com/video/av20203945" +$ lux -c cookies.txt "https://www.bilibili.com/video/av20203945" ``` -If the `-c` is not set, `annie` will try to get the cookies from the current user's Chrome or Edge automatically. -To use this feature, you need to shutdown your Chrome or Edge for only one time and let `annie` launch the browser for you. +If the `-c` is not set, `lux` will try to get the cookies from the current user's Chrome or Edge automatically. +To use this feature, you need to shutdown your Chrome or Edge for only one time and let `lux` launch the browser for you. ### Proxy You can set the HTTP/SOCKS5 proxy using environment variables: ```console -$ HTTP_PROXY="http://127.0.0.1:1087/" annie -i "https://www.youtube.com/watch?v=Gnbch2osEeo" +$ HTTP_PROXY="http://127.0.0.1:1087/" lux -i "https://www.youtube.com/watch?v=Gnbch2osEeo" ``` ```console -$ HTTP_PROXY="socks5://127.0.0.1:1080/" annie -i "https://www.youtube.com/watch?v=Gnbch2osEeo" +$ HTTP_PROXY="socks5://127.0.0.1:1080/" lux -i "https://www.youtube.com/watch?v=Gnbch2osEeo" ``` ### Multi-Thread @@ -363,7 +359,7 @@ Use `-n` option to set the number of download threads(default is 10, only works You can just use `av` or `ep` number to download bilibili's video: ```console -$ annie -i ep198381 av21877586 +$ lux -i ep198381 av21877586 Site: 哔哩哔哩 bilibili.com Title: 狐妖小红娘：第79话 南国公主的吃货本色 @@ -372,7 +368,7 @@ $ annie -i ep198381 av21877586 [default] ------------------- Quality: 高清 1080P Size: 485.23 MiB (508798478 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" Site: 哔哩哔哩 bilibili.com @@ -382,7 +378,7 @@ $ annie -i ep198381 av21877586 [default] ------------------- Quality: 高清 1080P Size: 51.88 MiB (54403767 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" ``` ### Use specified Referrer @@ -391,7 +387,7 @@ A Referrer can be used for the request with the `-r` option: ```console -$ annie -r "https://www.bilibili.com/video/av20383055/" "http://cn-scnc1-dx.acgvideo.com/" +$ lux -r "https://www.bilibili.com/video/av20383055/" "http://cn-scnc1-dx.acgvideo.com/" ``` ### Specify the output path and name @@ -399,7 +395,7 @@ $ annie -r "https://www.bilibili.com/video/av20383055/" "http://cn-scnc1-dx.acgv The `-o` option sets the path, and `-O` option sets the name of the downloaded file: ```console -$ annie -o ../ -O "hello" "https://example.com" +$ lux -o ../ -O "hello" "https://example.com" ``` ### Debug Mode @@ -407,7 +403,7 @@ $ annie -o ../ -O "hello" "https://example.com" The `-d` option outputs network request messages: ```console -$ annie -i -d "http://www.bilibili.com/video/av20088587" +$ lux -i -d "http://www.bilibili.com/video/av20088587" URL: http://www.bilibili.com/video/av20088587 Method: GET @@ -440,7 +436,7 @@ Status Code: 200 [default] ------------------- Quality: 高清 1080P Size: 64.38 MiB (67504795 Bytes) - # download with: annie -f default "URL" + # download with: lux -f default "URL" ``` ### Reuse extracted data @@ -448,7 +444,7 @@ Status Code: 200 The `-j` option will print the extracted data in JSON format. ```console -$ annie -j "https://www.bilibili.com/video/av20203945" +$ lux -j "https://www.bilibili.com/video/av20203945" { "site": "哔哩哔哩 bilibili.com", @@ -631,26 +627,22 @@ $ annie -j "https://www.bilibili.com/video/av20203945" ### 优酷 -优酷的 `ccode` 经常变化导致 annie 不可用，如果你知道有新的可用的 `ccode`，可以直接使用 `annie -ccode ...` 而不用等待 annie 更新（当然，也欢迎你给我们提一个 Pull request 来更新默认的 `ccode`） +优酷的 `ccode` 经常变化导致 lux 不可用，如果你知道有新的可用的 `ccode`，可以直接使用 `lux -ccode ...` 而不用等待 lux 更新（当然，也欢迎你给我们提一个 Pull request 来更新默认的 `ccode`） 最好是每次下载都附带登录过的 Cookie 以避免部分 `ccode` 的问题 ## Contributing -Annie is an open source project and built on the top of open-source projects. If you are interested, then you are welcome to contribute. Let's make Annie better, together. 💪 - -Check out the [Contributing Guide](./CONTRIBUTING.md) to get started. - -Special thanks to [@Yasujizr](https://github.com/Yasujizr) who designed the amazing logo! +Lux is an open source project and built on the top of open-source projects. Check out the [Contributing Guide](./CONTRIBUTING.md) to get started. -Thanks for [JetBrains](https://www.jetbrains.com/?from=annie) for the wonderful IDE. +Thanks for [JetBrains](https://www.jetbrains.com/?from=lux) for the wonderful IDE. - + ## Authors -Code with ❤️ by [iawia002](https://github.com/iawia002) and lovely [contributors](https://github.com/iawia002/annie/graphs/contributors) +Code with ❤️ by [iawia002](https://github.com/iawia002) and lovely [contributors](https://github.com/iawia002/lux/graphs/contributors) ## Similar projects diff --git a/compress.bat b/compress.bat index ea98f300c..6c8727d4c 100644 --- a/compress.bat +++ b/compress.bat @@ -1,2 +1,2 @@ :: Please install upx first, https://github.com/upx/upx/releases -for /f "delims=" %%i in ('dir /b /a-d /s "annie*"') do upx --best "%%i" +for /f "delims=" %%i in ('dir /b /a-d /s "lux*"') do upx --best "%%i" diff --git a/compress.sh b/compress.sh index 47a79a2bc..381329eb6 100755 --- a/compress.sh +++ b/compress.sh @@ -1,3 +1,3 @@ #!/bin/sh # Please install upx first, https://github.com/upx/upx/releases -find ./ -xdev -maxdepth 1 -type f -iname 'annie*' -executable -exec upx --best --brute --ultra-brute {} \; +find ./ -xdev -maxdepth 1 -type f -iname 'lux*' -executable -exec upx --best --brute --ultra-brute {} \; diff --git a/downloader/downloader.go b/downloader/downloader.go index d86bc8427..069f56861 100644 --- a/downloader/downloader.go +++ b/downloader/downloader.go @@ -17,9 +17,9 @@ import ( "github.com/cheggaaa/pb/v3" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) // Options defines options used in downloading. @@ -497,7 +497,7 @@ func mergeMultiPart(filepath string, parts []*FilePartMeta) error { func (downloader *Downloader) aria2(title string, stream *types.Stream) error { rpcData := Aria2RPCData{ JSONRPC: "2.0", - ID: "annie", // can be modified + ID: "lux", // can be modified Method: "aria2.addUri", } rpcData.Params[0] = "token:" + downloader.option.Aria2Token diff --git a/downloader/downloader_test.go b/downloader/downloader_test.go index c8dd371e8..98e962a95 100644 --- a/downloader/downloader_test.go +++ b/downloader/downloader_test.go @@ -3,7 +3,7 @@ package downloader import ( "testing" - "github.com/iawia002/annie/extractors/types" + "github.com/iawia002/lux/extractors/types" ) func TestDownload(t *testing.T) { diff --git a/downloader/utils.go b/downloader/utils.go index fba9ea58c..3f5b39f5a 100644 --- a/downloader/utils.go +++ b/downloader/utils.go @@ -6,7 +6,7 @@ import ( "github.com/fatih/color" - "github.com/iawia002/annie/extractors/types" + "github.com/iawia002/lux/extractors/types" ) var ( @@ -46,7 +46,7 @@ func printStream(stream *types.Stream) { cyan.Printf(" Size: ") // nolint fmt.Printf("%.2f MiB (%d Bytes)\n", float64(stream.Size)/(1024*1024), stream.Size) cyan.Printf(" # download with: ") // nolint - fmt.Printf("annie -f %s ...\n\n", stream.ID) + fmt.Printf("lux -f %s ...\n\n", stream.ID) } func printInfo(data *types.Data, sortedStreams []*types.Stream) { diff --git a/extractors/acfun/acfun.go b/extractors/acfun/acfun.go index acb3d12bc..5a2a83ffb 100644 --- a/extractors/acfun/acfun.go +++ b/extractors/acfun/acfun.go @@ -7,10 +7,10 @@ import ( jsoniter "github.com/json-iterator/go" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const ( diff --git a/extractors/acfun/acfun_test.go b/extractors/acfun/acfun_test.go index cdae19c00..b4f66aa7b 100644 --- a/extractors/acfun/acfun_test.go +++ b/extractors/acfun/acfun_test.go @@ -3,8 +3,8 @@ package acfun import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/bcy/bcy.go b/extractors/bcy/bcy.go index 442839d96..4f808597f 100644 --- a/extractors/bcy/bcy.go +++ b/extractors/bcy/bcy.go @@ -5,10 +5,10 @@ import ( "fmt" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type bcyData struct { diff --git a/extractors/bcy/bcy_test.go b/extractors/bcy/bcy_test.go index fd021d58c..e605450c3 100644 --- a/extractors/bcy/bcy_test.go +++ b/extractors/bcy/bcy_test.go @@ -3,8 +3,8 @@ package bcy import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/bilibili/bilibili.go b/extractors/bilibili/bilibili.go index 4de7cfc83..cd8439b18 100644 --- a/extractors/bilibili/bilibili.go +++ b/extractors/bilibili/bilibili.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const ( diff --git a/extractors/bilibili/bilibili_test.go b/extractors/bilibili/bilibili_test.go index 12fe09c28..b285ef024 100644 --- a/extractors/bilibili/bilibili_test.go +++ b/extractors/bilibili/bilibili_test.go @@ -3,8 +3,8 @@ package bilibili import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestBilibili(t *testing.T) { diff --git a/extractors/douyin/douyin.go b/extractors/douyin/douyin.go index 3e14978b4..6e547c644 100644 --- a/extractors/douyin/douyin.go +++ b/extractors/douyin/douyin.go @@ -6,9 +6,9 @@ import ( "net/http" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/douyin/douyin_test.go b/extractors/douyin/douyin_test.go index d743c0150..7079db69f 100644 --- a/extractors/douyin/douyin_test.go +++ b/extractors/douyin/douyin_test.go @@ -3,8 +3,8 @@ package douyin import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/douyu/douyu.go b/extractors/douyu/douyu.go index 7a7050e0e..34e14e0c8 100644 --- a/extractors/douyu/douyu.go +++ b/extractors/douyu/douyu.go @@ -4,9 +4,9 @@ import ( "encoding/json" "errors" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type douyuData struct { diff --git a/extractors/douyu/douyu_test.go b/extractors/douyu/douyu_test.go index 1d5190f96..fc08084dd 100644 --- a/extractors/douyu/douyu_test.go +++ b/extractors/douyu/douyu_test.go @@ -3,8 +3,8 @@ package douyu import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/eporner/eporner.go b/extractors/eporner/eporner.go index ac9a5bdaa..d1ff23d97 100644 --- a/extractors/eporner/eporner.go +++ b/extractors/eporner/eporner.go @@ -6,10 +6,11 @@ import ( "strings" "github.com/PuerkitoBio/goquery" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const ( diff --git a/extractors/eporner/eporner_test.go b/extractors/eporner/eporner_test.go index 891e65b5c..77f12edb4 100644 --- a/extractors/eporner/eporner_test.go +++ b/extractors/eporner/eporner_test.go @@ -3,8 +3,8 @@ package eporner import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/extractors.go b/extractors/extractors.go index e65c4109b..20b41827f 100644 --- a/extractors/extractors.go +++ b/extractors/extractors.go @@ -4,39 +4,39 @@ import ( "net/url" "strings" - "github.com/iawia002/annie/extractors/acfun" - "github.com/iawia002/annie/extractors/bcy" - "github.com/iawia002/annie/extractors/bilibili" - "github.com/iawia002/annie/extractors/douyin" - "github.com/iawia002/annie/extractors/douyu" - "github.com/iawia002/annie/extractors/eporner" - "github.com/iawia002/annie/extractors/facebook" - "github.com/iawia002/annie/extractors/geekbang" - "github.com/iawia002/annie/extractors/haokan" - "github.com/iawia002/annie/extractors/hupu" - "github.com/iawia002/annie/extractors/instagram" - "github.com/iawia002/annie/extractors/iqiyi" - "github.com/iawia002/annie/extractors/mgtv" - "github.com/iawia002/annie/extractors/miaopai" - "github.com/iawia002/annie/extractors/netease" - "github.com/iawia002/annie/extractors/pixivision" - "github.com/iawia002/annie/extractors/pornhub" - "github.com/iawia002/annie/extractors/qq" - "github.com/iawia002/annie/extractors/streamtape" - "github.com/iawia002/annie/extractors/tangdou" - "github.com/iawia002/annie/extractors/tiktok" - "github.com/iawia002/annie/extractors/tumblr" - "github.com/iawia002/annie/extractors/twitter" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/extractors/udn" - "github.com/iawia002/annie/extractors/universal" - "github.com/iawia002/annie/extractors/vimeo" - "github.com/iawia002/annie/extractors/weibo" - "github.com/iawia002/annie/extractors/xvideos" - "github.com/iawia002/annie/extractors/yinyuetai" - "github.com/iawia002/annie/extractors/youku" - "github.com/iawia002/annie/extractors/youtube" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/acfun" + "github.com/iawia002/lux/extractors/bcy" + "github.com/iawia002/lux/extractors/bilibili" + "github.com/iawia002/lux/extractors/douyin" + "github.com/iawia002/lux/extractors/douyu" + "github.com/iawia002/lux/extractors/eporner" + "github.com/iawia002/lux/extractors/facebook" + "github.com/iawia002/lux/extractors/geekbang" + "github.com/iawia002/lux/extractors/haokan" + "github.com/iawia002/lux/extractors/hupu" + "github.com/iawia002/lux/extractors/instagram" + "github.com/iawia002/lux/extractors/iqiyi" + "github.com/iawia002/lux/extractors/mgtv" + "github.com/iawia002/lux/extractors/miaopai" + "github.com/iawia002/lux/extractors/netease" + "github.com/iawia002/lux/extractors/pixivision" + "github.com/iawia002/lux/extractors/pornhub" + "github.com/iawia002/lux/extractors/qq" + "github.com/iawia002/lux/extractors/streamtape" + "github.com/iawia002/lux/extractors/tangdou" + "github.com/iawia002/lux/extractors/tiktok" + "github.com/iawia002/lux/extractors/tumblr" + "github.com/iawia002/lux/extractors/twitter" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/extractors/udn" + "github.com/iawia002/lux/extractors/universal" + "github.com/iawia002/lux/extractors/vimeo" + "github.com/iawia002/lux/extractors/weibo" + "github.com/iawia002/lux/extractors/xvideos" + "github.com/iawia002/lux/extractors/yinyuetai" + "github.com/iawia002/lux/extractors/youku" + "github.com/iawia002/lux/extractors/youtube" + "github.com/iawia002/lux/utils" ) var extractorMap map[string]types.Extractor diff --git a/extractors/facebook/facebook.go b/extractors/facebook/facebook.go index 74d610745..7005596eb 100644 --- a/extractors/facebook/facebook.go +++ b/extractors/facebook/facebook.go @@ -3,9 +3,9 @@ package facebook import ( "fmt" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/facebook/facebook_test.go b/extractors/facebook/facebook_test.go index 44ec5a03c..19dd6482e 100644 --- a/extractors/facebook/facebook_test.go +++ b/extractors/facebook/facebook_test.go @@ -3,8 +3,8 @@ package facebook import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/geekbang/geekbang.go b/extractors/geekbang/geekbang.go index 8cede90e7..caa5af18d 100644 --- a/extractors/geekbang/geekbang.go +++ b/extractors/geekbang/geekbang.go @@ -7,9 +7,9 @@ import ( "net/http" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type geekData struct { diff --git a/extractors/geekbang/geekbang_test.go b/extractors/geekbang/geekbang_test.go index cc5dd01f2..729e1153d 100644 --- a/extractors/geekbang/geekbang_test.go +++ b/extractors/geekbang/geekbang_test.go @@ -3,8 +3,8 @@ package geekbang import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/haokan/haokan.go b/extractors/haokan/haokan.go index b16332dcc..f250ca5b3 100644 --- a/extractors/haokan/haokan.go +++ b/extractors/haokan/haokan.go @@ -3,9 +3,9 @@ package haokan import ( "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/haokan/haokan_test.go b/extractors/haokan/haokan_test.go index 7dc238e00..c6c40b158 100644 --- a/extractors/haokan/haokan_test.go +++ b/extractors/haokan/haokan_test.go @@ -3,8 +3,8 @@ package haokan import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/hupu/hupu.go b/extractors/hupu/hupu.go index 4d3edab14..ce3a8ae74 100644 --- a/extractors/hupu/hupu.go +++ b/extractors/hupu/hupu.go @@ -1,9 +1,9 @@ package hupu import ( - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/hupu/hupu_test.go b/extractors/hupu/hupu_test.go index 470b66c36..b494c10de 100644 --- a/extractors/hupu/hupu_test.go +++ b/extractors/hupu/hupu_test.go @@ -3,8 +3,8 @@ package hupu import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestHupu(t *testing.T) { diff --git a/extractors/instagram/instagram.go b/extractors/instagram/instagram.go index 7927e9fcb..9172bb909 100644 --- a/extractors/instagram/instagram.go +++ b/extractors/instagram/instagram.go @@ -6,10 +6,10 @@ import ( "path" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type instagram struct { diff --git a/extractors/instagram/instagram_test.go b/extractors/instagram/instagram_test.go index 006dd7261..a068c3a00 100644 --- a/extractors/instagram/instagram_test.go +++ b/extractors/instagram/instagram_test.go @@ -3,8 +3,8 @@ package instagram import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/iqiyi/iqiyi.go b/extractors/iqiyi/iqiyi.go index a572a6732..a283ba915 100644 --- a/extractors/iqiyi/iqiyi.go +++ b/extractors/iqiyi/iqiyi.go @@ -8,10 +8,10 @@ import ( "strings" "time" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type iqiyi struct { diff --git a/extractors/iqiyi/iqiyi_test.go b/extractors/iqiyi/iqiyi_test.go index 41a5db767..f234be757 100644 --- a/extractors/iqiyi/iqiyi_test.go +++ b/extractors/iqiyi/iqiyi_test.go @@ -3,8 +3,8 @@ package iqiyi import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/mgtv/mgtv.go b/extractors/mgtv/mgtv.go index b99db07ef..0e7d30462 100644 --- a/extractors/mgtv/mgtv.go +++ b/extractors/mgtv/mgtv.go @@ -9,9 +9,9 @@ import ( "strings" "time" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type mgtvVideoStream struct { diff --git a/extractors/mgtv/mgtv_test.go b/extractors/mgtv/mgtv_test.go index 566a81c40..743f2c437 100644 --- a/extractors/mgtv/mgtv_test.go +++ b/extractors/mgtv/mgtv_test.go @@ -3,8 +3,8 @@ package mgtv import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/miaopai/miaopai.go b/extractors/miaopai/miaopai.go index ef2cf4551..aa988435d 100644 --- a/extractors/miaopai/miaopai.go +++ b/extractors/miaopai/miaopai.go @@ -8,9 +8,9 @@ import ( "strings" "time" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type miaopaiData struct { diff --git a/extractors/miaopai/miaopai_test.go b/extractors/miaopai/miaopai_test.go index 841381d55..1918e1cdc 100644 --- a/extractors/miaopai/miaopai_test.go +++ b/extractors/miaopai/miaopai_test.go @@ -3,8 +3,8 @@ package miaopai import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/netease/netease.go b/extractors/netease/netease.go index 085127cc6..2cfd42391 100644 --- a/extractors/netease/netease.go +++ b/extractors/netease/netease.go @@ -5,9 +5,9 @@ import ( netURL "net/url" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/netease/netease_test.go b/extractors/netease/netease_test.go index c897bc43f..442e8d2eb 100644 --- a/extractors/netease/netease_test.go +++ b/extractors/netease/netease_test.go @@ -3,8 +3,8 @@ package netease import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/pixivision/pixivision.go b/extractors/pixivision/pixivision.go index 9edfcb176..451585758 100644 --- a/extractors/pixivision/pixivision.go +++ b/extractors/pixivision/pixivision.go @@ -1,10 +1,10 @@ package pixivision import ( - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/pixivision/pixivision_test.go b/extractors/pixivision/pixivision_test.go index 0ead03047..2530d8cca 100644 --- a/extractors/pixivision/pixivision_test.go +++ b/extractors/pixivision/pixivision_test.go @@ -3,8 +3,8 @@ package pixivision import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/pornhub/pornhub.go b/extractors/pornhub/pornhub.go index 91f81e8bd..6cb574300 100644 --- a/extractors/pornhub/pornhub.go +++ b/extractors/pornhub/pornhub.go @@ -5,9 +5,9 @@ import ( "encoding/json" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type pornhubData struct { diff --git a/extractors/pornhub/pornhub_test.go b/extractors/pornhub/pornhub_test.go index 1798c487f..6b5d5959e 100644 --- a/extractors/pornhub/pornhub_test.go +++ b/extractors/pornhub/pornhub_test.go @@ -3,8 +3,8 @@ package pornhub import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestPornhub(t *testing.T) { diff --git a/extractors/qq/qq.go b/extractors/qq/qq.go index 10e7cf63b..b80043e74 100644 --- a/extractors/qq/qq.go +++ b/extractors/qq/qq.go @@ -7,9 +7,9 @@ import ( "strconv" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type qqVideoInfo struct { diff --git a/extractors/qq/qq_test.go b/extractors/qq/qq_test.go index b785049e8..40c2e543c 100644 --- a/extractors/qq/qq_test.go +++ b/extractors/qq/qq_test.go @@ -3,8 +3,8 @@ package qq import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/streamtape/streamtape.go b/extractors/streamtape/streamtape.go index 941e09891..f234e57c1 100644 --- a/extractors/streamtape/streamtape.go +++ b/extractors/streamtape/streamtape.go @@ -4,9 +4,9 @@ import ( "regexp" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const prefix = "document.getElementById('robotlink').innerHTML = '" diff --git a/extractors/streamtape/streamtape_test.go b/extractors/streamtape/streamtape_test.go index d74ce18c3..3884e6bd8 100644 --- a/extractors/streamtape/streamtape_test.go +++ b/extractors/streamtape/streamtape_test.go @@ -3,8 +3,8 @@ package streamtape import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestStreamtape(t *testing.T) { @@ -16,7 +16,7 @@ func TestStreamtape(t *testing.T) { name: "normal test", args: test.Args{ URL: "https://streamtape.com/e/vkoKlwYPo9F4mRo", - Title: "annie.mp4", + Title: "lux.mp4", }, }, } diff --git a/extractors/tangdou/tangdou.go b/extractors/tangdou/tangdou.go index 46e08d374..4221f83b2 100644 --- a/extractors/tangdou/tangdou.go +++ b/extractors/tangdou/tangdou.go @@ -1,9 +1,9 @@ package tangdou import ( - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const referer = "http://www.tangdou.com/html/playlist/view/4173" diff --git a/extractors/tangdou/tangdou_test.go b/extractors/tangdou/tangdou_test.go index 67e8dcbdc..009705d94 100644 --- a/extractors/tangdou/tangdou_test.go +++ b/extractors/tangdou/tangdou_test.go @@ -3,8 +3,8 @@ package tangdou import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestTangDou(t *testing.T) { diff --git a/extractors/tiktok/tiktok.go b/extractors/tiktok/tiktok.go index eded62744..759b0dc78 100644 --- a/extractors/tiktok/tiktok.go +++ b/extractors/tiktok/tiktok.go @@ -1,9 +1,9 @@ package tiktok import ( - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/tiktok/tiktok_test.go b/extractors/tiktok/tiktok_test.go index f3fc967e7..dae87760c 100644 --- a/extractors/tiktok/tiktok_test.go +++ b/extractors/tiktok/tiktok_test.go @@ -3,8 +3,8 @@ package tiktok import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/tumblr/tumblr.go b/extractors/tumblr/tumblr.go index 6c6d43732..cc32ec73b 100644 --- a/extractors/tumblr/tumblr.go +++ b/extractors/tumblr/tumblr.go @@ -5,10 +5,10 @@ import ( "errors" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/parser" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/parser" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type imageList struct { @@ -103,7 +103,7 @@ func tumblrVideoDownload(url, html, title string) ([]*types.Data, error) { videoURL := videoURLs[1] if !strings.Contains(videoURL, "tumblr.com/video") { - return nil, errors.New("annie doesn't support this URL right now") + return nil, errors.New("lux doesn't support this URL right now") } videoHTML, err := request.Get(videoURL, url, nil) if err != nil { diff --git a/extractors/tumblr/tumblr_test.go b/extractors/tumblr/tumblr_test.go index 216a8d494..bcf1be217 100644 --- a/extractors/tumblr/tumblr_test.go +++ b/extractors/tumblr/tumblr_test.go @@ -3,8 +3,8 @@ package tumblr import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/twitter/twitter.go b/extractors/twitter/twitter.go index 3966168bd..0b84f471e 100644 --- a/extractors/twitter/twitter.go +++ b/extractors/twitter/twitter.go @@ -6,9 +6,9 @@ import ( "strconv" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type twitter struct { diff --git a/extractors/twitter/twitter_test.go b/extractors/twitter/twitter_test.go index 6331757fe..2654c4957 100644 --- a/extractors/twitter/twitter_test.go +++ b/extractors/twitter/twitter_test.go @@ -3,8 +3,8 @@ package twitter import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/udn/udn.go b/extractors/udn/udn.go index 2884dc1ef..ff1f33ba6 100644 --- a/extractors/udn/udn.go +++ b/extractors/udn/udn.go @@ -4,9 +4,9 @@ import ( "errors" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const ( diff --git a/extractors/udn/udn_test.go b/extractors/udn/udn_test.go index 2394255a2..1eb9790fb 100644 --- a/extractors/udn/udn_test.go +++ b/extractors/udn/udn_test.go @@ -3,8 +3,8 @@ package udn import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestExtract(t *testing.T) { diff --git a/extractors/universal/universal.go b/extractors/universal/universal.go index daef6d079..d5c7c1109 100644 --- a/extractors/universal/universal.go +++ b/extractors/universal/universal.go @@ -1,9 +1,9 @@ package universal import ( - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type extractor struct{} diff --git a/extractors/universal/universal_test.go b/extractors/universal/universal_test.go index 6c042c488..cd30f344a 100644 --- a/extractors/universal/universal_test.go +++ b/extractors/universal/universal_test.go @@ -3,8 +3,8 @@ package universal import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/vimeo/vimeo.go b/extractors/vimeo/vimeo.go index 9b4767afc..c0b8eef64 100644 --- a/extractors/vimeo/vimeo.go +++ b/extractors/vimeo/vimeo.go @@ -5,9 +5,9 @@ import ( "strconv" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type vimeoProgressive struct { diff --git a/extractors/vimeo/vimeo_test.go b/extractors/vimeo/vimeo_test.go index 36a9723fe..c2b19f75e 100644 --- a/extractors/vimeo/vimeo_test.go +++ b/extractors/vimeo/vimeo_test.go @@ -3,8 +3,8 @@ package vimeo import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/weibo/weibo.go b/extractors/weibo/weibo.go index d7691517f..6e1b40a3b 100644 --- a/extractors/weibo/weibo.go +++ b/extractors/weibo/weibo.go @@ -10,9 +10,9 @@ import ( "strconv" "strings" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type playInfo struct { diff --git a/extractors/weibo/weibo_test.go b/extractors/weibo/weibo_test.go index f0d41155a..31eab67c9 100644 --- a/extractors/weibo/weibo_test.go +++ b/extractors/weibo/weibo_test.go @@ -3,8 +3,8 @@ package weibo import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestToken(t *testing.T) { diff --git a/extractors/xvideos/xvideos.go b/extractors/xvideos/xvideos.go index 6646e481d..eeb980227 100644 --- a/extractors/xvideos/xvideos.go +++ b/extractors/xvideos/xvideos.go @@ -4,9 +4,9 @@ import ( "strings" "sync" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const ( diff --git a/extractors/xvideos/xvideos_test.go b/extractors/xvideos/xvideos_test.go index 37973388a..a6f5f7084 100644 --- a/extractors/xvideos/xvideos_test.go +++ b/extractors/xvideos/xvideos_test.go @@ -3,8 +3,8 @@ package xvideos import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestExtract(t *testing.T) { diff --git a/extractors/yinyuetai/yinyuetai.go b/extractors/yinyuetai/yinyuetai.go index aff820f3f..11e77049b 100644 --- a/extractors/yinyuetai/yinyuetai.go +++ b/extractors/yinyuetai/yinyuetai.go @@ -5,9 +5,9 @@ import ( "errors" "fmt" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const yinyuetaiAPI = "https://ext.yinyuetai.com/main/" diff --git a/extractors/yinyuetai/yinyuetai_test.go b/extractors/yinyuetai/yinyuetai_test.go index d452ee7bb..6900fca92 100644 --- a/extractors/yinyuetai/yinyuetai_test.go +++ b/extractors/yinyuetai/yinyuetai_test.go @@ -3,8 +3,8 @@ package yinyuetai import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/youku/youku.go b/extractors/youku/youku.go index 9173e7bcd..9ea04bd79 100644 --- a/extractors/youku/youku.go +++ b/extractors/youku/youku.go @@ -14,9 +14,9 @@ import ( "strings" "time" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) type errorData struct { diff --git a/extractors/youku/youku_test.go b/extractors/youku/youku_test.go index 7a10c571e..378b51c43 100644 --- a/extractors/youku/youku_test.go +++ b/extractors/youku/youku_test.go @@ -3,8 +3,8 @@ package youku import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestDownload(t *testing.T) { diff --git a/extractors/youtube/youtube.go b/extractors/youtube/youtube.go index 444a6dad0..b484286a4 100644 --- a/extractors/youtube/youtube.go +++ b/extractors/youtube/youtube.go @@ -6,9 +6,9 @@ import ( "github.com/kkdai/youtube/v2" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) const referer = "https://www.youtube.com" diff --git a/extractors/youtube/youtube_test.go b/extractors/youtube/youtube_test.go index aa3e3e2c9..a70738256 100644 --- a/extractors/youtube/youtube_test.go +++ b/extractors/youtube/youtube_test.go @@ -3,8 +3,8 @@ package youtube import ( "testing" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/test" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/test" ) func TestYoutube(t *testing.T) { diff --git a/go.mod b/go.mod index f6648034c..f9ad13c93 100644 --- a/go.mod +++ b/go.mod @@ -1,4 +1,4 @@ -module github.com/iawia002/annie +module github.com/iawia002/lux go 1.16 diff --git a/main.go b/main.go index 9f9eed2f6..b60f486c5 100644 --- a/main.go +++ b/main.go @@ -13,12 +13,12 @@ import ( "github.com/go-rod/rod" "github.com/urfave/cli/v2" - "github.com/iawia002/annie/cookier" - "github.com/iawia002/annie/downloader" - "github.com/iawia002/annie/extractors" - "github.com/iawia002/annie/extractors/types" - "github.com/iawia002/annie/request" - "github.com/iawia002/annie/utils" + "github.com/iawia002/lux/cookier" + "github.com/iawia002/lux/downloader" + "github.com/iawia002/lux/extractors" + "github.com/iawia002/lux/extractors/types" + "github.com/iawia002/lux/request" + "github.com/iawia002/lux/utils" ) func main() { @@ -27,15 +27,15 @@ func main() { cyan := color.New(color.FgCyan) fmt.Fprintf( color.Output, - "\n%s: version %s, A fast, simple and clean video downloader.\n\n", - cyan.Sprintf("annie"), + "\n%s: version %s, A fast and simple video downloader.\n\n", + cyan.Sprintf("lux"), blue.Sprintf(c.App.Version), ) } app := &cli.App{ - Name: "annie", - Usage: "A fast, simple and clean video downloader.", + Name: "lux", + Usage: "A fast and simple video downloader.", Version: "v0.11.0", Flags: []cli.Flag{ &cli.BoolFlag{ diff --git a/request/request.go b/request/request.go index f31cac1a8..43f45b2b0 100644 --- a/request/request.go +++ b/request/request.go @@ -17,7 +17,7 @@ import ( "github.com/fatih/color" "github.com/kr/pretty" - "github.com/iawia002/annie/config" + "github.com/iawia002/lux/config" ) var ( diff --git a/static/logo.png b/static/logo.png deleted file mode 100644 index 7e6c6463af211c59296f1f3f4d722f9b76dfa5be..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8856 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 diff --git a/test/utils.go b/test/utils.go index 578965dc9..5464827da 100644 --- a/test/utils.go +++ b/test/utils.go @@ -4,7 +4,7 @@ import ( "sort" "testing" - "github.com/iawia002/annie/extractors/types" + "github.com/iawia002/lux/extractors/types" ) // Args Arguments for extractor tests diff --git a/utils/utils.go b/utils/utils.go index ac39c319a..9a94fcb58 100644 --- a/utils/utils.go +++ b/utils/utils.go @@ -17,7 +17,7 @@ import ( "github.com/tidwall/gjson" - "github.com/iawia002/annie/request" + "github.com/iawia002/lux/request" ) // GetStringFromJSON get the string value from json path