Merge pull request #292 from NigelWu95/dev

add single check by key to avoid dangerous process for whole bucket.

Author: 吴炳亨

Makefile

@@ -1,4 +1,4 @@
-version=8.3.14
+version=8.3.15
 
 package_no_test:
 	mvn package -Dmaven.test.skip=true
@@ -18,6 +18,6 @@ clean:
 	mvn clean
 
 build:
-	mvn package -Dmaven.test.skip=true
 	[ -d ~/.qsuits ] || mkdir ~/.qsuits
-	cp target/qsuits-$(version)-jar-with-dependencies.jar ~/.qsuits/qsuits-$(version).jar
+	[ -f target/qsuits-$(version)-jar-with-dependencies.jar ] || mvn package -Dmaven.test.skip=true
+	[ -f ~/.qsuits/qsuits-$(version).jar ] || cp target/qsuits-$(version)-jar-with-dependencies.jar ~/.qsuits/qsuits-$(version).jar

pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>com.qiniu</groupId>
     <artifactId>qsuits</artifactId>
-    <version>8.3.14</version>
+    <version>8.3.15</version>
     <name>qsuits</name>
     <description>qiniu-suits is a efficient tools for qiniu api implemented by java8.</description>
     <url>https://github.com/NigelWu95/qiniu-suits-java</url>

src/main/java/com/qiniu/entry/CommonParams.java

@@ -236,13 +236,32 @@ public CommonParams(Map<String, String> paramsMap) throws Exception {
             mapLine = new HashMap<>();
         }
         switch (process) {
+            case "delete":
+            case "status":
+            case "lifecycle":
+                if (!fromLine) mapLine.put("key", entryParam.getValue("key", entryParam.getParamsMap().containsKey("key") ? "" : null));
+                break;
             case "copy":
             case "move":
             case "rename":
                 if (!fromLine) mapLine.put("key", entryParam.getValue("key", entryParam.getParamsMap().containsKey("key") ? "" : null));
                 indexMap.put("toKey", "toKey");
                 mapLine.put("toKey", entryParam.getValue("to-key", entryParam.getParamsMap().containsKey("to-key") ? "" : null));
                 break;
+            case "stat":
+                if (!fromLine) mapLine.put("key", entryParam.getValue("key", entryParam.getParamsMap().containsKey("key") ? "" : null));
+                saveFormat = entryParam.getValue("save-format", "tab").trim();
+                ParamsUtils.checked(saveFormat, "save-format", "(csv|tab|json)");
+                setSaveSeparator();
+                break;
+            case "mime":
+                if (!fromLine) mapLine.put("key", entryParam.getValue("key", entryParam.getParamsMap().containsKey("key") ? "" : null));
+                String mime = entryParam.getValue("mime", "").trim();
+                if (!"".equals(mime)) {
+                    indexMap.put("mime", "mime");
+                    mapLine.put("mime", mime);
+                }
+                break;
             case "download":
             case "fetch":
             case "asyncfetch":
@@ -298,12 +317,6 @@ public CommonParams(Map<String, String> paramsMap) throws Exception {
                     mapLine.put("id", id);
                 }
                 break;
-            case "stat":
-                if (!fromLine) mapLine.put("key", entryParam.getValue("key"));
-                saveFormat = entryParam.getValue("save-format", "tab").trim();
-                ParamsUtils.checked(saveFormat, "save-format", "(csv|tab|json)");
-                setSaveSeparator();
-                break;
             case "qupload":
                 String key = entryParam.getValue("key", entryParam.getParamsMap().containsKey("key") ? "" : null);
                 if (!fromLine) mapLine.put("key", key);
@@ -315,14 +328,6 @@ public CommonParams(Map<String, String> paramsMap) throws Exception {
                     throw new IOException("filepath and key shouldn't all be empty, file must be found with them.");
                 }
                 break;
-            case "mime":
-                if (!fromLine) mapLine.put("key", entryParam.getValue("key"));
-                String mime = entryParam.getValue("mime", "").trim();
-                if (!"".equals(mime)) {
-                    indexMap.put("mime", "mime");
-                    mapLine.put("mime", mime);
-                }
-                break;
             default: if (!fromLine) mapLine.put("key", entryParam.getValue("key"));
                 break;
         }

src/main/java/com/qiniu/entry/EntryMain.java

@@ -65,6 +65,7 @@ public static void main(String[] args) throws Exception {
         }
         if (paramsMap.containsKey("verify")) processVerify = Boolean.parseBoolean(paramsMap.get("verify"));
         boolean single = paramsMap.containsKey("single") && Boolean.parseBoolean(paramsMap.get("single"));
+        if (!single && paramsMap.containsKey("key") && !paramsMap.containsKey("path")) single = true;
         boolean interactive = paramsMap.containsKey("interactive") && Boolean.parseBoolean(paramsMap.get("interactive"));
         CommonParams commonParams = single ? new CommonParams(paramsMap) : new CommonParams(entryParam);
         QSuitsEntry qSuitsEntry = new QSuitsEntry(entryParam, commonParams);
@@ -74,7 +75,13 @@ public static void main(String[] args) throws Exception {
             String process = processor.getProcessName();
             if (processor.getNextProcessor() != null) process = processor.getNextProcessor().getProcessName();
             if (ProcessUtils.isDangerous(process)) {
-                System.out.println("your last process is " + process + ", are you sure? (y/n): ");
+                if (single) {
+                    System.out.println("your process is " + process + ", are you sure? (y/n): ");
+                } else {
+                    String path = paramsMap.get("path");
+                    if (path == null || "".equals(path)) path = "qiniu://" + paramsMap.get("bucket");
+                    System.out.println("your last process is " + process + " for " + path + ", are you sure? (y/n): ");
+                }
                 Scanner scanner = new Scanner(System.in);
                 String an = scanner.next();
                 if (!an.equalsIgnoreCase("y") && !an.equalsIgnoreCase("yes")) {

version.properties

@@ -1 +1 @@
-version=8.3.14
+version=8.3.15