Skip to content

fix(announcelist is an array not a string) #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mihaiav wants to merge 2 commits into
base: master
Choose a base branch
from
Open

fix(announcelist is an array not a string) #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
513aefd
fix(announcelist is an array not a string)
Dec 21, 2019
402a30c
fix(StatusInfo): AnnounceList may be a string or a slice of slices of…
Dec 22, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 24 additions & 4 deletions reply.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
package argo

import (
"encoding/json"
)

// GIDwithID contains the GID and the ID of the affected download.
type GIDwithID struct {
GID GID
Expand Down Expand Up @@ -43,16 +47,32 @@ type StatusInfo struct {
Dir string `json:"dir"` // Directory to save files.
Files []FileInfo `json:"files"` // Returns the list of files. The elements of this list are the same structs used in aria2.getFiles() method.
BitTorrent struct {
AnnounceList string `json:"announceList"` // List of lists of announce URIs. If the torrent contains announce and no announce-list, announce is converted to the announce-list format.
Comment string `json:"comment"` // The comment of the torrent. comment.utf-8 is used if available.
CreationDate string `json:"creationDate"` // The creation time of the torrent. The value is an integer since the epoch, measured in seconds.
Mode string `json:"mode"` // File mode of the torrent. The value is either single or multi.
AnnounceList []AnnounceList `json:"announceList"` // List of lists of announce URIs. If the torrent contains announce and no announce-list, announce is converted to the announce-list format.
Comment string `json:"comment"` // The comment of the torrent. comment.utf-8 is used if available.
CreationDate string `json:"creationDate"` // The creation time of the torrent. The value is an integer since the epoch, measured in seconds.
Mode string `json:"mode"` // File mode of the torrent. The value is either single or multi.
Info struct {
Name string `json:"name"` // name in info dictionary. name.utf-8 is used if available.
} `json:"info"` // Struct which contains data from Info dictionary. It contains following keys.
} `json:"bittorrent"` // Struct which contains information retrieved from the .torrent (file). BitTorrent only. It contains following keys.
}

type AnnounceList []string

func (a *AnnounceList) UnmarshalJSON(b []byte) error {
var sa []string
if err := json.Unmarshal(b, &sa); err == nil {
*a = append(*a, sa...)
return nil
}
var s string
if err := json.Unmarshal(b, &s); err != nil {
return err
}
*a = AnnounceList{s}
return nil
}

// URIInfo represents an element of response of aria2.getUris
type URIInfo struct {
URI string `json:"uri"` // URI
Expand Down