Prepare PR

Author: florian-agsteiner-caperwhite

LocalizationEditor.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		172274D420D933970036EA4E /* LocalizationGroup.swift in Sources */ = {isa = PBXBuildFile; fileRef = 172274D320D933970036EA4E /* LocalizationGroup.swift */; };
 		F3D9C94620BEC7460081830A /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D9C94520BEC7460081830A /* AppDelegate.swift */; };
 		F3D9C94820BEC7460081830A /* ViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = F3D9C94720BEC7460081830A /* ViewController.swift */; };
 		F3D9C94A20BEC7460081830A /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = F3D9C94920BEC7460081830A /* Assets.xcassets */; };
@@ -41,6 +42,7 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		172274D320D933970036EA4E /* LocalizationGroup.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LocalizationGroup.swift; sourceTree = "<group>"; };
 		F3D9C94220BEC7460081830A /* LocalizationEditor.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = LocalizationEditor.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		F3D9C94520BEC7460081830A /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		F3D9C94720BEC7460081830A /* ViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ViewController.swift; sourceTree = "<group>"; };
@@ -110,6 +112,7 @@
 		F3D9C95520BEC9E30081830A /* Models */ = {
 			isa = PBXGroup;
 			children = (
+				172274D320D933970036EA4E /* LocalizationGroup.swift */,
 				F3D9C95620BEC9F10081830A /* LocalizationString.swift */,
 				F3D9C95820BECA270081830A /* Localization.swift */,
 			);
@@ -231,6 +234,7 @@
 				F3D9C94820BEC7460081830A /* ViewController.swift in Sources */,
 				F3D9C96720BEDF640081830A /* KeyCell.swift in Sources */,
 				F3D9C95720BEC9F10081830A /* LocalizationString.swift in Sources */,
+				172274D420D933970036EA4E /* LocalizationGroup.swift in Sources */,
 				F3D9C95C20BECDBF0081830A /* LocalizationProvider.swift in Sources */,
 				F3D9C96E20BEEAA10081830A /* LocalizationsDataSource.swift in Sources */,
 				F3D9C95920BECA270081830A /* Localization.swift in Sources */,

LocalizationEditor/Models/LocalizationGroup.swift

@@ -0,0 +1,27 @@
+//
+//  LocalizationGroup.swift
+//  LocalizationEditor
+//
+//  Created by Florian Agsteiner on 19.06.18.
+//  Copyright © 2018 Igor Kulman. All rights reserved.
+//
+
+import Foundation
+
+class LocalizationGroup {
+    let name: String
+    let path: String
+    let localizations : [Localization]
+    
+    init(name: String, localizations: [Localization], path: String) {
+        self.name = name
+        self.localizations = localizations
+        self.path = path
+    }
+}
+
+extension LocalizationGroup: CustomStringConvertible {
+    var description: String {
+        return name
+    }
+}

LocalizationEditor/Providers/LocalizationProvider.swift

@@ -13,23 +13,26 @@ import Foundation
 class LocalizationProvider {
     private let ignoredDirectories = ["Carthage", "build", ".framework"]
 
-    func getLocalizations(url: URL) -> [Localization] {
+    func getLocalizations(url: URL) -> [LocalizationGroup] {
         Log.debug?.message("Searching \(url) for Localizable.strings")
 
         guard let folder = try? Folder(path: url.path) else {
             return []
         }
 
-        let localizationFiles = folder.makeFileSequence(recursive: true).filter { file in
-            return file.name == "Localizable.strings" && ignoredDirectories.map({file.path.contains("\($0)/")}).filter({$0}).count == 0
-        }
-
+        let localizationFiles = Dictionary(grouping: folder.makeFileSequence(recursive: true).filter { file in
+            return file.name.hasSuffix(".strings") && ignoredDirectories.map({file.path.contains("\($0)/")}).filter({$0}).count == 0
+        }, by: {$0.path.components(separatedBy:"/").filter({!$0.hasSuffix(".lproj")}).joined(separator:"/")})
+        
         Log.debug?.message("Found \(localizationFiles) localization files")
-
-        return localizationFiles.map({ file in
-            let parts = file.path.split(separator: "/")
-            let lang = String(parts[parts.count - 2]).replacingOccurrences(of: ".lproj", with: "")
-            return Localization(language: lang, translations: getLocalizationStrings(path: file.path), path: file.path)
+        
+        return localizationFiles.map({ (path, files) in
+            let name = URL(fileURLWithPath: path).lastPathComponent
+            return LocalizationGroup(name: name, localizations: files.map({ file in
+                let parts = file.path.split(separator: "/")
+                let lang = String(parts[parts.count - 2]).replacingOccurrences(of: ".lproj", with: "")
+                return Localization(language: lang, translations: getLocalizationStrings(path: file.path), path: file.path)
+            }), path: path)
         })
     }
 

LocalizationEditor/Providers/LocalizationsDataSource.swift

@@ -13,6 +13,7 @@ class LocalizationsDataSource: NSObject, NSTableViewDataSource {
 
     // MARK: - Properties
 
+    private var localizationGroup: LocalizationGroup? = nil
     private var localizations: [Localization] = []
     private var masterLocalization: Localization?
     private let localizationProvider = LocalizationProvider()
@@ -22,7 +23,9 @@ class LocalizationsDataSource: NSObject, NSTableViewDataSource {
 
     func load(folder: URL, onCompletion: @escaping ([String]) -> Void) {
         DispatchQueue.global(qos: .background).async {
-            self.localizations = self.localizationProvider.getLocalizations(url: folder)
+            
+            self.localizationGroup = self.localizationProvider.getLocalizations(url: folder).filter({$0.name == "Localizable.strings" }).first
+            self.localizations = self.localizationGroup?.localizations ?? []
             self.numberOfKeys = self.localizations.map({ $0.translations.count }).max() ?? 0
             self.masterLocalization = self.localizations.first(where: { $0.translations.count == self.numberOfKeys })