diff --git a/Gopkg.lock b/Gopkg.lock index 30ab7b68..5dda0fdf 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -67,7 +67,7 @@ branch = "master" name = "github.com/iikira/downloader" packages = ["."] - revision = "64a054c294225ef2fab86232c9cd65c7121d65da" + revision = "c475c7d6e210afb2c94193552c9df5e9fa933c1b" [[projects]] branch = "master" diff --git a/assets/BaiduPCS-Go.ico b/assets/BaiduPCS-Go.ico new file mode 100644 index 00000000..140c898e Binary files /dev/null and b/assets/BaiduPCS-Go.ico differ diff --git a/assets/icon.ico b/assets/icon.ico deleted file mode 100644 index c28e8902..00000000 Binary files a/assets/icon.ico and /dev/null differ diff --git a/build.sh b/build.sh index 42ddebb3..93d41e2a 100644 --- a/build.sh +++ b/build.sh @@ -11,7 +11,7 @@ Build() { echo "Building $1..." export GOOS=$2 GOARCH=$3 GO386=sse2 CGO_ENABLED=0 if [ $2 = "windows" ];then - goversioninfo -icon=assets/icon.ico -manifest="$name".exe.manifest -product-name="$name" -file-version="$version" -product-version="$version" -company=iikira -copyright="© 2016-2018 iikira." -o=resource_windows.syso + goversioninfo -icon=assets/$name.ico -manifest="$name".exe.manifest -product-name="$name" -file-version="$version" -product-version="$version" -company=iikira -copyright="© 2016-2018 iikira." -o=resource_windows.syso go build -ldflags "-s -w" -o "$output/$1/$name.exe" RicePack $1 $name.exe else diff --git a/resource_windows.syso b/resource_windows.syso index a76b4066..3116b6bd 100644 Binary files a/resource_windows.syso and b/resource_windows.syso differ diff --git a/vendor/github.com/iikira/downloader/block.go b/vendor/github.com/iikira/downloader/block.go index 4d6da750..ffc891eb 100644 --- a/vendor/github.com/iikira/downloader/block.go +++ b/vendor/github.com/iikira/downloader/block.go @@ -18,13 +18,13 @@ var ( type Block struct { Begin int64 `json:"begin"` End int64 `json:"end"` + speed int64 // 速度 IsFinal bool `json:"isfinal"` // 最后线程, 因为最后的下载线程, 需要另外做处理 buf []byte // 缓冲 resp *http.Response - speed int64 // 速度 - running int // 线程的载入量 - waitingToWrite bool // 是否正在等待写入磁盘 + running int // 线程的载入量 + waitingToWrite bool // 是否正在等待写入磁盘 } // BlockList 下载区块列表 diff --git a/vendor/github.com/iikira/downloader/status.go b/vendor/github.com/iikira/downloader/status.go index b59e778d..3f2c9e20 100644 --- a/vendor/github.com/iikira/downloader/status.go +++ b/vendor/github.com/iikira/downloader/status.go @@ -10,17 +10,15 @@ import ( // Status 下载状态 type Status struct { - done bool // 是否已经结束, alignment, for 32-bit device - - TotalSize int64 `json:"total_size"` // 总大小 - blockUnsupport bool // 服务端是否支持断点续传, alignment - - Downloaded int64 `json:"downloaded"` // 已下载的数据量 - BlockList BlockList `json:"block_list"` // 下载区块列表 - - Speeds int64 `json:"-"` // 下载速度, 每秒 - MaxSpeeds int64 `json:"-"` // 最大下载速度 - TimeElapsed time.Duration `json:"-"` // 下载的时间 + TotalSize int64 `json:"total_size"` // 总大小 + Downloaded int64 `json:"downloaded"` // 已下载的数据量 + Speeds int64 `json:"-"` // 下载速度, 每秒 + MaxSpeeds int64 `json:"-"` // 最大下载速度 + + BlockList BlockList `json:"block_list"` // 下载区块列表 + TimeElapsed time.Duration `json:"-"` // 下载的时间 + blockUnsupport bool // 服务端是否支持断点续传 + done bool // 是否已经结束 } // GetStatusChan 返回 Status 对象的 channel diff --git a/versioninfo.json b/versioninfo.json index d09bfd52..90947d13 100644 --- a/versioninfo.json +++ b/versioninfo.json @@ -38,6 +38,6 @@ "CharsetID": "04B0" } }, - "IconPath": "assets/icon.ico", + "IconPath": "assets/BaiduPCS-Go.ico", "ManifestPath": "BaiduPCS-Go.exe.manifest" } \ No newline at end of file