Merge pull request #8 from gsxhnd/feature/jav-star-code-crawl

Feature/jav star code crawl
gsxhnd · Aug 19, 2023 · 9241a94 · 9241a94
2 parents ee5e2bc 330c387
commit 9241a94
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 147 deletions.
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -3,7 3,7 @@ name: Release
 on:
  push:
  tags:
- - 'v*'
  - "v*"
 
 jobs:
  build:
@@ -16,14 16,13 @@ jobs:
  - name: Set up Go 1.x
  uses: actions/setup-go@v4
  with:
- go-version: ^1.20
  go-version: ^1.21
  id: go
 
  - run: go version
 
  - name: Get dependencies
- run:
- go get -v -t -d ./...
  run: go get -v -t -d ./...
 
  - uses: goreleaser/goreleaser-action@v4
  with:
@@ -32,4 31,4 @@ jobs:
  version: latest
  args: release --clean
  env:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -40,6 40,19 @@
  "output": "${workspaceRoot}/build/garage",
  "trace": "verbose",
  "cwd": "${workspaceRoot}"
  },
  {
  "name": "Command Javbus Star Crawl",
  "type": "go",
  "request": "launch",
  "mode": "auto",
  "showLog": true,
  "debugAdapter": "dlv-dap",
  "program": "${workspaceRoot}/src",
  "args": ["crawl", "jav-star-code"],
  "output": "${workspaceRoot}/build/garage",
  "trace": "verbose",
  "cwd": "${workspaceRoot}"
  }
  ]
 }
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 1,11 @@
 # CHANGELOG
 
 ## Version 0.0.9
 
 ### bate-01
 
 - FEAT: add crawl info by jav star code
 
 ## Version 0.0.8
 
 - DOC: 文档更新

diff --git a/src/cmd/crawl_jav.go b/src/cmd/crawl_jav.go
@@ -40,7 40,7 @@ var javCodeCmd = &cli.Command{
  code = ctx.Args().Get(0)
  )
 
- c, err := crawl.NewCrawlClient(logger, crawl.CrawlOptions{
  c, err := crawl.NewJavbusCrawl(logger, crawl.CrawlOptions{
  DownloadMagent: ctx.Bool("magnet"),
  Proxy: ctx.String("proxy"),
  DestPath: ctx.String("output"),
@@ -73,7 73,7 @@ var javPrefixCmd = &cli.Command{
  Action: func(c *cli.Context) error {
  var logger = utils.GetLogger()
 
- client, err := crawl.NewCrawlClient(logger, crawl.CrawlOptions{
  client, err := crawl.NewJavbusCrawl(logger, crawl.CrawlOptions{
  Proxy: c.String("proxy"),
  DestPath: c.String("output"),
  DownloadMagent: c.Bool("magnet"),
@@ -99,10 99,31 @@ var javStarCodeCmd = &cli.Command{
  Usage: "根据演员ID爬取数据",
  Flags: []cli.Flag{
  javSiteFlag,
  javMagnetFlag,
  javOutputFlag,
  javProxyFlag,
  &cli.StringFlag{Name: "star-code", Value: "vfn", Usage: "演员番号"},
  },
- Action: func(c *cli.Context) error {
  Action: func(ctx *cli.Context) error {
  var (
  logger = utils.GetLogger()
  startCode = ctx.String("star-code")
  )
 
  c, err := crawl.NewJavbusCrawl(logger, crawl.CrawlOptions{
  DownloadMagent: ctx.Bool("magnet"),
  Proxy: ctx.String("proxy"),
  DestPath: ctx.String("output"),
  })
  if err != nil {
  logger.Panic("client init error: "   err.Error())
  return err
  }
 
  if err := c.StartCrawlJavbusMovieByStar(startCode); err != nil {
  logger.Panic("crawl error: "   err.Error())
  return err
  }
  return nil
  },
 }
@@ -119,7 140,7 @@ var javStarCodeFromDirCmd = &cli.Command{
  Action: func(c *cli.Context) error {
  var logger = utils.GetLogger()
 
- client, err := crawl.NewCrawlClient(logger, crawl.CrawlOptions{
  client, err := crawl.NewJavbusCrawl(logger, crawl.CrawlOptions{
  Proxy: c.String("proxy"),
  DestPath: c.String("output"),
  })

diff --git a/src/crawl/crawl.go b/src/crawl/crawl.go