update release 1.0.1

yusanlou · Apr 8, 2017 · ee4f772 · ee4f772
1 parent 96ffd4b
commit ee4f772
Show file tree

Hide file tree

Showing 3 changed files with 71 additions and 9 deletions.
diff --git a/Sources/commandService/DataService.swift b/Sources/commandService/DataService.swift
@@ -81,11 +81,6 @@ class listNode {
             tail = tail!.next
         }
     }
-
-    func deleteNode() {
-
-    }
-
 }
 
 class linkNode {
@@ -103,9 +98,28 @@ class linkNode {
 
 class Values {
     let localizedString : String
-    let comment : String
+    var comment : String
+    var outPutStr : String
     init(value:String,comment:String) {
         self.localizedString = value
         self.comment = comment
+        outPutStr = "/* */"
+    }
+
+    func appendClassComent(className:String,comStr:String) {
+        if !outPutStr.contains(className) {
+            var insertStr = " \(className):\(comStr) | "
+            outPutStr.insert(contentsOf: insertStr.characters, at: outPutStr.index(outPutStr.startIndex, offsetBy: 2))
+            print(outPutStr)
+
+        }
     }
+
+}
+
+func isSameValues(_ value1:Values,value2:Values) -> Bool{
+    let judge1 = value1.localizedString == value2.localizedString
+    let judge2 = value1.comment == value2.comment
+
+    return (judge1 && judge2)
 }
diff --git a/Sources/commandService/commandTool.swift b/Sources/commandService/commandTool.swift
@@ -55,9 +55,13 @@ extension RegexStringsSearcher {
                 if strMatches.count > 1 {
                     commont = NSString(string: extracted).substring(with: strMatches[1].rangeAt(0))
                 }
+                let value = Values.init(value: localizedString, comment: "\(commont)")
+                value.appendClassComent(className: path.lastComponentWithoutExtension, comStr: commont)
 
-                let value = Values.init(value: localizedString, comment: "/* \(path.lastComponentWithoutExtension) : \(commont) */")
+                guard duplicateRemoval(path: path, value: value,className:path.lastComponentWithoutExtension) else {continue}
 
+                let judge = !extracts.contains{isSameValues($0, value2: value)}
+                guard judge else {continue}
                 /// over here, if localizedString is isAmbiguous,we analysis error
                 if localizedString.isAmbiguous {
                     errors.append(value)
@@ -67,6 +71,7 @@ extension RegexStringsSearcher {
             }
             if extracts.count > 0 {
                 if path.lastComponent.contains("swift") {
+
                     DataHandleManager.defaltManager.swift_listNode?.insert(values: extracts, className: path.lastComponent, path: path.description)
                 }else{
                     DataHandleManager.defaltManager.oc_listNode?.insert(values: extracts, className: path.lastComponent, path: path.description)
@@ -82,6 +87,35 @@ extension RegexStringsSearcher {
 
 }
 
+/**
+ Duplicate removal
+ 
+ - parameter value
+ 
+ - returns: if there is no same value return true
+ */
+func duplicateRemoval(path:Path,value:Values,className:String) -> Bool{
+
+    if path.lastComponent.contains("swift") {
+        return searchSame(link: DataHandleManager.defaltManager.swift_listNode!.head, value: value,className: className)
+    }
+        return searchSame(link: DataHandleManager.defaltManager.oc_listNode!.head, value: value,className:className)
+}
+
+// if there is no same value return true
+func searchSame(link:linkNode?,value:Values,className:String) -> Bool{
+    guard let _link = link else {return true}
+    let judge = _link.values.contains{isSameValues($0, value2:value)}
+    if judge {
+        _link.values.forEach({ (v) in
+            if isSameValues(v, value2: value){
+                v.appendClassComent(className: className, comStr: v.comment)
+            }
+        })
+        return false
+    }
+    return searchSame(link: _link.next, value: value,className: className)
+}
 
 protocol  RegexStringsWriter : StringsSearcher{
     func writeToLocalizable (to path:Path)
@@ -103,7 +137,7 @@ extension RegexStringsWriter {
             if let values = valuesOptial {
                 for value in values {
                     if !contentArr.contains(value.localizedString){
-                        content += "\n\(value.comment)\n\(value.localizedString) = \(value.localizedString);\n"
+                        content += "\n\(value.outPutStr)\n\(value.localizedString) = \(value.localizedString);\n"
                     }
                 }
             }
@@ -117,7 +151,7 @@ extension RegexStringsWriter {
             if let values = valuesOptial {
                 for value in values {
                     if !contentArr.contains(value.localizedString){
-                        content += "\n\(value.comment)\n\(value.localizedString) = \(value.localizedString);\n"
+                        content += "\n\(value.outPutStr)\n\(value.localizedString) = \(value.localizedString);\n"
                     }
                 }
             }

diff --git a/Tests/CommandLineToolTests/CommandLineBehaviorSpectre.swift b/Tests/CommandLineToolTests/CommandLineBehaviorSpectre.swift
@@ -106,6 +106,20 @@ public func CommandLineToolSpectre() {
             }
         }
 
+        $0.describe("value test func "){
+            $0.it("'isSame' function"){
+
+                let value1 = Values.init(value: "1111", comment: "")
+                let value2 = Values.init(value: "11111", comment: "")
+
+                let judge1 = value1.localizedString == value2.localizedString
+                let judge2 = value1.comment == value2.comment
+                print(judge1&&judge2)
+                print(isSameValues(value1, value2:value2))
+                try expect(isSameValues(value1, value2:value2)).to.beFalse()
+
+            }
+        }
 
 
     }