mirror of
https://github.com/GopeedLab/gopeed.git
synced 2026-11-19 06:43:42 +00:00
feat: new ui (#1455)
This commit is contained in:
742 files changed
+59951
-5934
No files matched your search
@@ -210,23 +210,76 @@ func (f *Fetcher) Meta() *fetcher.FetcherMeta {
|
||||
return f.meta
|
||||
}
|
||||
|
||||
func (f *Fetcher) Stats() any {
|
||||
func (f *Fetcher) Stats() *fetcher.Stats {
|
||||
handle := f.currentHandle()
|
||||
if !handle.IsValid() {
|
||||
return &ped2k.Stats{}
|
||||
return &fetcher.Stats{
|
||||
Runtime: &ped2k.StatsRuntime{
|
||||
Peers: make([]*base.PeerStats, 0),
|
||||
},
|
||||
}
|
||||
}
|
||||
status := handle.GetStatus()
|
||||
return &ped2k.Stats{
|
||||
State: string(status.State),
|
||||
ActivePeers: handle.ActiveConnections(),
|
||||
TotalPeers: status.NumPeers,
|
||||
DownloadRate: status.DownloadRate,
|
||||
Upload: status.Upload,
|
||||
UploadRate: status.UploadRate,
|
||||
TotalDone: status.TotalDone,
|
||||
TotalReceived: status.TotalReceived,
|
||||
TotalWanted: status.TotalWanted,
|
||||
pieceMap := buildED2KPieceMap(handle.PieceSnapshots())
|
||||
mapReady := pieceMap != nil && status.State != goed2k.LoadingResumeData && status.State != goed2k.Verifying
|
||||
var snapshot any
|
||||
if mapReady {
|
||||
snapshot = &ped2k.StatsSnapshot{
|
||||
Upload: status.Upload,
|
||||
TotalDone: status.TotalDone,
|
||||
TotalReceived: status.TotalReceived,
|
||||
TotalWanted: status.TotalWanted,
|
||||
PieceMap: pieceMap.Clone(),
|
||||
}
|
||||
}
|
||||
// Resume loading and verification are transitional. A nil Snapshot retains
|
||||
// the last trusted completion bitset until goed2k publishes a stable map.
|
||||
return &fetcher.Stats{
|
||||
Snapshot: snapshot,
|
||||
Runtime: &ped2k.StatsRuntime{
|
||||
State: string(status.State),
|
||||
Paused: status.Paused,
|
||||
ActivePeers: handle.ActiveConnections(),
|
||||
TotalPeers: status.NumPeers,
|
||||
DownloadRate: status.DownloadRate,
|
||||
UploadRate: status.UploadRate,
|
||||
Peers: buildED2KPeers(handle.GetPeersInfo()),
|
||||
},
|
||||
}
|
||||
}
|
||||
|
||||
func buildED2KPieceMap(snapshots []goed2k.PieceSnapshot) *base.PieceMap {
|
||||
if len(snapshots) == 0 {
|
||||
return nil
|
||||
}
|
||||
pieceMap := base.NewPieceMap(len(snapshots), goed2k.PieceSize)
|
||||
for _, snapshot := range snapshots {
|
||||
if snapshot.Index < 0 || snapshot.Index >= pieceMap.PieceCount() {
|
||||
continue
|
||||
}
|
||||
_ = pieceMap.Update(snapshot.Index, snapshot.State == goed2k.PieceSnapshotFinished)
|
||||
}
|
||||
return pieceMap
|
||||
}
|
||||
|
||||
func buildED2KPeers(peerInfos []goed2k.PeerInfo) []*base.PeerStats {
|
||||
peers := make([]*base.PeerStats, 0, len(peerInfos))
|
||||
for _, peerInfo := range peerInfos {
|
||||
peers = append(peers, &base.PeerStats{
|
||||
Address: peerInfo.Endpoint.String(),
|
||||
Client: ed2kPeerClient(peerInfo),
|
||||
DownloadSpeed: int64(peerInfo.PayloadDownloadSpeed),
|
||||
UploadSpeed: int64(peerInfo.PayloadUploadSpeed),
|
||||
PieceCount: peerInfo.RemotePieces.Count(),
|
||||
Source: peerInfo.SourceString(),
|
||||
Transport: "tcp",
|
||||
})
|
||||
}
|
||||
return peers
|
||||
}
|
||||
|
||||
func ed2kPeerClient(peerInfo goed2k.PeerInfo) string {
|
||||
return strings.TrimSpace(peerInfo.ModName + " " + peerInfo.StrModVersion)
|
||||
}
|
||||
|
||||
func (f *Fetcher) Progress() fetcher.Progress {
|
||||
|
||||
@@ -0,0 +1,72 @@
|
||||
package ed2k
|
||||
|
||||
import (
|
||||
"testing"
|
||||
|
||||
ped2k "github.com/GopeedLab/gopeed/pkg/protocol/ed2k"
|
||||
"github.com/monkeyWie/goed2k"
|
||||
"github.com/monkeyWie/goed2k/protocol"
|
||||
)
|
||||
|
||||
func TestStatsSeparatesSnapshotAndRuntimeWithoutHandle(t *testing.T) {
|
||||
frame := (&Fetcher{}).Stats()
|
||||
if frame.Snapshot != nil {
|
||||
t.Fatalf("snapshot = %T, want nil without a valid handle", frame.Snapshot)
|
||||
}
|
||||
runtime, ok := frame.Runtime.(*ped2k.StatsRuntime)
|
||||
if !ok {
|
||||
t.Fatalf("runtime type = %T", frame.Runtime)
|
||||
}
|
||||
if runtime.Peers == nil || len(runtime.Peers) != 0 {
|
||||
t.Fatalf("unexpected runtime peers: %+v", runtime.Peers)
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildED2KPieceMapPreservesIndexes(t *testing.T) {
|
||||
snapshots := []goed2k.PieceSnapshot{
|
||||
{Index: 0, State: goed2k.PieceSnapshotFinished},
|
||||
{Index: 1, State: goed2k.PieceSnapshotMissing},
|
||||
{Index: 2, State: goed2k.PieceSnapshotDownloading},
|
||||
{Index: 3, State: goed2k.PieceSnapshotFinished},
|
||||
}
|
||||
pieceMap := buildED2KPieceMap(snapshots)
|
||||
if pieceMap == nil {
|
||||
t.Fatal("buildED2KPieceMap returned nil")
|
||||
}
|
||||
want := []bool{true, false, false, true}
|
||||
for index, expected := range want {
|
||||
got, err := pieceMap.Get(index)
|
||||
if err != nil || got != expected {
|
||||
t.Fatalf("piece %d = %v, %v; want %v", index, got, err, expected)
|
||||
}
|
||||
}
|
||||
if pieceMap.CompletedPieces() != 2 {
|
||||
t.Fatalf("CompletedPieces() = %d, want 2", pieceMap.CompletedPieces())
|
||||
}
|
||||
}
|
||||
|
||||
func TestBuildED2KPeers(t *testing.T) {
|
||||
remotePieces := protocol.NewBitField(4)
|
||||
remotePieces.SetBit(0)
|
||||
remotePieces.SetBit(2)
|
||||
endpoint, err := protocol.EndpointFromString("127.0.0.1", 4662)
|
||||
if err != nil {
|
||||
t.Fatalf("EndpointFromString: %v", err)
|
||||
}
|
||||
peers := buildED2KPeers([]goed2k.PeerInfo{{
|
||||
PayloadDownloadSpeed: 2048,
|
||||
PayloadUploadSpeed: 1024,
|
||||
RemotePieces: remotePieces,
|
||||
Endpoint: endpoint,
|
||||
ModName: "aMule",
|
||||
StrModVersion: "2.3.3",
|
||||
SourceFlag: int(goed2k.PeerServer | goed2k.PeerDHT),
|
||||
}})
|
||||
if len(peers) != 1 {
|
||||
t.Fatalf("len(peers) = %d, want 1", len(peers))
|
||||
}
|
||||
peer := peers[0]
|
||||
if peer.Client != "aMule 2.3.3" || peer.PieceCount != 2 || peer.Source != "server|kad" || peer.Transport != "tcp" {
|
||||
t.Fatalf("unexpected peer: %+v", peer)
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user