mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-17 22:03:41 +00:00
feat: auto create torrent task for http download (#334)
This commit is contained in:
5 files changed
+42
-11
No files matched your search
@@ -6,6 +6,7 @@ import (
|
|||||||
"github.com/GopeedLab/gopeed/internal/fetcher"
|
"github.com/GopeedLab/gopeed/internal/fetcher"
|
||||||
"github.com/GopeedLab/gopeed/internal/logger"
|
"github.com/GopeedLab/gopeed/internal/logger"
|
||||||
"github.com/GopeedLab/gopeed/pkg/base"
|
"github.com/GopeedLab/gopeed/pkg/base"
|
||||||
|
"github.com/GopeedLab/gopeed/pkg/protocol/http"
|
||||||
"github.com/GopeedLab/gopeed/pkg/util"
|
"github.com/GopeedLab/gopeed/pkg/util"
|
||||||
gonanoid "github.com/matoous/go-nanoid/v2"
|
gonanoid "github.com/matoous/go-nanoid/v2"
|
||||||
"github.com/rs/zerolog"
|
"github.com/rs/zerolog"
|
||||||
@@ -594,6 +595,26 @@ func (d *Downloader) watch(task *Task) {
|
|||||||
d.emit(EventKeyDone, task)
|
d.emit(EventKeyDone, task)
|
||||||
d.emit(EventKeyFinally, task, err)
|
d.emit(EventKeyFinally, task, err)
|
||||||
d.notifyRunning()
|
d.notifyRunning()
|
||||||
|
|
||||||
|
if e, ok := task.Meta.Opts.Extra.(*http.OptsExtra); ok {
|
||||||
|
downloadFilePath := task.Meta.SingleFilepath()
|
||||||
|
if e.AutoTorrent && strings.HasSuffix(downloadFilePath, ".torrent") {
|
||||||
|
go func() {
|
||||||
|
_, err2 := d.CreateDirect(
|
||||||
|
&base.Request{
|
||||||
|
URL: downloadFilePath,
|
||||||
|
},
|
||||||
|
&base.Options{
|
||||||
|
Path: task.Meta.Opts.Path,
|
||||||
|
SelectFiles: make([]int, 0),
|
||||||
|
})
|
||||||
|
if err2 != nil {
|
||||||
|
d.Logger.Error().Err(err2).Msgf("auto create torrent task failed, task id: %s", task.ID)
|
||||||
|
}
|
||||||
|
|
||||||
|
}()
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func (d *Downloader) doOnError(task *Task, err error) {
|
func (d *Downloader) doOnError(task *Task, err error) {
|
||||||
|
|||||||
@@ -8,6 +8,8 @@ type ReqExtra struct {
|
|||||||
|
|
||||||
type OptsExtra struct {
|
type OptsExtra struct {
|
||||||
Connections int `json:"connections"`
|
Connections int `json:"connections"`
|
||||||
|
// AutoTorrent when task download complete, and it is a .torrent file, it will be auto create a new task for the torrent file
|
||||||
|
AutoTorrent bool `json:"autoTorrent"`
|
||||||
}
|
}
|
||||||
|
|
||||||
// Stats for download
|
// Stats for download
|
||||||
|
|||||||
@@ -25,6 +25,7 @@ class Options {
|
|||||||
@JsonSerializable()
|
@JsonSerializable()
|
||||||
class OptsExtraHttp {
|
class OptsExtraHttp {
|
||||||
int connections = 0;
|
int connections = 0;
|
||||||
|
bool autoTorrent = false;
|
||||||
|
|
||||||
OptsExtraHttp();
|
OptsExtraHttp();
|
||||||
|
|
||||||
|
|||||||
@@ -32,9 +32,12 @@ Map<String, dynamic> _$OptionsToJson(Options instance) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) =>
|
OptsExtraHttp _$OptsExtraHttpFromJson(Map<String, dynamic> json) =>
|
||||||
OptsExtraHttp()..connections = json['connections'] as int;
|
OptsExtraHttp()
|
||||||
|
..connections = json['connections'] as int
|
||||||
|
..autoTorrent = json['autoTorrent'] as bool;
|
||||||
|
|
||||||
Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
|
Map<String, dynamic> _$OptsExtraHttpToJson(OptsExtraHttp instance) =>
|
||||||
<String, dynamic>{
|
<String, dynamic>{
|
||||||
'connections': instance.connections,
|
'connections': instance.connections,
|
||||||
|
'autoTorrent': instance.autoTorrent,
|
||||||
};
|
};
|
||||||
@@ -409,15 +409,20 @@ class CreateView extends GetView<CreateController> {
|
|||||||
try {
|
try {
|
||||||
_confirmController.start();
|
_confirmController.start();
|
||||||
if (_confirmFormKey.currentState!.validate()) {
|
if (_confirmFormKey.currentState!.validate()) {
|
||||||
final submitUrl = Util.isWeb() && controller.fileDataUri.isNotEmpty
|
final isWebFileChosen =
|
||||||
|
Util.isWeb() && controller.fileDataUri.isNotEmpty;
|
||||||
|
final submitUrl = isWebFileChosen
|
||||||
? controller.fileDataUri.value
|
? controller.fileDataUri.value
|
||||||
: _urlController.text;
|
: _urlController.text;
|
||||||
|
|
||||||
final urls = Util.textToLines(submitUrl);
|
final urls = Util.textToLines(submitUrl);
|
||||||
// Add url to the history
|
// Add url to the history
|
||||||
for (final url in urls) {
|
if (!isWebFileChosen) {
|
||||||
_historyController.addHistory(url);
|
for (final url in urls) {
|
||||||
|
_historyController.addHistory(url);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Check if is direct download, there has two ways to direct download
|
Check if is direct download, there has two ways to direct download
|
||||||
1. Direct download option is checked
|
1. Direct download option is checked
|
||||||
@@ -433,7 +438,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
name: isMultiLine ? "" : _renameController.text,
|
name: isMultiLine ? "" : _renameController.text,
|
||||||
path: _pathController.text,
|
path: _pathController.text,
|
||||||
selectFiles: [],
|
selectFiles: [],
|
||||||
extra: parseReqOpts())));
|
extra: parseReqOptsExtra())));
|
||||||
}));
|
}));
|
||||||
Get.rootDelegate.offNamed(Routes.TASK);
|
Get.rootDelegate.offNamed(Routes.TASK);
|
||||||
} else {
|
} else {
|
||||||
@@ -471,11 +476,10 @@ class CreateView extends GetView<CreateController> {
|
|||||||
return reqExtra;
|
return reqExtra;
|
||||||
}
|
}
|
||||||
|
|
||||||
Object? parseReqOpts() {
|
Object? parseReqOptsExtra() {
|
||||||
return _connectionsController.text.isEmpty
|
return OptsExtraHttp()
|
||||||
? null
|
..connections = int.tryParse(_connectionsController.text) ?? 0
|
||||||
: (OptsExtraHttp()
|
..autoTorrent = true;
|
||||||
..connections = int.parse(_connectionsController.text));
|
|
||||||
}
|
}
|
||||||
|
|
||||||
String _hitText() {
|
String _hitText() {
|
||||||
@@ -541,7 +545,7 @@ class CreateView extends GetView<CreateController> {
|
|||||||
showMessage('tip'.tr, 'noFileSelected'.tr);
|
showMessage('tip'.tr, 'noFileSelected'.tr);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
final optExtra = parseReqOpts();
|
final optExtra = parseReqOptsExtra();
|
||||||
if (createFormKey.currentState!.validate()) {
|
if (createFormKey.currentState!.validate()) {
|
||||||
if (rr.id.isEmpty) {
|
if (rr.id.isEmpty) {
|
||||||
// from extension resolve result
|
// from extension resolve result
|
||||||
|
|||||||
Reference in new issue
Block a user