v3.5.4

shineorg · Aug 18, 2018 · e403a71 · e403a71
1 parent eb5f66a
commit e403a71
Show file tree

Hide file tree

Showing 8 changed files with 36 additions and 22 deletions.
diff --git a/.github/RELEASE_TEMPLATE.md b/.github/RELEASE_TEMPLATE.md
@@ -1,11 +1,10 @@
 # 更新日志: 
 
-1. 修复下载进度超出100%;
-2. 修复修改文件夹名称导致文件夹消失;
-3. 修复上传失败不输出错误;
-4. 下载支持以流式文件的方式下载;
-5. ls列目录，增加详细显示选项;
-6. emm...;
+1. 修复若干问题;
+2. 支持2gb以上的文件上传了;
+3. 支持多个文件并行下载;
+4. 增加清空控制台命令;
+5. 支持搜索文件;
 
 个人项目bug在所难免! 欢迎提 issue 和 pull request!!.
 
@@ -28,10 +27,6 @@
 * 移动设备: 
  请选择对应的系统(android, darwin(ios系统)), 对应的CPU架构 (一般情况下是 arm, 除了少数手机的CPU架构要选 amd, 例如联想K800, 联想K900等), 对应的CPU或操作系统位数 (详见上表), 下载.
 
-* mips: 
- 请选择对应的CPU架构, 对应的CPU或操作系统位数 (详见上表), 下载.
- 需要启用fpu才可以正常运行程序, 否则可能会出现 `Illegal instruction` 错误.
-
 ## 注意
 
 相关的关键词, 均能在文件名中找到. 

diff --git a/README.md b/README.md
@@ -312,6 +312,9 @@ BaiduPCS-Go meta /
 ## 搜索文件
 
 按文件名搜索文件（不支持查找目录）。
+
+默认在当前工作目录搜索.
+
 ```
 BaiduPCS-Go search [-path=<需要检索的目录>] [-r] <关键字>
 ```
@@ -452,6 +455,10 @@ BaiduPCS-Go ep <文件/目录1> <文件/目录2> ...
 
 导出网盘内的文件或目录, 原理为秒传文件, 此操作会生成导出文件或目录的命令.
 
+#### 注意
+
+并不是所有的文件都能导出成功, 程序会列出无法导出的文件列表
+
 #### 例子:
 ```
 # 导出当前工作目录:

diff --git a/build.sh b/build.sh
@@ -4,7 +4,7 @@ name="BaiduPCS-Go"
 version=$1
 
 if [ "$1" = "" ];then
- version=v3.5.3
+ version=v3.5.4
 fi
 
 output="out/"
@@ -61,6 +61,9 @@ RicePack() {
  rice -i github.com/iikira/BaiduPCS-Go/internal/pcsweb append --exec "$output/$1/$2"
 }
 
+GOMIPS=softfloat Build $name-$version"-linux-mipsle" linux mipsle
+exit
+
 # Android
 export NDK_INSTALL=$ANDROID_NDK_ROOT/bin
 # CC=$NDK_INSTALL/arm-linux-androideabi-4.9/bin/arm-linux-androideabi-gcc ArmBuild $name-$version"-android-16-armv5" android arm 5
@@ -88,9 +91,9 @@ Build $name-$version"-linux-amd64" linux amd64
 Build $name-$version"-linux-armv5" linux arm 5
 Build $name-$version"-linux-armv7" linux arm 7
 Build $name-$version"-linux-arm64" linux arm64
-Build $name-$version"-linux-mips" linux mips
+GOMIPS=softfloat Build $name-$version"-linux-mips" linux mips
 Build $name-$version"-linux-mips64" linux mips64
-Build $name-$version"-linux-mipsle" linux mipsle
+GOMIPS=softfloat Build $name-$version"-linux-mipsle" linux mipsle
 Build $name-$version"-linux-mips64le" linux mips64le
 # Build $name-$version"-linux-ppc64" linux ppc64
 # Build $name-$version"-linux-ppc64le" linux ppc64le

diff --git a/debian/iphoneos-arm/control b/debian/iphoneos-arm/control
@@ -1,5 +1,5 @@
 Package: BaiduPCS-Go
-Version: 3.5.3
+Version: 3.5.4
 Homepage: https://github.com/iikira/BaiduPCS-Go
 Section: 实用工具
 Priority: optional

diff --git a/internal/pcscommand/ls_search.go b/internal/pcscommand/ls_search.go
@@ -76,11 +76,19 @@ func RunSearch(targetPath, keyword string, opt *SearchOptions) {
 func renderTable(op int, isTotal bool, path string, files baidupcs.FileDirectoryList) {
  tb := pcstable.NewTable(os.Stdout)
  var (
- fN, dN int64
+ fN, dN int64
+ showPath string
  )
 
+ switch op {
+ case opLs:
+ showPath = "文件(目录)"
+ case opSearch:
+ showPath = "路径"
+ }
+
  if isTotal {
- tb.SetHeader([]string{"#", "fs_id", "文件大小", "创建日期", "修改日期", "md5(截图请打码)", "文件(目录)"})
+ tb.SetHeader([]string{"#", "fs_id", "文件大小", "创建日期", "修改日期", "md5(截图请打码)", showPath})
  tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_RIGHT, tablewriter.ALIGN_RIGHT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
  for k, file := range files {
  if file.Isdir {
@@ -105,7 +113,7 @@ func renderTable(op int, isTotal bool, path string, files baidupcs.FileDirectory
  fN, dN = files.Count()
  tb.Append([]string{"", "", "总: " + converter.ConvertFileSize(files.TotalSize(), 2), "", "", "", fmt.Sprintf("文件总数: %d, 目录总数: %d", fN, dN)})
  } else {
- tb.SetHeader([]string{"#", "文件大小", "修改日期", "文件(目录)"})
+ tb.SetHeader([]string{"#", "文件大小", "修改日期", showPath})
  tb.SetColumnAlignment([]int{tablewriter.ALIGN_DEFAULT, tablewriter.ALIGN_RIGHT, tablewriter.ALIGN_LEFT, tablewriter.ALIGN_LEFT})
  for k, file := range files {
  if file.Isdir {

diff --git a/main.go b/main.go
@@ -37,7 +37,7 @@ import (
 
 var (
  // Version 版本号
- Version = "v3.5.3-devel"
+ Version = "v3.5.4-devel"
 
  historyFilePath = filepath.Join(pcsconfig.GetConfigDir(), "pcs_command_history.txt")
  reloadFn = func(c *cli.Context) error {
@@ -756,6 +756,7 @@ func main() {
  UsageText: app.Name + " search [-path=<需要检索的目录>] [-r] 关键字",
  Description: `
  按文件名搜索文件（不支持查找目录）。
+ 默认在当前工作目录搜索.
 
  示例:
 

diff --git a/resource_windows.syso b/resource_windows.syso
diff --git a/versioninfo.json b/versioninfo.json
@@ -3,13 +3,13 @@
  "FileVersion": {
  "Major": 3,
  "Minor": 5,
- "Patch": 3,
+ "Patch": 4,
  "Build": 0
  },
  "ProductVersion": {
  "Major": 3,
  "Minor": 5,
- "Patch": 3,
+ "Patch": 4,
  "Build": 0
  },
  "FileFlagsMask": "3f",
@@ -22,14 +22,14 @@
  "Comments": "",
  "CompanyName": "iikira",
  "FileDescription": "百度网盘客户端",
- "FileVersion": "v3.5.3",
+ "FileVersion": "v3.5.4",
  "InternalName": "",
  "LegalCopyright": "© 2016-2018 iikira.",
  "LegalTrademarks": "",
  "OriginalFilename": "",
  "PrivateBuild": "",
  "ProductName": "BaiduPCS-Go",
- "ProductVersion": "v3.5.3",
+ "ProductVersion": "v3.5.4",
  "SpecialBuild": ""
  },
  "VarFileInfo": {