Skip to content

Commit 48926cf

Browse files
mac-cain13mac-cain13
committed
Merge branch 'develop'
2 parents 295b34f + 169464f commit 48926cf

File tree

7 files changed

+216
-163
lines changed

7 files changed

+216
-163
lines changed

‎TypedImages.xcodeproj/project.pbxproj ‎R.swift.xcodeproj/project.pbxproj

+48-40
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,13 @@
77
objects = {
88

99
/* Begin PBXBuildFile section */
10-
D5EF81E81A3A174A00A38927 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5EF81E71A3A174A00A38927 /* main.swift */; };
10+
D5EA0DF81A3DF45600FFEBC4 /* main.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5EA0DF71A3DF45600FFEBC4 /* main.swift */; };
11+
D5EA0DFF1A3DF4E300FFEBC4 /* util.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5EA0DFE1A3DF4E300FFEBC4 /* util.swift */; };
12+
D5F105FF1A3E2BC30077263A /* func.swift in Sources */ = {isa = PBXBuildFile; fileRef = D5F105FE1A3E2BC30077263A /* func.swift */; };
1113
/* End PBXBuildFile section */
1214

1315
/* Begin PBXCopyFilesBuildPhase section */
14-
D5EF81E21A3A174A00A38927 /* CopyFiles */ = {
16+
D5EA0DF21A3DF45600FFEBC4 /* CopyFiles */ = {
1517
isa = PBXCopyFilesBuildPhase;
1618
buildActionMask = 2147483647;
1719
dstPath = /usr/share/man/man1/;
@@ -23,12 +25,14 @@
2325
/* End PBXCopyFilesBuildPhase section */
2426

2527
/* Begin PBXFileReference section */
26-
D5EF81E41A3A174A00A38927 /* TypedImages */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = TypedImages; sourceTree = BUILT_PRODUCTS_DIR; };
27-
D5EF81E71A3A174A00A38927 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
28+
D5EA0DF41A3DF45600FFEBC4 /* rswift */ = {isa = PBXFileReference; explicitFileType = "compiled.mach-o.executable"; includeInIndex = 0; path = rswift; sourceTree = BUILT_PRODUCTS_DIR; };
29+
D5EA0DF71A3DF45600FFEBC4 /* main.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = main.swift; sourceTree = "<group>"; };
30+
D5EA0DFE1A3DF4E300FFEBC4 /* util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = util.swift; sourceTree = "<group>"; };
31+
D5F105FE1A3E2BC30077263A /* func.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = func.swift; sourceTree = "<group>"; };
2832
/* End PBXFileReference section */
2933

3034
/* Begin PBXFrameworksBuildPhase section */
31-
D5EF81E11A3A174A00A38927 /* Frameworks */ = {
35+
D5EA0DF11A3DF45600FFEBC4 /* Frameworks */ = {
3236
isa = PBXFrameworksBuildPhase;
3337
buildActionMask = 2147483647;
3438
files = (
@@ -38,94 +42,98 @@
3842
/* End PBXFrameworksBuildPhase section */
3943

4044
/* Begin PBXGroup section */
41-
D5EF81DB1A3A174A00A38927 = {
45+
D5EA0DEB1A3DF45600FFEBC4 = {
4246
isa = PBXGroup;
4347
children = (
44-
D5EF81E61A3A174A00A38927 /* TypedImages */,
45-
D5EF81E51A3A174A00A38927 /* Products */,
48+
D5EA0DF61A3DF45600FFEBC4 /* R.swift */,
49+
D5EA0DF51A3DF45600FFEBC4 /* Products */,
4650
);
4751
sourceTree = "<group>";
4852
};
49-
D5EF81E51A3A174A00A38927 /* Products */ = {
53+
D5EA0DF51A3DF45600FFEBC4 /* Products */ = {
5054
isa = PBXGroup;
5155
children = (
52-
D5EF81E41A3A174A00A38927 /* TypedImages */,
56+
D5EA0DF41A3DF45600FFEBC4 /* rswift */,
5357
);
5458
name = Products;
5559
sourceTree = "<group>";
5660
};
57-
D5EF81E61A3A174A00A38927 /* TypedImages */ = {
61+
D5EA0DF61A3DF45600FFEBC4 /* R.swift */ = {
5862
isa = PBXGroup;
5963
children = (
60-
D5EF81E71A3A174A00A38927 /* main.swift */,
64+
D5EA0DF71A3DF45600FFEBC4 /* main.swift */,
65+
D5F105FE1A3E2BC30077263A /* func.swift */,
66+
D5EA0DFE1A3DF4E300FFEBC4 /* util.swift */,
6167
);
62-
path = TypedImages;
68+
path = R.swift;
6369
sourceTree = "<group>";
6470
};
6571
/* End PBXGroup section */
6672

6773
/* Begin PBXNativeTarget section */
68-
D5EF81E31A3A174A00A38927 /* TypedImages */ = {
74+
D5EA0DF31A3DF45600FFEBC4 /* rswift */ = {
6975
isa = PBXNativeTarget;
70-
buildConfigurationList = D5EF81EB1A3A174A00A38927 /* Build configuration list for PBXNativeTarget "TypedImages" */;
76+
buildConfigurationList = D5EA0DFB1A3DF45600FFEBC4 /* Build configuration list for PBXNativeTarget "rswift" */;
7177
buildPhases = (
72-
D5EF81E01A3A174A00A38927 /* Sources */,
73-
D5EF81E11A3A174A00A38927 /* Frameworks */,
74-
D5EF81E21A3A174A00A38927 /* CopyFiles */,
78+
D5EA0DF01A3DF45600FFEBC4 /* Sources */,
79+
D5EA0DF11A3DF45600FFEBC4 /* Frameworks */,
80+
D5EA0DF21A3DF45600FFEBC4 /* CopyFiles */,
7581
);
7682
buildRules = (
7783
);
7884
dependencies = (
7985
);
80-
name = TypedImages;
81-
productName = TypedImages;
82-
productReference = D5EF81E41A3A174A00A38927 /* TypedImages */;
86+
name = rswift;
87+
productName = R.swift;
88+
productReference = D5EA0DF41A3DF45600FFEBC4 /* rswift */;
8389
productType = "com.apple.product-type.tool";
8490
};
8591
/* End PBXNativeTarget section */
8692

8793
/* Begin PBXProject section */
88-
D5EF81DC1A3A174A00A38927 /* Project object */ = {
94+
D5EA0DEC1A3DF45600FFEBC4 /* Project object */ = {
8995
isa = PBXProject;
9096
attributes = {
9197
LastUpgradeCheck = 0610;
9298
ORGANIZATIONNAME = "Mathijs Kadijk";
9399
TargetAttributes = {
94-
D5EF81E31A3A174A00A38927 = {
100+
D5EA0DF31A3DF45600FFEBC4 = {
95101
CreatedOnToolsVersion = 6.1.1;
96102
};
97103
};
98104
};
99-
buildConfigurationList = D5EF81DF1A3A174A00A38927 /* Build configuration list for PBXProject "TypedImages" */;
105+
buildConfigurationList = D5EA0DEF1A3DF45600FFEBC4 /* Build configuration list for PBXProject "R.swift" */;
100106
compatibilityVersion = "Xcode 3.2";
101107
developmentRegion = English;
102108
hasScannedForEncodings = 0;
103109
knownRegions = (
104110
en,
105111
);
106-
mainGroup = D5EF81DB1A3A174A00A38927;
107-
productRefGroup = D5EF81E51A3A174A00A38927 /* Products */;
112+
mainGroup = D5EA0DEB1A3DF45600FFEBC4;
113+
productRefGroup = D5EA0DF51A3DF45600FFEBC4 /* Products */;
108114
projectDirPath = "";
109115
projectRoot = "";
110116
targets = (
111-
D5EF81E31A3A174A00A38927 /* TypedImages */,
117+
D5EA0DF31A3DF45600FFEBC4 /* rswift */,
112118
);
113119
};
114120
/* End PBXProject section */
115121

116122
/* Begin PBXSourcesBuildPhase section */
117-
D5EF81E01A3A174A00A38927 /* Sources */ = {
123+
D5EA0DF01A3DF45600FFEBC4 /* Sources */ = {
118124
isa = PBXSourcesBuildPhase;
119125
buildActionMask = 2147483647;
120126
files = (
121-
D5EF81E81A3A174A00A38927 /* main.swift in Sources */,
127+
D5EA0DF81A3DF45600FFEBC4 /* main.swift in Sources */,
128+
D5EA0DFF1A3DF4E300FFEBC4 /* util.swift in Sources */,
129+
D5F105FF1A3E2BC30077263A /* func.swift in Sources */,
122130
);
123131
runOnlyForDeploymentPostprocessing = 0;
124132
};
125133
/* End PBXSourcesBuildPhase section */
126134

127135
/* Begin XCBuildConfiguration section */
128-
D5EF81E91A3A174A00A38927 /* Debug */ = {
136+
D5EA0DF91A3DF45600FFEBC4 /* Debug */ = {
129137
isa = XCBuildConfiguration;
130138
buildSettings = {
131139
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -166,7 +174,7 @@
166174
};
167175
name = Debug;
168176
};
169-
D5EF81EA1A3A174A00A38927 /* Release */ = {
177+
D5EA0DFA1A3DF45600FFEBC4 /* Release */ = {
170178
isa = XCBuildConfiguration;
171179
buildSettings = {
172180
ALWAYS_SEARCH_USER_PATHS = NO;
@@ -200,14 +208,14 @@
200208
};
201209
name = Release;
202210
};
203-
D5EF81EC1A3A174A00A38927 /* Debug */ = {
211+
D5EA0DFC1A3DF45600FFEBC4 /* Debug */ = {
204212
isa = XCBuildConfiguration;
205213
buildSettings = {
206214
PRODUCT_NAME = "$(TARGET_NAME)";
207215
};
208216
name = Debug;
209217
};
210-
D5EF81ED1A3A174A00A38927 /* Release */ = {
218+
D5EA0DFD1A3DF45600FFEBC4 /* Release */ = {
211219
isa = XCBuildConfiguration;
212220
buildSettings = {
213221
PRODUCT_NAME = "$(TARGET_NAME)";
@@ -217,25 +225,25 @@
217225
/* End XCBuildConfiguration section */
218226

219227
/* Begin XCConfigurationList section */
220-
D5EF81DF1A3A174A00A38927 /* Build configuration list for PBXProject "TypedImages" */ = {
228+
D5EA0DEF1A3DF45600FFEBC4 /* Build configuration list for PBXProject "R.swift" */ = {
221229
isa = XCConfigurationList;
222230
buildConfigurations = (
223-
D5EF81E91A3A174A00A38927 /* Debug */,
224-
D5EF81EA1A3A174A00A38927 /* Release */,
231+
D5EA0DF91A3DF45600FFEBC4 /* Debug */,
232+
D5EA0DFA1A3DF45600FFEBC4 /* Release */,
225233
);
226234
defaultConfigurationIsVisible = 0;
227235
defaultConfigurationName = Release;
228236
};
229-
D5EF81EB1A3A174A00A38927 /* Build configuration list for PBXNativeTarget "TypedImages" */ = {
237+
D5EA0DFB1A3DF45600FFEBC4 /* Build configuration list for PBXNativeTarget "rswift" */ = {
230238
isa = XCConfigurationList;
231239
buildConfigurations = (
232-
D5EF81EC1A3A174A00A38927 /* Debug */,
233-
D5EF81ED1A3A174A00A38927 /* Release */,
240+
D5EA0DFC1A3DF45600FFEBC4 /* Debug */,
241+
D5EA0DFD1A3DF45600FFEBC4 /* Release */,
234242
);
235243
defaultConfigurationIsVisible = 0;
236244
defaultConfigurationName = Release;
237245
};
238246
/* End XCConfigurationList section */
239247
};
240-
rootObject = D5EF81DC1A3A174A00A38927 /* Project object */;
248+
rootObject = D5EA0DEC1A3DF45600FFEBC4 /* Project object */;
241249
}

‎TypedImages.xcodeproj/project.xcworkspace/contents.xcworkspacedata ‎R.swift.xcodeproj/project.xcworkspace/contents.xcworkspacedata

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎R.swift/func.swift

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
//
2+
// func.swift
3+
// R.swift
4+
//
5+
// Created by Mathijs Kadijk on 14-12-14.
6+
// From: https://github.com/mac-cain13/R.swift
7+
// License: MIT License
8+
//
9+
10+
import Foundation
11+
12+
// MARK: Types
13+
14+
let ResourceFilename = "R.generated.swift"
15+
16+
struct AssetFolder {
17+
let name: String
18+
let imageAssets: [String]
19+
20+
init(url: NSURL, fileManager: NSFileManager) {
21+
name = url.filename!
22+
23+
let contents = fileManager.contentsOfDirectoryAtURL(url, includingPropertiesForKeys: nil, options: NSDirectoryEnumerationOptions.SkipsHiddenFiles, error: nil) as [NSURL]
24+
imageAssets = contents.map { $0.filename! }
25+
}
26+
}
27+
28+
// MARK: Functions
29+
30+
func inputDirectories(processInfo: NSProcessInfo) -> [NSURL] {
31+
return processInfo.arguments.skip(1).map { NSURL(fileURLWithPath: $0 as String)! }
32+
}
33+
34+
func filterDirectoryContentsRecursively(fileManager: NSFileManager, filter: (NSURL) -> Bool)(url: NSURL) -> [NSURL] {
35+
var assetFolders = [NSURL]()
36+
37+
if let enumerator = fileManager.enumeratorAtURL(url, includingPropertiesForKeys: [NSURLIsDirectoryKey], options: NSDirectoryEnumerationOptions.SkipsHiddenFiles|NSDirectoryEnumerationOptions.SkipsPackageDescendants, errorHandler: nil) {
38+
39+
while let enumeratorItem: AnyObject = enumerator.nextObject() {
40+
if let url = enumeratorItem as? NSURL {
41+
if filter(url) {
42+
assetFolders.append(url)
43+
enumerator.skipDescendants()
44+
}
45+
}
46+
}
47+
48+
}
49+
50+
return assetFolders
51+
}
52+
53+
func swiftStructForAssetFolder(assetFolder: AssetFolder) -> String {
54+
return distinct(assetFolder.imageAssets).reduce(" struct \(sanitizedSwiftName(assetFolder.name)) {\n") {
55+
$0 + " static var \(sanitizedSwiftName($1)): UIImage? { return UIImage(named: \"\($1)\") }\n"
56+
} + " } \n"
57+
}
58+
59+
func sanitizedSwiftName(name: String) -> String {
60+
var components = name.componentsSeparatedByString("-")
61+
let firstComponent = components.removeAtIndex(0)
62+
return components.reduce(firstComponent) { $0 + $1.capitalizedString }.lowercaseFirstCharacter
63+
}
64+
65+
func writeResourceFile(code: String, toFolderURL folderURL: NSURL) {
66+
let outputURL = folderURL.URLByAppendingPathComponent(ResourceFilename)
67+
code.writeToURL(outputURL, atomically: true, encoding: NSUTF8StringEncoding, error: nil)
68+
}

‎R.swift/main.swift

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
//
2+
// main.swift
3+
// R.swift
4+
//
5+
// Created by Mathijs Kadijk on 11-12-14.
6+
// From: https://github.com/mac-cain13/R.swift
7+
// License: MIT License
8+
//
9+
10+
import Foundation
11+
12+
let defaultFileManager = NSFileManager.defaultManager()
13+
let findAllAssetsFolderURLsInDirectory = filterDirectoryContentsRecursively(defaultFileManager) { $0.isDirectory && $0.absoluteString!.pathExtension == "xcassets" }
14+
15+
inputDirectories(NSProcessInfo.processInfo()).each { directory in
16+
let code = findAllAssetsFolderURLsInDirectory(url: directory)
17+
.map { AssetFolder(url: $0, fileManager: defaultFileManager) }
18+
.map(swiftStructForAssetFolder)
19+
.reduce("struct R {\n", +) + "}\n"
20+
21+
writeResourceFile(code, toFolderURL: directory)
22+
}

‎R.swift/util.swift

+57
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,57 @@
1+
//
2+
// util.swift
3+
// R.swift
4+
//
5+
// Created by Mathijs Kadijk on 12-12-14.
6+
// From: https://github.com/mac-cain13/R.swift
7+
// License: MIT License
8+
//
9+
10+
import Foundation
11+
12+
// MARK: Array operations
13+
14+
extension Array {
15+
func each(f: T -> Void) {
16+
map(f)
17+
}
18+
19+
func skip(items: Int) -> [T] {
20+
return Array(self[items..<count])
21+
}
22+
}
23+
24+
func distinct<T: Equatable>(source: [T]) -> [T] {
25+
var unique = [T]()
26+
for item in source {
27+
if !contains(unique, item) {
28+
unique.append(item)
29+
}
30+
}
31+
return unique
32+
}
33+
34+
// MARK: String operations
35+
36+
extension String {
37+
var lowercaseFirstCharacter: String {
38+
if countElements(self) <= 1 { return self.lowercaseString }
39+
let index = advance(startIndex, 1)
40+
return substringToIndex(index).lowercaseString + substringFromIndex(index)
41+
}
42+
}
43+
44+
// MARK: NSURL operations
45+
46+
extension NSURL {
47+
var isDirectory: Bool {
48+
var urlIsDirectoryValue: AnyObject?
49+
self.getResourceValue(&urlIsDirectoryValue, forKey: NSURLIsDirectoryKey, error: nil)
50+
51+
return urlIsDirectoryValue as? Bool ?? false
52+
}
53+
54+
var filename: String? {
55+
return lastPathComponent?.stringByDeletingPathExtension
56+
}
57+
}

0 commit comments

Comments
 (0)