Navigation

← Previous Changeset
Next Changeset →

Changeset 905

Timestamp:

12/03/04 15:57:04 (4 years ago)

Author:

morris

Message:

add index key to files

Files:

Footagehead/trunk/FHFile.h (modified) (3 diffs)
Footagehead/trunk/FHFile.m (modified) (8 diffs)
Footagehead/trunk/FHFileHandler.m (modified) (4 diffs)
Footagehead/trunk/FHGalleryHandler.m (modified) (2 diffs)
Footagehead/trunk/FHImageHandler.m (modified) (2 diffs)
Footagehead/trunk/FHRangeHandler.m (modified) (3 diffs)

Legend:

: Unmodified
: Added
: Removed
: Modified
: Copied
: Moved

Footagehead/trunk/FHFile.h

r901	r905
1		/* $Id: FHFile.h,v 1.~~2 2004/12/03 12:29:49~~ morris Exp $ */
	1	/* $Id: FHFile.h,v 1.3 2004/12/03 14:57:04 morris Exp $ */
2	2
3	3	/*
…	…
34	34	NSString *_path;
35	35	NSString *_extension;
	36	NSImage *_image;
36	37	NSImage *_icon;
37	38	BOOL _directory;
	39	int _index;
38	40	FHHandlerHint _hint;
39	41	}
40	42
41	43
42		- (id) initWithURL:(NSURL *)url isDirectory:(BOOL)isDirectory;
43		- (id) initWithURL:(NSURL *)url isDirectory:(BOOL)isDirectory hint:(FHHandlerHint)hint;
	44	- (id) initWithURL:(NSURL *)url isDirectory:(BOOL)isDirectory index:(int)index;
	45	- (id) initWithURL:(NSURL *)url isDirectory:(BOOL)isDirectory index:(int)index hint:(FHHandlerHint)hint;
	46
	47	- (void) setImage:(NSImage *)image;
	48	- (NSImage *) image;
44	49
45	50	- (NSString *) name;
…	…
49	54	- (NSImage *) icon;
50	55	- (BOOL) isDirectory;
	56	- (int) index;
51	57	- (FHHandlerHint) hint;
52	58
53		~~- (NSComparisonResult) compareName:(FHFile *)file;~~
54
55	59	@end

Footagehead/trunk/FHFile.m

r901	r905
1		/* $Id: FHFile.m,v 1.~~3 2004/12/03 12:29:49~~ morris Exp $ */
	1	/* $Id: FHFile.m,v 1.4 2004/12/03 14:57:04 morris Exp $ */
2	2
3	3	/*
…	…
32	32	@implementation FHFile
33	33
34		- (id)initWithURL:(NSURL *)url isDirectory:(BOOL)directory {
35		return [self initWithURL:url isDirectory:directory hint:FHHandlerHintNone];
36		}
37
38
39
40		- (id)initWithURL:(NSURL *)url isDirectory:(BOOL)directory hint:(FHHandlerHint)hint {
	34	- (id)initWithURL:(NSURL *)url isDirectory:(BOOL)directory index:(int)index {
	35	return [self initWithURL:url isDirectory:directory index:(int)index hint:FHHandlerHintNone];
	36	}
	37
	38
	39
	40	- (id)initWithURL:(NSURL *)url isDirectory:(BOOL)directory index:(int)index hint:(FHHandlerHint)hint {
41	41	BOOL local;
42	42
…	…
47	47	_extension = [[[self path] pathExtension] retain];
48	48	_directory = directory;
	49	_index = index;
49	50	_hint = hint;
50	51
…	…
96	97	[_extension release];
97	98	[_name release];
	99	[_image release];
98	100	[_icon release];
99	101
…	…
112	114	ZADecode(coder, _extension);
113	115	ZADecode(coder, _name);
	116	ZADecode(coder, _image);
114	117	ZADecode(coder, _icon);
115	118	ZADecode(coder, _directory);
…	…
127	130	ZAEncode(coder, _name);
128	131	ZAEncode(coder, _icon);
	132	ZAEncode(coder, _image);
129	133	ZAEncode(coder, _directory);
130	134	ZAEncode(coder, _hint);
…	…
135	139	#pragma mark -
136	140
	141	- (void)setImage:(NSImage *)image {
	142	NSImage *icon;
	143
	144	[image retain];
	145	[_image release];
	146
	147	_image = image;
	148
	149	icon = [image scaledImageWithSize:NSMakeSize(128.0, 128.0)];
	150	[icon setScalesWhenResized:YES];
	151	[icon retain];
	152	[_icon release];
	153
	154	_icon = icon;
	155	}
	156
	157
	158
	159	- (NSImage *)image {
	160	return _image;
	161	}
	162
	163
	164
	165	#pragma mark -
	166
137	167	- (NSString *)name {
138	168	return _name;
…	…
171	201
172	202
	203	- (int)index {
	204	return _index;
	205	}
	206
	207
	208
173	209	- (FHHandlerHint)hint {
174	210	return _hint;
175	211	}
176	212
177
178
179		~~#pragma mark -~~
180
181		~~- (NSComparisonResult)compareName:(FHFile *)file {~~
182		~~return [[self name] compare:[file name] options:NSCaseInsensitiveSearch];~~
183		}
184
185	213	@end

Footagehead/trunk/FHFileHandler.m

r901	r905
1		/* $Id: FHFileHandler.m,v 1.~~7 2004/12/03 12:29:49~~ morris Exp $ */
	1	/* $Id: FHFileHandler.m,v 1.8 2004/12/03 14:57:04 morris Exp $ */
2	2
3	3	/*
…	…
70	70	LSItemInfoRecord itemInfoRecord;
71	71	BOOL isDirectory;
	72	int i = 0;
72	73
73	74	if(!_loadedFiles) {
…	…
75	76	root = [[self URL] path];
76	77	files = [[NSFileManager defaultManager] directoryContentsWithFileAtPath:root];
77		enumerator = [~~files~~ objectEnumerator];
	78	enumerator = [[files sortedArrayUsingSelector:@selector(caseInsensitiveCompare:)] objectEnumerator];
78	79
79	80	while((name = [enumerator nextObject])) {
…	…
101	102	continue;
102	103
103		file = [[FHFile alloc] initWithURL:url isDirectory:isDirectory];
	104	file = [[FHFile alloc] initWithURL:url isDirectory:isDirectory index:i++];
104	105	[_files addObject:file];
105	106	[file release];
106	107	}
107	108
108		~~[_files sortUsingSelector:@selector(compareName:)];~~
109	109	_loadedFiles = YES;
110	110	}

Footagehead/trunk/FHGalleryHandler.m

r901	r905
1		/* $Id: FHGalleryHandler.m,v 1.~~3 2004/12/03 12:29:49~~ morris Exp $ */
	1	/* $Id: FHGalleryHandler.m,v 1.4 2004/12/03 14:57:04 morris Exp $ */
2	2
3	3	/*
…	…
103	103	NSURL *url;
104	104	FHFile *file;
	105	int i = 0;
105	106
106	107	if(!_loadedFiles) {
107		types = [NSImage FHImageFileTypes];
108
109		if(_albumdb) {
110		scanner = [NSScanner scannerWithString:_albumdb];
111
112		while(![scanner isAtEnd]) {
113		// --- find image name
114		if([scanner scanUpToString:@";s:" intoString:NULL]) {
115		if([scanner isAtEnd])
116		break;
	108	types = [NSImage FHImageFileTypes];
	109
	110	if(_albumdb) {
	111	scanner = [NSScanner scannerWithString:_albumdb];
	112
	113	while(![scanner isAtEnd]) {
	114	// --- find image name
	115	if([scanner scanUpToString:@";s:" intoString:NULL]) {
	116	if([scanner isAtEnd])
	117	break;
	118
	119	[scanner setScanLocation:[scanner scanLocation] + 3];
	120	[scanner scanUpToString:@"\"" intoString:NULL];
	121	[scanner setScanLocation:[scanner scanLocation] + 1];
	122	[scanner scanUpToString:@"\"" intoString:&name];
	123	}
117	124
118		[scanner setScanLocation:[scanner scanLocation] + 3];
119		[scanner scanUpToString:@"\"" intoString:NULL];
120		[scanner setScanLocation:[scanner scanLocation] + 1];
121		[scanner scanUpToString:@"\"" intoString:&name];
122		}
123
124		url = [NSURL URLWithString:name relativeToURL:[self URL]];
125		file = [[FHFile alloc] initWithURL:url isDirectory:YES hint:FHHandlerHintGallery];
126		[_files addObject:file];
127		[file release];
128		}
129		}
130		else if(_photos) {
131		scanner = [NSScanner scannerWithString:_photos];
132
133		while(![scanner isAtEnd]) {
134		// --- find image name
135		if([scanner scanUpToString:@"s:5:\"image\";O:5:\"image\":12:{s:4:\"name\";" intoString:NULL]) {
136		if([scanner isAtEnd])
137		break;
138
139		[scanner setScanLocation:[scanner scanLocation] + 39];
140		[scanner scanUpToString:@"\"" intoString:NULL];
141		[scanner setScanLocation:[scanner scanLocation] + 1];
142		[scanner scanUpToString:@"\"" intoString:&name];
143		}
144
145		// --- find image type
146		if([scanner scanUpToString:@"s:4:\"type\";s:" intoString:NULL]) {
147		if([scanner isAtEnd])
148		break;
149
150		[scanner setScanLocation:[scanner scanLocation] + 13];
151		[scanner scanUpToString:@"\"" intoString:NULL];
152		[scanner setScanLocation:[scanner scanLocation] + 1];
153		[scanner scanUpToString:@"\"" intoString:&type];
154		}
155
156		// --- insert
157		if([types containsObject:type]) {
158		filename = [NSString stringWithFormat:@"%@.%@", name, type];
159		file = [[FHFile alloc] initWithURL:[NSURL URLWithString:filename relativeToURL:[self URL]]
160		isDirectory:NO];
	125	url = [NSURL URLWithString:name relativeToURL:[self URL]];
	126	file = [[FHFile alloc] initWithURL:url isDirectory:YES index:i++ hint:FHHandlerHintGallery];
161	127	[_files addObject:file];
162	128	[file release];
163	129	}
164	130	}
165		}
166
167		_loadedFiles = YES;
	131	else if(_photos) {
	132	scanner = [NSScanner scannerWithString:_photos];
	133
	134	while(![scanner isAtEnd]) {
	135	// --- find image name
	136	if([scanner scanUpToString:@"s:5:\"image\";O:5:\"image\":12:{s:4:\"name\";" intoString:NULL]) {
	137	if([scanner isAtEnd])
	138	break;
	139
	140	[scanner setScanLocation:[scanner scanLocation] + 39];
	141	[scanner scanUpToString:@"\"" intoString:NULL];
	142	[scanner setScanLocation:[scanner scanLocation] + 1];
	143	[scanner scanUpToString:@"\"" intoString:&name];
	144	}
	145
	146	// --- find image type
	147	if([scanner scanUpToString:@"s:4:\"type\";s:" intoString:NULL]) {
	148	if([scanner isAtEnd])
	149	break;
	150
	151	[scanner setScanLocation:[scanner scanLocation] + 13];
	152	[scanner scanUpToString:@"\"" intoString:NULL];
	153	[scanner setScanLocation:[scanner scanLocation] + 1];
	154	[scanner scanUpToString:@"\"" intoString:&type];
	155	}
	156
	157	// --- insert
	158	if([types containsObject:type]) {
	159	filename = [NSString stringWithFormat:@"%@.%@", name, type];
	160	url = [NSURL URLWithString:filename relativeToURL:[self URL]];
	161	file = [[FHFile alloc] initWithURL:url isDirectory:NO index:i++];
	162	[_files addObject:file];
	163	[file release];
	164	}
	165	}
	166	}
	167
	168	_loadedFiles = YES;
168	169	}
169	170

Footagehead/trunk/FHImageHandler.m

r901	r905
1		/* $Id: FHImageHandler.m,v 1.~~3 2004/12/03 12:29:49~~ morris Exp $ */
	1	/* $Id: FHImageHandler.m,v 1.4 2004/12/03 14:57:04 morris Exp $ */
2	2
3	3	/*
…	…
60	60
61	61	if(!_loadedFiles) {
62		file = [[FHFile alloc] initWithURL:_url isDirectory:NO];
	62	file = [[FHFile alloc] initWithURL:_url isDirectory:NO index:0];
63	63	[_files addObject:file];
64	64	[file release];

Footagehead/trunk/FHRangeHandler.m

r901	r905
1		/* $Id: FHRangeHandler.m,v 1.~~3 2004/12/03 12:29:49~~ morris Exp $ */
	1	/* $Id: FHRangeHandler.m,v 1.4 2004/12/03 14:57:04 morris Exp $ */
2	2
3	3	/*
…	…
123	123	NSArray *types;
124	124	NSString *link;
	125	NSURL *url;
125	126	FHFile *file;
	127	int i = 0;
126	128
127	129	if(!_loadedFiles) {
…	…
133	135	continue;
134	136
135		~~file = [[FHFile alloc] initWithURL:[NSURL URLWithString:link relativeToURL:[self URL]]~~
136		~~isDirectory:NO~~];
	137	url = [NSURL URLWithString:link relativeToURL:[self URL]];
	138	file = [[FHFile alloc] initWithURL:url isDirectory:NO index:i++];
137	139	[_files addObject:file];
138	140	[file release];

Navigation

Changeset 905

Legend:

Footagehead/trunk/FHFile.h

Footagehead/trunk/FHFile.m

Footagehead/trunk/FHFileHandler.m

Footagehead/trunk/FHGalleryHandler.m

Footagehead/trunk/FHImageHandler.m

Footagehead/trunk/FHRangeHandler.m

Download in other formats: