nprasad2077/gopeed
1
0 Fork 0
mirror of https://github.com/GopeedLab/gopeed.git synced 2026-11-09 18:10:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: clear UPNP port mapping when exist app (#624)

Browse Source
This commit is contained in:
Levi authored and GitHub committed 2024-07-30 18:43:54 +08:00
1 parent 3b50465708
commit 4fbe13a1f0
22 files changed
+506 -320
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

internal/protocol/bt/fetcher.go
+38 -11
View File
@@ -205,6 +205,9 @@ func (f *Fetcher) Wait() (err error) {
}
func (f *Fetcher) isDone() bool {
if f.meta.Opts == nil {
return false
}
for _, selectIndex := range f.meta.Opts.SelectFiles {
file := f.torrent.Files()[selectIndex]
if file.BytesCompleted() < file.Length() {
@@ -318,7 +321,7 @@ func (f *Fetcher) addTorrent(req *base.Request) (err error) {
schema := util.ParseSchema(req.URL)
if schema == "MAGNET" {
f.torrent, err = client.AddMagnet(req.URL)
} else if schema == "APPLICATION/X-BITTORRENT" {
} else if schema == "DATA" {
_, data := util.ParseDataUri(req.URL)
buf := bytes.NewBuffer(data)
var metaInfo *metainfo.MetaInfo
@@ -379,24 +382,35 @@ type fetcherData struct {
SeedTime int64
}
type FetcherBuilder struct {
type FetcherManager struct {
}
var schemes = []string{"FILE", "MAGNET", "APPLICATION/X-BITTORRENT"}
func (fb *FetcherBuilder) Name() string {
func (fm *FetcherManager) Name() string {
return "bt"
}
func (fb *FetcherBuilder) Schemes() []string {
return schemes
func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
return []*fetcher.SchemeFilter{
{
Type: fetcher.FilterTypeUrl,
Pattern: "MAGNET",
},
{
Type: fetcher.FilterTypeFile,
Pattern: "TORRENT",
},
{
Type: fetcher.FilterTypeBase64,
Pattern: "APPLICATION/X-BITTORRENT",
},
}
}
func (fb *FetcherBuilder) Build() fetcher.Fetcher {
func (fm *FetcherManager) Build() fetcher.Fetcher {
return &Fetcher{}
}
func (fb *FetcherBuilder) DefaultConfig() any {
func (fm *FetcherManager) DefaultConfig() any {
return &config{
ListenPort: 0,
Trackers: []string{},
@@ -406,12 +420,12 @@ func (fb *FetcherBuilder) DefaultConfig() any {
}
}
func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
_f := f.(*Fetcher)
return _f.data, nil
}
func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
return &Fetcher{
meta: meta,
@@ -420,6 +434,19 @@ func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
}
}
func (fm *FetcherManager) Close() error {
lock.Lock()
defer lock.Unlock()
if client != nil {
errs := client.Close()
if len(errs) > 0 {
return errs[0]
}
}
return nil
}
// parse version to bep20 format, fixed length 4, if not enough, fill 0
func parseBep20() string {
s := strings.ReplaceAll(base.Version, ".", "")
internal/protocol/bt/fetcher_test.go
+2 -2
View File
@@ -100,7 +100,7 @@ func doResolve(t *testing.T, fetcher fetcher.Fetcher) {
}
func buildFetcher() fetcher.Fetcher {
fb := new(FetcherBuilder)
fb := new(FetcherManager)
fetcher := fb.Build()
newController := controller.NewController()
newController.GetConfig = func(v any) {
@@ -111,7 +111,7 @@ func buildFetcher() fetcher.Fetcher {
}
func buildConfigFetcher(proxyConfig *base.DownloaderProxyConfig) fetcher.Fetcher {
fetcher := new(FetcherBuilder).Build()
fetcher := new(FetcherManager).Build()
newController := controller.NewController()
mockCfg := config{
Trackers: []string{
internal/protocol/http/fetcher.go
+22 -11
View File
@@ -456,41 +456,48 @@ type fetcherData struct {
Chunks []*chunk
}
type FetcherBuilder struct {
type FetcherManager struct {
}
var schemes = []string{"HTTP", "HTTPS"}
func (fb *FetcherBuilder) Name() string {
func (fm *FetcherManager) Name() string {
return "http"
}
func (fb *FetcherBuilder) Schemes() []string {
return schemes
func (fm *FetcherManager) Filters() []*fetcher.SchemeFilter {
return []*fetcher.SchemeFilter{
{
Type: fetcher.FilterTypeUrl,
Pattern: "HTTP",
},
{
Type: fetcher.FilterTypeUrl,
Pattern: "HTTPS",
},
}
}
func (fb *FetcherBuilder) Build() fetcher.Fetcher {
func (fm *FetcherManager) Build() fetcher.Fetcher {
return &Fetcher{}
}
func (fb *FetcherBuilder) DefaultConfig() any {
func (fm *FetcherManager) DefaultConfig() any {
return &config{
UserAgent: "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/116.0.0.0 Safari/537.36",
Connections: 16,
}
}
func (fb *FetcherBuilder) Store(f fetcher.Fetcher) (data any, err error) {
func (fm *FetcherManager) Store(f fetcher.Fetcher) (data any, err error) {
_f := f.(*Fetcher)
return &fetcherData{
Chunks: _f.chunks,
}, nil
}
func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
func (fm *FetcherManager) Restore() (v any, f func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher) {
return &fetcherData{}, func(meta *fetcher.FetcherMeta, v any) fetcher.Fetcher {
fd := v.(*fetcherData)
fb := &FetcherBuilder{}
fb := &FetcherManager{}
fetcher := fb.Build().(*Fetcher)
fetcher.meta = meta
base.ParseReqExtra[fhttp.ReqExtra](fetcher.meta.Req)
@@ -501,3 +508,7 @@ func (fb *FetcherBuilder) Restore() (v any, f func(meta *fetcher.FetcherMeta, v
return fetcher
}
}
func (fm *FetcherManager) Close() error {
return nil
}
internal/protocol/http/fetcher_test.go
+3 -3
View File
@@ -306,7 +306,7 @@ func downloadResume(listener net.Listener, connections int, t *testing.T) {
t.Fatal(err)
}
fb := new(FetcherBuilder)
fb := new(FetcherManager)
time.Sleep(time.Millisecond * 50)
data, err := fb.Store(fetcher)
if err != nil {
@@ -359,7 +359,7 @@ func downloadWithProxy(httpListener net.Listener, proxyListener net.Listener, t
}
func buildFetcher() *Fetcher {
fb := new(FetcherBuilder)
fb := new(FetcherManager)
fetcher := fb.Build()
newController := controller.NewController()
newController.GetConfig = func(v any) {
@@ -370,7 +370,7 @@ func buildFetcher() *Fetcher {
}
func buildConfigFetcher(cfg config) fetcher.Fetcher {
fetcher := new(FetcherBuilder).Build()
fetcher := new(FetcherManager).Build()
newController := controller.NewController()
newController.GetConfig = func(v any) {
json.Unmarshal([]byte(test.ToJson(cfg)), v)