Skip to content

Commit 5fa9103

Browse files
varg1714varg1714
committed
fix name mapping err.
1 parent 8084db0 commit 5fa9103

File tree

7 files changed

+26
-26
lines changed

7 files changed

+26
-26
lines changed

‎drivers/fc2/driver.go

+1-12
Original file line numberDiff line numberDiff line change
@@ -50,12 +50,6 @@ func (d *FC2) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
5050
categories := make(map[string]string)
5151
results := make([]model.Obj, 0)
5252

53-
storage := op.GetBalancedStorage(d.PikPakPath)
54-
pikPak, ok := storage.(*pikpak.PikPak)
55-
if !ok {
56-
return results, nil
57-
}
58-
5953
dirName := dir.GetName()
6054

6155
actors := db.QueryActor(strconv.Itoa(int(d.ID)))
@@ -112,11 +106,6 @@ func (d *FC2) List(ctx context.Context, dir model.Obj, args model.ListArgs) ([]m
112106
return utils.SliceConvert(films, func(src model.ObjThumb) (model.Obj, error) {
113107
return &src, nil
114108
})
115-
} else if !strings.Contains(dir.GetID(), ".jpg") {
116-
// 临时文件
117-
return pikPak.CloudDownload(ctx, d.PikPakCacheDirectory, dir, func(obj model.Obj) (string, error) {
118-
return d.getMagnet(dir)
119-
})
120109
} else {
121110
// pikPak文件
122111
return results, nil
@@ -216,7 +205,7 @@ func (d *FC2) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
216205

217206
if len(db.QueryByUrls("个人收藏", []string{srcObj.GetID()})) == 0 {
218207
thumb := srcObj.(*model.ObjThumb)
219-
return db.CreateFilms("fc2", "个人收藏", []model.ObjThumb{*thumb})
208+
return db.CreateFilms("fc2", "个人收藏", "个人收藏", []model.ObjThumb{*thumb})
220209
}
221210

222211
return nil

‎drivers/fc2/util.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ func (d *FC2) findMagnet(url string) (string, error) {
3636
func (d *FC2) getFilms(dirName string, urlFunc func(index int) string) ([]model.ObjThumb, error) {
3737

3838
if strings.HasPrefix(urlFunc(1), "https://adult.contents.fc2.com/users") {
39-
return virtual_file.GetFilmsWitchStorage("fc2", dirName, urlFunc,
39+
return virtual_file.GetFilmsWitchStorage("fc2", dirName, dirName, urlFunc,
4040
func(urlFunc func(index int) string, index int, data []model.ObjThumb) ([]model.ObjThumb, bool, error) {
4141
return d.getPageInfo(urlFunc, index, data)
4242
})

‎drivers/javdb/driver.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ func (d *Javdb) Move(ctx context.Context, srcObj, dstDir model.Obj) error {
219219

220220
if len(db.QueryByUrls("个人收藏", []string{srcObj.GetID()})) == 0 {
221221
thumb := srcObj.(*model.ObjThumb)
222-
return db.CreateFilms("javdb", "个人收藏", []model.ObjThumb{*thumb})
222+
return db.CreateFilms("javdb", "个人收藏", "个人收藏", []model.ObjThumb{*thumb})
223223
}
224224

225225
return nil

‎drivers/javdb/util.go

+16-7
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ import (
2121
func (d *Javdb) getFilms(dirName string, urlFunc func(index int) string) ([]model.ObjThumb, error) {
2222

2323
// 1. 获取所有影片
24-
javFilms, err := virtual_file.GetFilmsWitchStorage("javdb", dirName, urlFunc,
24+
javFilms, err := virtual_file.GetFilmsWitchStorage("javdb", dirName, dirName, urlFunc,
2525
func(urlFunc func(index int) string, index int, data []model.ObjThumb) ([]model.ObjThumb, bool, error) {
2626
return d.getJavPageInfo(urlFunc, index, data)
2727
})
@@ -85,7 +85,7 @@ func (d *Javdb) addStar(code string) (model.ObjThumb, error) {
8585
}
8686
}
8787

88-
err = db.CreateFilms("javdb", "个人收藏", []model.ObjThumb{cachingFilm})
88+
err = db.CreateFilms("javdb", "个人收藏", "个人收藏", []model.ObjThumb{cachingFilm})
8989
cachingFilm.Name = virtual_file.AppendFilmName(cachingFilm.Name)
9090
cachingFilm.Path = "个人收藏"
9191

@@ -255,7 +255,7 @@ func (d *Javdb) getAiravPageInfo(urlFunc func(index int) string, index int, data
255255
nextPage := false
256256

257257
collector := colly.NewCollector(func(c *colly.Collector) {
258-
c.SetRequestTimeout(time.Second * 10)
258+
c.SetRequestTimeout(time.Second * 20)
259259
})
260260
extensions.RandomUserAgent(collector)
261261

@@ -388,9 +388,18 @@ func (d *Javdb) getAiravNamingAddr(film model.ObjThumb) (string, model.ObjThumb)
388388

389389
collector.OnHTML(".list-group", func(element *colly.HTMLElement) {
390390

391-
url := element.ChildAttr(".my-2 a", "href")
392-
if url != "" && strings.Contains(url, "/cn/actor") {
393-
actorPageUrl = fmt.Sprintf("https://airav.io%s&idx=", url)
391+
urls := element.ChildAttrs(".my-2 a", "href")
392+
393+
var actors []string
394+
for _, url := range urls {
395+
if strings.Contains(url, "/cn/actor") {
396+
actors = append(actors, url)
397+
}
398+
}
399+
400+
// 仅当演员只有一个的时候才进行爬取
401+
if len(actors) == 1 {
402+
actorPageUrl = fmt.Sprintf("https://airav.io%s&idx=", actors[0])
394403
}
395404

396405
})
@@ -436,7 +445,7 @@ func (d *Javdb) getAiravNamingFilms(films []model.ObjThumb, dirName string) (map
436445

437446
if addr != "" {
438447
// 2.2.2 爬取该主演所有作品
439-
namingFilms, err := virtual_file.GetFilmsWitchStorage("airav", dirName, func(index int) string {
448+
namingFilms, err := virtual_file.GetFilmsWitchStorage("airav", dirName, addr, func(index int) string {
440449
return addr + strconv.Itoa(index)
441450
},
442451
func(urlFunc func(index int) string, index int, data []model.ObjThumb) ([]model.ObjThumb, bool, error) {

‎drivers/virtual_file/film.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ func GetFilms(source, dirName string, urlFunc func(index int) string, pageFunc f
3838

3939
}
4040

41-
func GetFilmsWitchStorage(source, dirName string, urlFunc func(index int) string, pageFunc func(urlFunc func(index int) string, index int, preFilms []model.ObjThumb) ([]model.ObjThumb, bool, error)) ([]model.ObjThumb, error) {
41+
func GetFilmsWitchStorage(source, dirName string, actorId string, urlFunc func(index int) string, pageFunc func(urlFunc func(index int) string, index int, preFilms []model.ObjThumb) ([]model.ObjThumb, bool, error)) ([]model.ObjThumb, error) {
4242

4343
results := make([]model.ObjThumb, 0)
4444
films := make([]model.ObjThumb, 0)
@@ -53,7 +53,7 @@ func GetFilmsWitchStorage(source, dirName string, urlFunc func(index int) string
5353
urls = append(urls, item.ID)
5454
}
5555

56-
existFilms := db.QueryByUrls(dirName, urls)
56+
existFilms := db.QueryByUrls(actorId, urls)
5757

5858
// not exists
5959
for index := 2; index <= 20 && nextPage && len(existFilms) == 0; index++ {
@@ -67,7 +67,7 @@ func GetFilmsWitchStorage(source, dirName string, urlFunc func(index int) string
6767
urls = append(urls, item.ID)
6868
}
6969

70-
existFilms = db.QueryByUrls(dirName, urls)
70+
existFilms = db.QueryByUrls(actorId, urls)
7171

7272
}
7373
// exist
@@ -83,7 +83,7 @@ func GetFilmsWitchStorage(source, dirName string, urlFunc func(index int) string
8383
}
8484

8585
if len(films) != 0 {
86-
err = db.CreateFilms(source, dirName, films)
86+
err = db.CreateFilms(source, dirName, actorId, films)
8787
if err != nil {
8888
return convertFilm(source, dirName, db.QueryByActor(source, dirName), results), nil
8989
}

‎internal/db/film.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"time"
88
)
99

10-
func CreateFilms(source string, actor string, models []model.ObjThumb) error {
10+
func CreateFilms(source string, actor, actorId string, models []model.ObjThumb) error {
1111

1212
if len(models) == 0 {
1313
return nil
@@ -24,6 +24,7 @@ func CreateFilms(source string, actor string, models []model.ObjThumb) error {
2424
Image: obj.Thumb(),
2525
Source: source,
2626
Actor: actor,
27+
ActorId: actorId,
2728
CreatedAt: now,
2829
Date: obj.Modified,
2930
})

‎internal/model/film.go

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ type Film struct {
1111
Image string `json:"image"`
1212
Source string `json:"source"`
1313
Actor string `json:"actor"`
14+
ActorId string `json:"actor_id"`
1415
Date time.Time `json:"date"`
1516
CreatedAt time.Time `json:"created_at"`
1617
}

0 commit comments

Comments
 (0)