Skip to content

Commit d4f4e04

Browse files
p2p2
committed
Added support for files separated by the pipe symbol
1 parent b7e7047 commit d4f4e04

File tree

6 files changed

+94
-93
lines changed

6 files changed

+94
-93
lines changed

‎CSVDocument.m

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
6464

6565
NSUInteger testStringLength = ([string length] > 200) ? 200 : [string length];
6666
NSString *testString = [string substringToIndex:testStringLength];
67-
NSArray *possSeparators = [NSArray arrayWithObjects:@";", @" ", nil];
67+
NSArray *possSeparators = [NSArray arrayWithObjects:@";", @" ", @"|", nil];
6868

6969
for (NSString *s in possSeparators) {
7070
if ([[testString componentsSeparatedByString:s] count] > [[testString componentsSeparatedByString:separator] count]) {
@@ -129,7 +129,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
129129
[currentCellString appendString:separator];
130130
}
131131
else { // This is a column separating comma
132-
[columns setObject:[currentCellString copy] forKey:colKey];
132+
[columns setObject:[[currentCellString copy] autorelease] forKey:colKey];
133133
if (isNewColumn) {
134134
[thisColumnKeys addObject:colKey];
135135
}
@@ -161,7 +161,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
161161
[currentCellString appendString:tempString];
162162
}
163163
else { // End of row
164-
[columns setObject:[currentCellString copy] forKey:colKey];
164+
[columns setObject:[[currentCellString copy] autorelease] forKey:colKey];
165165
if (isNewColumn) {
166166
[thisColumnKeys addObject:colKey];
167167
}
@@ -173,7 +173,7 @@ - (NSUInteger) numRowsFromCSVString:(NSString *)string maxRows:(NSUInteger)maxRo
173173

174174
// found the end
175175
else if ([scanner isAtEnd]) {
176-
[columns setObject:[currentCellString copy] forKey:colKey];
176+
[columns setObject:[[currentCellString copy] autorelease] forKey:colKey];
177177
if (isNewColumn) {
178178
[thisColumnKeys addObject:colKey];
179179
}

‎GeneratePreviewForURL.m

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ OSStatus GeneratePreviewForURL(void *thisInterface, QLPreviewRequestRef preview,
7878

7979
// info
8080
NSString *separatorDesc = [@" " isEqualToString:csvDoc.separator] ? @"Tab" :
81-
([@"," isEqualToString:csvDoc.separator] ? @"Comma" : csvDoc.separator);
81+
([@"," isEqualToString:csvDoc.separator] ? @"Comma" :
82+
([@"|" isEqualToString:csvDoc.separator] ? @"Pipe" : csvDoc.separator));
8283
NSString *numRows = (numRowsParsed > MAX_ROWS) ?
8384
[NSString stringWithFormat:@"%i+", MAX_ROWS] :
8485
[NSString stringWithFormat:@"%i", numRowsParsed];

‎INSTALL.rtf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
If the QuickLook-folder does not exist, simply create it manually.\
2121
\
2222
This is version
23-
\b 1.1
23+
\b 1.1.1
2424
\b0 of the plugin.\
2525
{\field{\*\fldinst{HYPERLINK "http://code.google.com/p/quicklook-csv/"}}{\fldrslt http://code.google.com/p/quicklook-csv/}}\
2626
}

‎Info.plist

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
<key>CFBundleShortVersionString</key>
7878
<string>1</string>
7979
<key>CFBundleVersion</key>
80-
<string>1.1</string>
80+
<string>1.1.1</string>
8181
<key>CFPlugInDynamicRegisterFunction</key>
8282
<string></string>
8383
<key>CFPlugInDynamicRegistration</key>

‎QuickLookCSV.xcodeproj/pp.pbxuser

Lines changed: 69 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -93,20 +93,20 @@
9393
PBXFileDataSource_Warnings_ColumnID,
9494
);
9595
};
96-
PBXPerProjectTemplateStateSaveDate = 289905960;
97-
PBXWorkspaceStateSaveDate = 289905960;
96+
PBXPerProjectTemplateStateSaveDate = 292234139;
97+
PBXWorkspaceStateSaveDate = 292234139;
9898
};
9999
perUserProjectItems = {
100100
EE009FB01133CE4E00312AD1 = EE009FB01133CE4E00312AD1 /* PlistBookmark */;
101-
EE009FB11133CE4E00312AD1 = EE009FB11133CE4E00312AD1 /* PBXTextBookmark */;
102-
EE009FB21133CE4E00312AD1 = EE009FB21133CE4E00312AD1 /* PBXTextBookmark */;
103-
EE009FB31133CE4E00312AD1 = EE009FB31133CE4E00312AD1 /* PBXTextBookmark */;
104101
EE2E1EFE105C37370016E6EB = EE2E1EFE105C37370016E6EB /* PBXTextBookmark */;
105102
EE2E1F01105C37370016E6EB = EE2E1F01105C37370016E6EB /* PBXTextBookmark */;
106-
EE2E1F02105C37370016E6EB = EE2E1F02105C37370016E6EB /* PBXTextBookmark */;
107-
EE2E1F03105C37370016E6EB = EE2E1F03105C37370016E6EB /* PBXTextBookmark */;
108103
EE2E1F05105C37370016E6EB = EE2E1F05105C37370016E6EB /* PBXTextBookmark */;
109-
EE3B87DC1112F45A00FE62FB = EE3B87DC1112F45A00FE62FB /* PBXTextBookmark */;
104+
EE5A62561147A10D00E79E92 = EE5A62561147A10D00E79E92 /* PBXTextBookmark */;
105+
EE5A62571147A10D00E79E92 = EE5A62571147A10D00E79E92 /* PBXTextBookmark */;
106+
EE5A62581147A10D00E79E92 = EE5A62581147A10D00E79E92 /* PBXTextBookmark */;
107+
EE5A62591147A10D00E79E92 = EE5A62591147A10D00E79E92 /* PBXTextBookmark */;
108+
EE5A62721147AB3600E79E92 = EE5A62721147AB3600E79E92 /* PBXTextBookmark */;
109+
EE5A62731147AB3600E79E92 = EE5A62731147AB3600E79E92 /* PBXTextBookmark */;
110110
EE8830A610013E43005590AE = EE8830A610013E43005590AE /* PBXTextBookmark */;
111111
EE8830A710013E43005590AE = EE8830A710013E43005590AE /* PBXTextBookmark */;
112112
EEA3A593104879AB00AA5FA8 = EEA3A593104879AB00AA5FA8 /* PBXTextBookmark */;
@@ -131,16 +131,16 @@
131131
};
132132
2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */ = {
133133
uiCtxt = {
134-
sepNavIntBoundsRect = "{{0, 0}, {1047, 3104}}";
135-
sepNavSelRange = "{1531, 5}";
136-
sepNavVisRange = "{414, 2069}";
134+
sepNavIntBoundsRect = "{{0, 0}, {1047, 3232}}";
135+
sepNavSelRange = "{3567, 0}";
136+
sepNavVisRange = "{2118, 2512}";
137137
};
138138
};
139139
61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */ = {
140140
uiCtxt = {
141-
sepNavIntBoundsRect = "{{0, 0}, {1047, 5008}}";
142-
sepNavSelRange = "{1633, 0}";
143-
sepNavVisRange = "{115, 1867}";
141+
sepNavIntBoundsRect = "{{0, 0}, {1047, 4768}}";
142+
sepNavSelRange = "{271, 50}";
143+
sepNavVisRange = "{0, 1820}";
144144
};
145145
};
146146
8D57630D048677EA00EA77CD /* QuickLookCSV */ = {
@@ -157,36 +157,6 @@
157157
rLen = 0;
158158
rLoc = 9223372036854775808;
159159
};
160-
EE009FB11133CE4E00312AD1 /* PBXTextBookmark */ = {
161-
isa = PBXTextBookmark;
162-
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
163-
name = "GeneratePreviewForURL.m: 62";
164-
rLen = 0;
165-
rLoc = 2121;
166-
rType = 0;
167-
vrLen = 1669;
168-
vrLoc = 2804;
169-
};
170-
EE009FB21133CE4E00312AD1 /* PBXTextBookmark */ = {
171-
isa = PBXTextBookmark;
172-
fRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */;
173-
name = "GenerateThumbnailForURL.m: 66";
174-
rLen = 0;
175-
rLoc = 2331;
176-
rType = 0;
177-
vrLen = 1906;
178-
vrLoc = 7241;
179-
};
180-
EE009FB31133CE4E00312AD1 /* PBXTextBookmark */ = {
181-
isa = PBXTextBookmark;
182-
fRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */;
183-
name = "GenerateThumbnailForURL.m: 212";
184-
rLen = 0;
185-
rLoc = 8580;
186-
rType = 0;
187-
vrLen = 1393;
188-
vrLoc = 9630;
189-
};
190160
EE2E1EFE105C37370016E6EB /* PBXTextBookmark */ = {
191161
isa = PBXTextBookmark;
192162
fRef = EEB3EDCE0FFE38D800B7462F /* CSVDocument.m */;
@@ -207,37 +177,57 @@
207177
vrLen = 200;
208178
vrLoc = 0;
209179
};
210-
EE2E1F02105C37370016E6EB /* PBXTextBookmark */ = {
180+
EE2E1F05105C37370016E6EB /* PBXTextBookmark */ = {
211181
isa = PBXTextBookmark;
212-
fRef = EE77BE9D0FFEB3F1008B09DE /* German */;
213-
name = "Localizable.strings: 12";
182+
fRef = EEB3EE850FFE513200B7462F /* Style.css */;
183+
name = "Style.css: 11";
214184
rLen = 0;
215-
rLoc = 298;
185+
rLoc = 343;
216186
rType = 0;
217-
vrLen = 347;
187+
vrLen = 828;
218188
vrLoc = 0;
219189
};
220-
EE2E1F03105C37370016E6EB /* PBXTextBookmark */ = {
190+
EE5A62561147A10D00E79E92 /* PBXTextBookmark */ = {
191+
isa = PBXTextBookmark;
192+
fRef = 61E3BCFA0870B4F2002186A0 /* GenerateThumbnailForURL.m */;
193+
name = "GenerateThumbnailForURL.m: 11";
194+
rLen = 50;
195+
rLoc = 271;
196+
rType = 0;
197+
vrLen = 1820;
198+
vrLoc = 0;
199+
};
200+
EE5A62571147A10D00E79E92 /* PBXTextBookmark */ = {
221201
isa = PBXTextBookmark;
222202
fRef = EE77BE4B0FFEB207008B09DE /* English */;
223-
name = "Localizable.strings: 10";
224-
rLen = 0;
225-
rLoc = 212;
203+
name = "Localizable.strings: 12";
204+
rLen = 31;
205+
rLoc = 255;
226206
rType = 0;
227-
vrLen = 359;
207+
vrLen = 441;
228208
vrLoc = 0;
229209
};
230-
EE2E1F05105C37370016E6EB /* PBXTextBookmark */ = {
210+
EE5A62581147A10D00E79E92 /* PBXTextBookmark */ = {
231211
isa = PBXTextBookmark;
232-
fRef = EEB3EE850FFE513200B7462F /* Style.css */;
233-
name = "Style.css: 11";
212+
fRef = EE77BE9D0FFEB3F1008B09DE /* German */;
213+
name = "Localizable.strings: 13";
234214
rLen = 0;
235-
rLoc = 343;
215+
rLoc = 288;
236216
rType = 0;
237-
vrLen = 828;
217+
vrLen = 443;
238218
vrLoc = 0;
239219
};
240-
EE3B87DC1112F45A00FE62FB /* PBXTextBookmark */ = {
220+
EE5A62591147A10D00E79E92 /* PBXTextBookmark */ = {
221+
isa = PBXTextBookmark;
222+
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
223+
name = "GeneratePreviewForURL.m: 89";
224+
rLen = 0;
225+
rLoc = 3567;
226+
rType = 0;
227+
vrLen = 2013;
228+
vrLoc = 3097;
229+
};
230+
EE5A62721147AB3600E79E92 /* PBXTextBookmark */ = {
241231
isa = PBXTextBookmark;
242232
fRef = EE883106100141B9005590AE /* INSTALL.rtf */;
243233
name = "INSTALL.rtf: 8";
@@ -247,18 +237,28 @@
247237
vrLen = 332;
248238
vrLoc = 0;
249239
};
240+
EE5A62731147AB3600E79E92 /* PBXTextBookmark */ = {
241+
isa = PBXTextBookmark;
242+
fRef = 2C05A19B06CAA52B00D84F6F /* GeneratePreviewForURL.m */;
243+
name = "GeneratePreviewForURL.m: 89";
244+
rLen = 0;
245+
rLoc = 3567;
246+
rType = 0;
247+
vrLen = 2107;
248+
vrLoc = 2919;
249+
};
250250
EE77BE4B0FFEB207008B09DE /* English */ = {
251251
uiCtxt = {
252-
sepNavIntBoundsRect = "{{0, 0}, {1027, 769}}";
253-
sepNavSelRange = "{212, 0}";
254-
sepNavVisRange = "{0, 359}";
252+
sepNavIntBoundsRect = "{{0, 0}, {1047, 844}}";
253+
sepNavSelRange = "{255, 31}";
254+
sepNavVisRange = "{0, 441}";
255255
};
256256
};
257257
EE77BE9D0FFEB3F1008B09DE /* German */ = {
258258
uiCtxt = {
259-
sepNavIntBoundsRect = "{{0, 0}, {1027, 769}}";
260-
sepNavSelRange = "{298, 0}";
261-
sepNavVisRange = "{0, 347}";
259+
sepNavIntBoundsRect = "{{0, 0}, {1047, 844}}";
260+
sepNavSelRange = "{288, 0}";
261+
sepNavVisRange = "{0, 443}";
262262
};
263263
};
264264
EE8830A610013E43005590AE /* PBXTextBookmark */ = {
@@ -283,9 +283,9 @@
283283
};
284284
EE883106100141B9005590AE /* INSTALL.rtf */ = {
285285
uiCtxt = {
286-
sepNavIntBoundsRect = "{{0, 0}, {1029, 768}}";
286+
sepNavIntBoundsRect = "{{0, 0}, {1049, 844}}";
287287
sepNavSelRange = "{276, 0}";
288-
sepNavVisRect = "{{0, 0}, {1029, 768}}";
288+
sepNavVisRect = "{{0, 0}, {1049, 844}}";
289289
};
290290
};
291291
EEA3A593104879AB00AA5FA8 /* PBXTextBookmark */ = {
@@ -314,7 +314,7 @@
314314
};
315315
EEB3EDCD0FFE38D800B7462F /* CSVDocument.h */ = {
316316
uiCtxt = {
317-
sepNavIntBoundsRect = "{{0, 0}, {1031, 812}}";
317+
sepNavIntBoundsRect = "{{0, 0}, {1047, 844}}";
318318
sepNavSelRange = "{323, 10}";
319319
sepNavVisRange = "{0, 840}";
320320
};

‎QuickLookCSV.xcodeproj/pp.perspectivev3

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -216,7 +216,6 @@
216216
<string>action</string>
217217
<string>NSToolbarFlexibleSpaceItem</string>
218218
<string>debugger-enable-breakpoints</string>
219-
<string>go</string>
220219
<string>build-and-go</string>
221220
<string>com.apple.ide.PBXToolbarStopButton</string>
222221
<string>get-info</string>
@@ -234,6 +233,8 @@
234233
<key>Layout</key>
235234
<array>
236235
<dict>
236+
<key>BecomeActive</key>
237+
<true/>
237238
<key>ContentConfiguration</key>
238239
<dict>
239240
<key>PBXBottomSmartGroupGIDs</key>
@@ -272,6 +273,7 @@
272273
<string>089C166AFE841209C02AAC07</string>
273274
<string>08FB77AFFE84173DC02AAC07</string>
274275
<string>089C167CFE841241C02AAC07</string>
276+
<string>EE77BE9B0FFEB3EA008B09DE</string>
275277
<string>089C1671FE841209C02AAC07</string>
276278
<string>19C28FB6FE9D52B211CA2CBB</string>
277279
<string>1C37FBAC04509CD000000102</string>
@@ -280,8 +282,8 @@
280282
<key>PBXSmartGroupTreeModuleOutlineStateSelectionKey</key>
281283
<array>
282284
<array>
283-
<integer>22</integer>
284-
<integer>21</integer>
285+
<integer>3</integer>
286+
<integer>1</integer>
285287
<integer>0</integer>
286288
</array>
287289
</array>
@@ -314,40 +316,38 @@
314316
<key>Dock</key>
315317
<array>
316318
<dict>
317-
<key>BecomeActive</key>
318-
<true/>
319319
<key>ContentConfiguration</key>
320320
<dict>
321321
<key>PBXProjectModuleGUID</key>
322322
<string>EEB3ED3A0FFE2B1100B7462F</string>
323323
<key>PBXProjectModuleLabel</key>
324-
<string>GenerateThumbnailForURL.m</string>
324+
<string>GeneratePreviewForURL.m</string>
325325
<key>PBXSplitModuleInNavigatorKey</key>
326326
<dict>
327327
<key>Split0</key>
328328
<dict>
329329
<key>PBXProjectModuleGUID</key>
330330
<string>EEB3ED3B0FFE2B1100B7462F</string>
331331
<key>PBXProjectModuleLabel</key>
332-
<string>GenerateThumbnailForURL.m</string>
332+
<string>GeneratePreviewForURL.m</string>
333333
<key>_historyCapacity</key>
334334
<integer>0</integer>
335335
<key>bookmark</key>
336-
<string>EE009FB31133CE4E00312AD1</string>
336+
<string>EE5A62731147AB3600E79E92</string>
337337
<key>history</key>
338338
<array>
339339
<string>EE8830A610013E43005590AE</string>
340340
<string>EE8830A710013E43005590AE</string>
341341
<string>EEA3A593104879AB00AA5FA8</string>
342342
<string>EE2E1EFE105C37370016E6EB</string>
343343
<string>EE2E1F01105C37370016E6EB</string>
344-
<string>EE2E1F02105C37370016E6EB</string>
345-
<string>EE2E1F03105C37370016E6EB</string>
346344
<string>EE2E1F05105C37370016E6EB</string>
347-
<string>EE3B87DC1112F45A00FE62FB</string>
348345
<string>EE009FB01133CE4E00312AD1</string>
349-
<string>EE009FB11133CE4E00312AD1</string>
350-
<string>EE009FB21133CE4E00312AD1</string>
346+
<string>EE5A62561147A10D00E79E92</string>
347+
<string>EE5A62571147A10D00E79E92</string>
348+
<string>EE5A62581147A10D00E79E92</string>
349+
<string>EE5A62721147AB3600E79E92</string>
350+
<string>EE5A62591147A10D00E79E92</string>
351351
</array>
352352
</dict>
353353
<key>SplitCount</key>
@@ -470,11 +470,11 @@
470470
</array>
471471
<key>TableOfContents</key>
472472
<array>
473-
<string>EE009FB41133CE4E00312AD1</string>
473+
<string>EE5A625C1147A10D00E79E92</string>
474474
<string>1CA23ED40692098700951B8B</string>
475-
<string>EE009FB51133CE4E00312AD1</string>
475+
<string>EE5A625D1147A10D00E79E92</string>
476476
<string>EEB3ED3A0FFE2B1100B7462F</string>
477-
<string>EE009FB61133CE4E00312AD1</string>
477+
<string>EE5A625E1147A10D00E79E92</string>
478478
<string>1CA23EDF0692099D00951B8B</string>
479479
<string>1CA23EE00692099D00951B8B</string>
480480
<string>1CA23EE10692099D00951B8B</string>
@@ -649,7 +649,7 @@
649649
<key>TimeStamp</key>
650650
<real>0.0</real>
651651
<key>ToolbarDisplayMode</key>
652-
<integer>1</integer>
652+
<integer>2</integer>
653653
<key>ToolbarIsVisible</key>
654654
<true/>
655655
<key>ToolbarSizeMode</key>

0 commit comments

Comments
 (0)