/ - Diff - Pithos MacOS Client - Greek Research and Technology Network's projects

Revision df003f06

 D08C143200CC00803874 /* PithosSharingAccountsNode.m in Sources */ = {isa = PBXBuildFile; fileRef = 6152D08B143200CC00803874 /* PithosSharingAccountsNode.m */; };
 D092143334CC00803874 /* AllowedToBoolTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6152D091143334CC00803874 /* AllowedToBoolTransformer.m */; };
 D095143334E000803874 /* SharingAccountBoolTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 6152D094143334E000803874 /* SharingAccountBoolTransformer.m */; };
 BF4B145554D600EE353A /* pithos-logo-small.png in Resources */ = {isa = PBXBuildFile; fileRef = 6154BF4A145554D600EE353A /* pithos-logo-small.png */; };
 BF4D145558E300EE353A /* pithos.icns in Resources */ = {isa = PBXBuildFile; fileRef = 6154BF4C145558E300EE353A /* pithos.icns */; };
 DD140CECDB00017BD4 /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = 615615DC140CECDB00017BD4 /* libz.dylib */; };
 A444E140F8A5700308614 /* MetadataKeyTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 615A444D140F8A5700308614 /* MetadataKeyTransformer.m */; };
 A4451140F8A7F00308614 /* MetadataKeyFormatter.m in Sources */ = {isa = PBXBuildFile; fileRef = 615A4450140F8A7F00308614 /* MetadataKeyFormatter.m */; };
-...
 D091143334CC00803874 /* AllowedToBoolTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = AllowedToBoolTransformer.m; path = "pithos-macos/AllowedToBoolTransformer.m"; sourceTree = "<group>"; };
 D093143334E000803874 /* SharingAccountBoolTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = SharingAccountBoolTransformer.h; path = "pithos-macos/SharingAccountBoolTransformer.h"; sourceTree = "<group>"; };
 D094143334E000803874 /* SharingAccountBoolTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = SharingAccountBoolTransformer.m; path = "pithos-macos/SharingAccountBoolTransformer.m"; sourceTree = "<group>"; };
 BF4A145554D600EE353A /* pithos-logo-small.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = "pithos-logo-small.png"; sourceTree = "<group>"; };
 BF4C145558E300EE353A /* pithos.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = pithos.icns; path = ../pithos.icns; sourceTree = "<group>"; };
 DC140CECDB00017BD4 /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 A444C140F8A5700308614 /* MetadataKeyTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = MetadataKeyTransformer.h; path = "pithos-macos/MetadataKeyTransformer.h"; sourceTree = "<group>"; };
 A444D140F8A5700308614 /* MetadataKeyTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = MetadataKeyTransformer.m; path = "pithos-macos/MetadataKeyTransformer.m"; sourceTree = "<group>"; };
-...
 DD46113E950E500ED982F /* Icons */ = {
     			isa = PBXGroup;
     			children = (
 BF4C145558E300EE353A /* pithos.icns */,
 DD46213E950E600ED982F /* 01-refresh.png */,
 E99D9313EC348500E48DA5 /* 145-persondot.png */,
 BF4A145554D600EE353A /* pithos-logo-small.png */,
     			);
     			path = Icons;
     			sourceTree = SOURCE_ROOT;
-...
 B85D613F8077800C9371F /* PithosPreferencesController.xib in Resources */,
 FC0AF13F91BA400140A33 /* PithosObjectNodeInfoController.xib in Resources */,
 D11428BEC000637170 /* PithosContainerNodeInfoController.xib in Resources */,
 BF4B145554D600EE353A /* pithos-logo-small.png in Resources */,
 BF4D145558E300EE353A /* pithos.icns in Resources */,
     			);
     			runOnlyForDeploymentPostprocessing = 0;
     		};

     																			<int key="NSvFlags">4352</int>
     																			<string key="NSFrameSize">{180, 292}</string>
     																			<reference key="NSSuperview" ref="843429105"/>
     																			<reference key="NSWindow"/>
     																			<reference key="NSNextKeyView" ref="624286523"/>
     																			<bool key="NSEnabled">YES</bool>
     																			<object class="_NSCornerView" key="NSCornerView">
-...
     																	</object>
     																	<string key="NSFrameSize">{180, 292}</string>
     																	<reference key="NSSuperview" ref="197496877"/>
     																	<reference key="NSWindow"/>
     																	<reference key="NSNextKeyView" ref="392693553"/>
     																	<reference key="NSDocView" ref="392693553"/>
     																	<reference key="NSBGColor" ref="592883226"/>
-...
     																	<int key="NSvFlags">-2147483392</int>
     																	<string key="NSFrame">{{224, 17}, {15, 102}}</string>
     																	<reference key="NSSuperview" ref="197496877"/>
     																	<reference key="NSWindow"/>
     																	<reference key="NSNextKeyView" ref="1047973191"/>
     																	<reference key="NSTarget" ref="197496877"/>
     																	<string key="NSAction">_doScroller:</string>
-...
     																	<int key="NSvFlags">-2147483392</int>
     																	<string key="NSFrame">{{-100, -100}, {144, 15}}</string>
     																	<reference key="NSSuperview" ref="197496877"/>
     																	<reference key="NSWindow"/>
     																	<reference key="NSNextKeyView" ref="843429105"/>
     																	<int key="NSsFlags">1</int>
     																	<reference key="NSTarget" ref="197496877"/>
-...
     															</object>
     															<string key="NSFrameSize">{180, 292}</string>
     															<reference key="NSSuperview" ref="414504914"/>
     															<reference key="NSWindow"/>
     															<reference key="NSNextKeyView" ref="205521010"/>
     															<int key="NSsFlags">528</int>
     															<reference key="NSVScroller" ref="624286523"/>
-...
     													</object>
     													<string key="NSFrameSize">{180, 292}</string>
     													<reference key="NSSuperview" ref="462572416"/>
     													<reference key="NSWindow"/>
     													<reference key="NSNextKeyView" ref="197496877"/>
     													<string key="NSClassName">NSView</string>
     												</object>
-...
     															<object class="NSPSMatrix" key="NSDrawMatrix"/>
     															<string key="NSFrame">{{7, 49}, {166, 12}}</string>
     															<reference key="NSSuperview" ref="1047973191"/>
     															<reference key="NSNextKeyView" ref="987905504"/>
     															<reference key="NSWindow"/>
     															<reference key="NSNextKeyView" ref="620067477"/>
     															<int key="NSpiFlags">16648</int>
     															<double key="NSMaxValue">100</double>
     														</object>
-...
     															<int key="NSvFlags">266</int>
     															<string key="NSFrame">{{5, 13}, {170, 35}}</string>
     															<reference key="NSSuperview" ref="1047973191"/>
     															<reference key="NSNextKeyView" ref="744849637"/>
     															<reference key="NSWindow"/>
     															<reference key="NSNextKeyView" ref="987905504"/>
     															<bool key="NSEnabled">YES</bool>
     															<object class="NSTextFieldCell" key="NSCell" id="667098628">
     																<int key="NSCellFlags">67239424</int>
-...
     																	<string>NeXT TIFF v4.0 pasteboard type</string>
     																</object>
     															</object>
     															<string key="NSFrame">{{69, 66}, {42, 42}}</string>
     															<string key="NSFrame">{{50, 66}, {76, 40}}</string>
     															<reference key="NSSuperview" ref="1047973191"/>
     															<reference key="NSNextKeyView" ref="620067477"/>
     															<reference key="NSWindow"/>
     															<reference key="NSNextKeyView" ref="744849637"/>
     															<bool key="NSEnabled">YES</bool>
     															<object class="NSImageCell" key="NSCell" id="280822281">
     																<int key="NSCellFlags">130560</int>
     																<int key="NSCellFlags2">33554432</int>
     																<object class="NSCustomResource" key="NSContents">
     																	<string key="NSClassName">NSImage</string>
     																	<string key="NSResourceName">NSFolderBurnable</string>
     																	<string key="NSResourceName">pithos-logo-small</string>
     																</object>
     																<int key="NSAlign">0</int>
     																<int key="NSScale">3</int>
     																<int key="NSScale">2</int>
     																<int key="NSStyle">0</int>
     																<bool key="NSAnimates">NO</bool>
     															</object>
-...
     													</object>
     													<string key="NSFrame">{{0, 293}, {180, 107}}</string>
     													<reference key="NSSuperview" ref="462572416"/>
     													<reference key="NSWindow"/>
     													<reference key="NSNextKeyView" ref="805035077"/>
     													<string key="NSClassName">NSView</string>
     												</object>
     											</object>
     											<string key="NSFrameSize">{180, 400}</string>
     											<reference key="NSSuperview" ref="581795577"/>
     											<reference key="NSWindow"/>
     											<reference key="NSNextKeyView" ref="414504914"/>
     											<int key="NSDividerStyle">2</int>
     										</object>
     									</object>
     									<string key="NSFrameSize">{180, 400}</string>
     									<reference key="NSSuperview" ref="374340452"/>
     									<reference key="NSWindow"/>
     									<reference key="NSNextKeyView" ref="462572416"/>
     									<string key="NSClassName">NSView</string>
     								</object>
-...
     											<int key="NSvFlags">4370</int>
     											<string key="NSFrame">{{-1, -1}, {511, 402}}</string>
     											<reference key="NSSuperview" ref="987905504"/>
     											<reference key="NSWindow"/>
     											<reference key="NSNextKeyView"/>
     											<bool key="NSEnabled">YES</bool>
     											<object class="NSBrowserCell" key="NSCellPrototype">
-...
     									</object>
     									<string key="NSFrame">{{181, 0}, {509, 400}}</string>
     									<reference key="NSSuperview" ref="374340452"/>
     									<reference key="NSWindow"/>
     									<reference key="NSNextKeyView" ref="259981942"/>
     									<string key="NSClassName">NSView</string>
     								</object>
     							</object>
     							<string key="NSFrameSize">{690, 400}</string>
     							<reference key="NSSuperview" ref="1006"/>
     							<reference key="NSWindow"/>
     							<reference key="NSNextKeyView" ref="581795577"/>
     							<bool key="NSIsVertical">YES</bool>
     							<int key="NSDividerStyle">2</int>
-...
     					</object>
     					<string key="NSFrame">{{7, 11}, {690, 400}}</string>
     					<reference key="NSSuperview"/>
     					<reference key="NSWindow"/>
     					<reference key="NSNextKeyView" ref="374340452"/>
     				</object>
     				<string key="NSScreenRect">{{0, 0}, {1280, 778}}</string>
-...
     			<nil key="sourceID"/>
     			<int key="maxID">193</int>
     		</object>
     		<object class="IBClassDescriber" key="IBDocument.Classes"/>
     		<object class="IBClassDescriber" key="IBDocument.Classes">
     			<object class="NSMutableArray" key="referencedPartialClassDescriptions">
     				<bool key="EncodedWithXMLCoder">YES</bool>
     				<object class="IBPartialClassDescription">
     					<string key="className">PithosBrowserController</string>
     					<string key="superclassName">NSWindowController</string>
     					<object class="NSMutableDictionary" key="actions">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>forceRefresh:</string>
     							<string>refresh:</string>
     						</object>
     						<object class="NSMutableArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>id</string>
     							<string>id</string>
     						</object>
     					</object>
     					<object class="NSMutableDictionary" key="actionInfosByName">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>forceRefresh:</string>
     							<string>refresh:</string>
     						</object>
     						<object class="NSMutableArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<object class="IBActionInfo">
     								<string key="name">forceRefresh:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     							<object class="IBActionInfo">
     								<string key="name">refresh:</string>
     								<string key="candidateClassName">id</string>
     							</object>
     						</object>
     					</object>
     					<object class="NSMutableDictionary" key="outlets">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>activityProgressIndicator</string>
     							<string>activityTextField</string>
     							<string>browser</string>
     							<string>browserMenu</string>
     							<string>horizontalSplitView</string>
     							<string>leftBottomView</string>
     							<string>leftTopView</string>
     							<string>outlineView</string>
     							<string>outlineViewMenu</string>
     							<string>verticalSplitView</string>
     						</object>
     						<object class="NSMutableArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>NSProgressIndicator</string>
     							<string>NSTextField</string>
     							<string>NSBrowser</string>
     							<string>NSMenu</string>
     							<string>NSSplitView</string>
     							<string>NSView</string>
     							<string>NSView</string>
     							<string>NSOutlineView</string>
     							<string>NSMenu</string>
     							<string>NSSplitView</string>
     						</object>
     					</object>
     					<object class="NSMutableDictionary" key="toOneOutletInfosByName">
     						<bool key="EncodedWithXMLCoder">YES</bool>
     						<object class="NSArray" key="dict.sortedKeys">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<string>activityProgressIndicator</string>
     							<string>activityTextField</string>
     							<string>browser</string>
     							<string>browserMenu</string>
     							<string>horizontalSplitView</string>
     							<string>leftBottomView</string>
     							<string>leftTopView</string>
     							<string>outlineView</string>
     							<string>outlineViewMenu</string>
     							<string>verticalSplitView</string>
     						</object>
     						<object class="NSMutableArray" key="dict.values">
     							<bool key="EncodedWithXMLCoder">YES</bool>
     							<object class="IBToOneOutletInfo">
     								<string key="name">activityProgressIndicator</string>
     								<string key="candidateClassName">NSProgressIndicator</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">activityTextField</string>
     								<string key="candidateClassName">NSTextField</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">browser</string>
     								<string key="candidateClassName">NSBrowser</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">browserMenu</string>
     								<string key="candidateClassName">NSMenu</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">horizontalSplitView</string>
     								<string key="candidateClassName">NSSplitView</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">leftBottomView</string>
     								<string key="candidateClassName">NSView</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">leftTopView</string>
     								<string key="candidateClassName">NSView</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">outlineView</string>
     								<string key="candidateClassName">NSOutlineView</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">outlineViewMenu</string>
     								<string key="candidateClassName">NSMenu</string>
     							</object>
     							<object class="IBToOneOutletInfo">
     								<string key="name">verticalSplitView</string>
     								<string key="candidateClassName">NSSplitView</string>
     							</object>
     						</object>
     					</object>
     					<object class="IBClassDescriptionSource" key="sourceIdentifier">
     						<string key="majorKey">IBProjectSource</string>
     						<string key="minorKey">./Classes/PithosBrowserController.h</string>
     					</object>
     				</object>
     			</object>
     		</object>
     		<int key="IBDocument.localizationMode">0</int>
     		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
     		<object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDevelopmentDependencies">
-...
     				<bool key="EncodedWithXMLCoder">YES</bool>
     				<string>01-refresh</string>
     				<string>145-persondot</string>
     				<string>NSFolderBurnable</string>
     				<string>NSMenuCheckmark</string>
     				<string>NSMenuMixedState</string>
     				<string>NSToolbarCustomizeToolbarItemImage</string>
     				<string>pithos-logo-small</string>
     			</object>
     			<object class="NSMutableArray" key="dict.values">
     				<bool key="EncodedWithXMLCoder">YES</bool>
     				<string>{24, 26}</string>
     				<string>{24, 26}</string>
     				<string>{32, 32}</string>
     				<string>{9, 8}</string>
     				<string>{7, 2}</string>
     				<string>{32, 32}</string>
     				<string>{75, 19}</string>
     			</object>
     		</object>
     	</data>

     @interface PithosLocalObjectState : NSObject <NSCoding> {
         NSString *md5;
         NSString *hashMapHash;
         NSString *tmpDownloadFile;
         NSString *filePath;
         BOOL isDirectory;
+    }
     - (id)initWithFile:(NSString *)filePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize;
     - (id)initWithFile:(NSString *)aFilePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize;
     - (id)initWithHash:(NSString *)aHash directory:(BOOL)anIsDirectory;
     + (id)localObjectState;
     + (id)localObjectStateWithFile:(NSString *)filePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize;
     + (id)localObjectStateWithFile:(NSString *)aFilePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize;
     + (id)localObjectStateWithHash:(NSString *)aHash directory:(BOOL)anIsDirectory;
     - (BOOL)isEqualToState:(PithosLocalObjectState *)aState;
     @property (nonatomic, retain) NSString *md5;
     @property (nonatomic, retain) NSString *hashMapHash;
     @property (nonatomic, retain) NSString *tmpDownloadFile;
     @property (nonatomic, retain) NSString *filePath;
     @property (nonatomic, assign) BOOL isDirectory;
     @property (nonatomic, readonly) BOOL exists;

     #import "HashMapHash.h"
     @implementation PithosLocalObjectState
     @synthesize md5, hashMapHash, tmpDownloadFile, isDirectory, exists, hash;
     @synthesize md5, hashMapHash, filePath, isDirectory, exists, hash;
     #pragma mark -
     #pragma mark Object Lifecycle
     - (id)initWithFile:(NSString *)filePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize {
     - (id)initWithFile:(NSString *)aFilePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize {
         if ((self = [self init])) {
             self.filePath = aFilePath;
             if ([[NSFileManager defaultManager] fileExistsAtPath:filePath isDirectory:&isDirectory] && !isDirectory) {
                 self.md5 = (NSString *)FileMD5HashCreateWithPath((CFStringRef)filePath,
                 self.md5 = (NSString *)FileMD5HashCreateWithPath((CFStringRef)aFilePath,
                                                                  FileHashDefaultChunkSizeForReadingData);
                 self.hashMapHash = [HashMapHash calculateHashMapHash:[HashMapHash calculateObjectHashMap:filePath
                                                                                            withBlockHash:blockHash
-...
         return [[[self alloc] init] autorelease];
+    }
     + (id)localObjectStateWithFile:(NSString *)filePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize {
         return [[[self alloc] initWithFile:filePath blockHash:blockHash blockSize:blockSize] autorelease];
     + (id)localObjectStateWithFile:(NSString *)aFilePath blockHash:(NSString *)blockHash blockSize:(NSUInteger)blockSize {
         return [[[self alloc] initWithFile:aFilePath blockHash:blockHash blockSize:blockSize] autorelease];
+    }
     + (id)localObjectStateWithHash:(NSString *)aHash directory:(BOOL)anIsDirectory {
-...
+    }
     - (void)dealloc {
         self.tmpDownloadFile = nil;
         self.filePath = nil;
         [hashMapHash release];
         [md5 release];
         [super dealloc];
+    }
     - (NSString *)description {
         return [NSString stringWithFormat:@"md5: %@, hashMapHash: %@, tmpDownloadFile: %@, isDirectory: %d",
                 md5, hashMapHash, tmpDownloadFile, isDirectory];
         return [NSString stringWithFormat:@"md5: %@, hashMapHash: %@, filePath: %@, isDirectory: %d",
                 md5, hashMapHash, filePath, isDirectory];
+    }
     - (BOOL)isEqualToState:(PithosLocalObjectState *)aState {
-...
         if (isDirectory) {
             self.md5 = nil;
             self.hashMapHash = nil;
             self.tmpDownloadFile = nil;
             self.filePath = nil;
+        }
+    }
     - (void)setTmpDownloadFile:(NSString *)aTmpDownloadFile {
         if (![tmpDownloadFile isEqualToString:aTmpDownloadFile]) {
             if (!aTmpDownloadFile) {
     - (void)setTmpDownloadFile:(NSString *)aFilePath {
         if (![filePath isEqualToString:aFilePath]) {
             if (!aFilePath) {
                 NSFileManager *fileManager = [NSFileManager defaultManager];
                 if ([fileManager fileExistsAtPath:tmpDownloadFile]) {
                 if ([fileManager fileExistsAtPath:filePath]) {
                     NSError *error = nil;
                     if (![fileManager removeItemAtPath:tmpDownloadFile error:&error] || error)
                     if (![fileManager removeItemAtPath:filePath error:&error] || error)
                         [PithosUtilities fileActionFailedAlertWithTitle:@"Remove File Error"
                                                                 message:[NSString stringWithFormat:@"Cannot remove file at '%@'", tmpDownloadFile]
                                                                 message:[NSString stringWithFormat:@"Cannot remove file at '%@'", filePath]
                                                                   error:error];
+                }
+            }
             [tmpDownloadFile release];
             tmpDownloadFile = [aTmpDownloadFile retain];
             [filePath release];
             filePath = [aFilePath retain];
+        }
+    }
-...
         if ((self = [super init])) {
             self.md5 = [decoder decodeObjectForKey:@"md5"];
             self.hashMapHash = [decoder decodeObjectForKey:@"hashMapHash"];
             self.tmpDownloadFile = [decoder decodeObjectForKey:@"tmpDownloadFile"];
             self.filePath = [decoder decodeObjectForKey:@"filePath"];
             self.isDirectory = [decoder decodeBoolForKey:@"isDirectory"];
+        }
         return self;
-...
     - (void)encodeWithCoder:(NSCoder *)encoder {
         [encoder encodeObject:md5 forKey:@"md5"];
         [encoder encodeObject:hashMapHash forKey:@"hashMapHash"];
         [encoder encodeObject:tmpDownloadFile forKey:@"tmpDownloadFile"];
         [encoder encodeObject:filePath forKey:@"filePath"];
         [encoder encodeBool:isDirectory forKey:@"isDirectory"];
+    }

         NSMutableArray *objects;
         NSMutableDictionary *remoteObjects;
         NSMutableDictionary *storedLocalObjectStates;
         NSMutableDictionary *currentLocalObjectStates;
         NSString *containerDirectoryPath;
         NSString *pithosStateFilePath;
         NSString *tempDownloadsDirPath;
         NSString *tempTrashDirPath;
         NSUInteger syncOperationCount;
         BOOL newSyncRequested;
-...
     @property (nonatomic, retain) NSDate *lastModified;
     @property (nonatomic, retain) NSMutableDictionary *remoteObjects;
     @property (nonatomic, retain) NSMutableDictionary *storedLocalObjectStates;
     @property (nonatomic, retain) NSMutableDictionary *currentLocalObjectStates;
     @property (nonatomic, readonly) NSString *containerDirectoryPath;
     @property (nonatomic, readonly) NSString *pithosStateFilePath;
     @property (nonatomic, readonly) NSString *tempDownloadsDirPath;
     @property (nonatomic, readonly) NSString *tempTrashDirPath;
     @property (nonatomic, retain) NSDate *lastCompletedSync;

     @interface PithosSyncDaemon (Private)
     - (NSString *)pithosStateFilePath;
     - (void)saveLocalState;
     - (BOOL)moveToTempTrashFile:(NSString *)filePath;
     - (void)updateLocalStateWithObject:(ASIPithosObject *)object localFilePath:(NSString *)filePath;
     - (void)updateServerStateWithCurrentState:(PithosLocalObjectState *)currentState
                                        object:(ASIPithosObject *)object
-...
     @end
     @implementation PithosSyncDaemon
     @synthesize blockHash, blockSize, lastModified, lastCompletedSync, remoteObjects, storedLocalObjectStates;
     @synthesize pithosStateFilePath, tempDownloadsDirPath;
     @synthesize blockHash, blockSize, lastModified, lastCompletedSync, remoteObjects, storedLocalObjectStates, currentLocalObjectStates;
     @synthesize containerDirectoryPath, pithosStateFilePath, tempDownloadsDirPath, tempTrashDirPath;
     #pragma mark -
     #pragma Object Lifecycle
-...
             syncOperationCount = 0;
             newSyncRequested = NO;
             containerDirectoryPath = [[directoryPath stringByAppendingPathComponent:containerName] copy];
             activityFacility = [PithosActivityFacility defaultPithosActivityFacility];
-...
         [queue release];
         [timer invalidate];
         [timer release];
         [tempTrashDirPath release];
         [tempDownloadsDirPath release];
         [pithosStateFilePath release];
         [containerDirectoryPath release];
         [currentLocalObjectStates release];
         [storedLocalObjectStates release];
         [remoteObjects release];
         [objects release];
-...
         return [tempDownloadsDirPath copy];
+    }
     - (NSString *)tempTrashDirPath {
         NSFileManager *fileManager = [NSFileManager defaultManager];
         if (!tempTrashDirPath || ![fileManager fileExistsAtPath:tempTrashDirPath]) {
             // Get the path from user defaults
             tempTrashDirPath = [[NSUserDefaults standardUserDefaults] stringForKey:@"PithosTempTrashDirPath"];
             if (tempTrashDirPath) {
                 // Check if the path exists
                 BOOL isDirectory;
                 BOOL fileExists = [fileManager fileExistsAtPath:tempTrashDirPath isDirectory:&isDirectory];
                 NSError *error = nil;
                 if (fileExists && !isDirectory)
                     [fileManager removeItemAtPath:tempTrashDirPath error:&error];
                 if (!error & !fileExists)
                     [fileManager createDirectoryAtPath:tempTrashDirPath withIntermediateDirectories:YES attributes:nil error:&error];
                 if (error)
                     tempTrashDirPath = nil;
+            }
             if (!tempTrashDirPath) {
                 NSString *tempDirTemplate = [[[NSBundle mainBundle] resourcePath] stringByAppendingPathComponent:@"Temp Trash XXXXXX"];
                 const char *tempDirTemplateCString = [tempDirTemplate fileSystemRepresentation];
                 char *tempDirNameCString = (char *)malloc(strlen(tempDirTemplateCString) + 1);
                 strcpy(tempDirNameCString, tempDirTemplateCString);
                 tempDirNameCString = mkdtemp(tempDirNameCString);
                 if (tempDirNameCString != NULL)
                     tempTrashDirPath = [fileManager stringWithFileSystemRepresentation:tempDirNameCString length:strlen(tempDirNameCString)];
                 free(tempDirNameCString);
+            }
             if (!tempTrashDirPath)
                 [[NSUserDefaults standardUserDefaults] setObject:tempTrashDirPath forKey:@"PithosTempTrashDirPath"];
             [tempTrashDirPath retain];
+        }
         return [tempTrashDirPath copy];
+    }
     #pragma mark -
     #pragma mark Sync
-...
                 self.lastCompletedSync = [NSDate date];
                 [activityFacility startAndEndActivityWithType:PithosActivityOther
                                                       message:[NSString stringWithFormat:@"Sync: Completed %@", lastCompletedSync]];
                 // The sync cycle is completed and the final operation is to move the Trash Folder the contents of the Temp Trash
                 NSString *trashDirPath = self.tempTrashDirPath;
                 if (tempTrashDirPath) {
                     NSError *error = nil;
                     NSArray *subPaths = [[NSFileManager defaultManager] subpathsOfDirectoryAtPath:trashDirPath error:&error];
                     if (error) {
                         [PithosUtilities fileActionFailedAlertWithTitle:@"Directory Contents Error"
                                                                 message:[NSString stringWithFormat:@"Cannot get contents of directory at '%@'", containerDirectoryPath]
                                                                   error:error];
                         return;
+                    }
                     if ([subPaths count]) {
                         NSMutableArray *subURLs = [NSMutableArray arrayWithCapacity:[subPaths count]];
                         for (NSString *subPath in subPaths) {
                             [subURLs addObject:[NSURL fileURLWithPath:[trashDirPath stringByAppendingPathComponent:subPath]]];
+                        }
                         syncOperationCount = 1;
                         [[NSWorkspace sharedWorkspace] recycleURLs:subURLs completionHandler:^(NSDictionary *newURLs, NSError *error) {
                             if (error) {
                                 [PithosUtilities fileActionFailedAlertWithTitle:@"Move to Trash Error"
                                                                         message:@"Cannot move files to Trash"
                                                                           error:error];
+                            }
                             syncOperationCount = 0;
                         }];
+                    }
+                }
+            }
+        }
+    }
-...
+            }
+        }
         NSString *containerDirectoryPath = [directoryPath stringByAppendingPathComponent:containerName];
         NSFileManager *fileManager = [NSFileManager defaultManager];
         BOOL isDirectory;
         NSError *error = nil;
-...
         [queue addOperation:[PithosUtilities prepareRequest:containerRequest priority:NSOperationQueuePriorityVeryHigh]];
+    }
     - (BOOL)moveToTempTrashFile:(NSString *)filePath {
         NSString *trashDirPath = self.tempTrashDirPath;
         if (!tempTrashDirPath)
             return NO;
         NSFileManager *fileManager = [NSFileManager defaultManager];
         BOOL isDirectory;
         BOOL fileExists = [fileManager fileExistsAtPath:filePath isDirectory:&isDirectory];
         NSError *error = nil;
         NSString *newFilePath = [filePath stringByReplacingOccurrencesOfString:containerDirectoryPath
                                                                     withString:trashDirPath];
         NSString *newDirPath = [newFilePath stringByDeletingLastPathComponent];
         if (fileExists && isDirectory) {
             NSArray *subPaths = [fileManager subpathsOfDirectoryAtPath:filePath error:&error];
             if (error) {
                 [PithosUtilities fileActionFailedAlertWithTitle:@"Directory Contents Error"
                                                         message:[NSString stringWithFormat:@"Cannot get contents of directory at '%@'", containerDirectoryPath]
                                                           error:error];
                 return NO;
+            }
             if (![fileManager createDirectoryAtPath:newDirPath withIntermediateDirectories:YES attributes:nil error:&error] || error) {
                 [PithosUtilities fileActionFailedAlertWithTitle:@"Create Directory Error"
                                                         message:[NSString stringWithFormat:@"Cannot create directory at '%@'", newDirPath]
                                                           error:error];
                 return NO;
+            }
             if (![fileManager moveItemAtPath:filePath toPath:newFilePath error:&error] || error) {
                 [PithosUtilities fileActionFailedAlertWithTitle:@"Move File Error"
                                                         message:[NSString stringWithFormat:@"Cannot move file at '%@' to '%@'",
                                                                  filePath, newFilePath]
                                                           error:error];
                 return NO;
+            }
             PithosLocalObjectState *currentState = [currentLocalObjectStates objectForKey:filePath];
             if (currentState) {
                 currentState.filePath = newFilePath;
                 [currentLocalObjectStates setObject:currentState forKey:newFilePath];
                 [currentLocalObjectStates removeObjectForKey:filePath];
             } else {
                 [currentLocalObjectStates setObject:[PithosLocalObjectState localObjectStateWithFile:newFilePath
                                                                                            blockHash:blockHash
                                                                                            blockSize:blockSize]
                                              forKey:newFilePath];
+            }
             for (NSString *subPath in subPaths) {
                 NSString *subFilePath = [filePath stringByAppendingPathComponent:subPath];
                 NSString *newSubFilePath = [subFilePath stringByReplacingOccurrencesOfString:containerDirectoryPath
                                                                                   withString:trashDirPath];
                 currentState = [currentLocalObjectStates objectForKey:subFilePath];
                 if (currentState) {
                     currentState.filePath = newSubFilePath;
                     [currentLocalObjectStates setObject:currentState forKey:newSubFilePath];
                     [currentLocalObjectStates removeObjectForKey:subFilePath];
                 } else {
                     [currentLocalObjectStates setObject:[PithosLocalObjectState localObjectStateWithFile:newSubFilePath
                                                                                                blockHash:blockHash
                                                                                                blockSize:blockSize]
                                                  forKey:newSubFilePath];
+                }
+            }
         } else if (fileExists && !isDirectory) {
             if (![fileManager createDirectoryAtPath:newDirPath withIntermediateDirectories:YES attributes:nil error:&error] || error) {
                 [PithosUtilities fileActionFailedAlertWithTitle:@"Create Directory Error"
                                                         message:[NSString stringWithFormat:@"Cannot create directory at '%@'", newDirPath]
                                                           error:error];
                 return NO;
+            }
             if (![fileManager moveItemAtPath:filePath toPath:newFilePath error:&error] || error) {
                 [PithosUtilities fileActionFailedAlertWithTitle:@"Move File Error"
                                                         message:[NSString stringWithFormat:@"Cannot move file at '%@' to '%@'",
                                                                  filePath, newFilePath]
                                                           error:error];
                 return NO;
+            }
             PithosLocalObjectState *currentState = [currentLocalObjectStates objectForKey:filePath];
             if (currentState) {
                 currentState.filePath = newFilePath;
                 [currentLocalObjectStates setObject:currentState forKey:newFilePath];
                 [currentLocalObjectStates removeObjectForKey:filePath];
             } else {
                 [currentLocalObjectStates setObject:[PithosLocalObjectState localObjectStateWithFile:newFilePath
                                                                                            blockHash:blockHash
                                                                                            blockSize:blockSize]
                                              forKey:newFilePath];
+            }
+        }
         return YES;
+    }
     - (void)updateLocalStateWithObject:(ASIPithosObject *)object
                          localFilePath:(NSString *)filePath {
         NSFileManager *fileManager = [NSFileManager defaultManager];
-...
         BOOL isDirectory;
         BOOL fileExists = [fileManager fileExistsAtPath:filePath isDirectory:&isDirectory];
         PithosLocalObjectState *storedState = [storedLocalObjectStates objectForKey:object.name];
         if (!object.hash) {
         if (!object || !object.hash) {
             // Delete local object
             // XXX move to local trash instead
             NSLog(@"Sync::delete local object: %@", filePath);
             BOOL deleteFailed = NO;
             if (fileExists) {
                 error = nil;
                 if (![fileManager removeItemAtPath:filePath error:&error] || error) {
                     [PithosUtilities fileActionFailedAlertWithTitle:@"Remove File Error"
                                                             message:[NSString stringWithFormat:@"Cannot remove file at '%@'", filePath]
                                                               error:error];
                     deleteFailed = YES;
+                }
+            }
             if (!deleteFailed) {
             if (!fileExists || [self moveToTempTrashFile:filePath]) {
                 [activityFacility startAndEndActivityWithType:PithosActivityOther
                                                       message:[NSString stringWithFormat:@"Sync: Deleting '%@' locally (finished)", object.name]];
                 [storedLocalObjectStates removeObjectForKey:object.name];
-...
             // Create local directory object
             NSLog(@"Sync::create local directory object: %@", filePath);
             BOOL directoryCreated = NO;
             if (fileExists && !isDirectory) {
                 NSLog(@"Sync::delete local file object: %@", filePath);
                 error = nil;
                 if (![fileManager removeItemAtPath:filePath error:&error] || error) {
                     [PithosUtilities fileActionFailedAlertWithTitle:@"Remove File Error"
                                                             message:[NSString stringWithFormat:@"Cannot remove file at '%@'", filePath]
                                                               error:error];
+                }
+            }
             if (![fileManager fileExistsAtPath:filePath]) {
             if (!fileExists || (!isDirectory && [self moveToTempTrashFile:filePath])) {
                 NSLog(@"Sync::local directory object doesn't exist: %@", filePath);
                 error = nil;
                 if (![fileManager createDirectoryAtPath:filePath withIntermediateDirectories:YES attributes:nil error:&error] || error) {
-...
                     storedState.isDirectory = YES;
                     [self saveLocalState];
+                }
             } else if (isDirectory) {
             } else {
                 NSLog(@"Sync::local directory object exists: %@", filePath);
                 directoryCreated = YES;
+            }
-...
             // Create local object with zero length
             NSLog(@"Sync::create local zero length object: %@", filePath);
             BOOL fileCreated = NO;
             if (fileExists && (isDirectory || [PithosUtilities bytesOfFile:filePath])) {
                 NSLog(@"Sync::delete local object: %@", filePath);
                 error = nil;
                 if (![fileManager removeItemAtPath:filePath error:&error] || error) {
                     [PithosUtilities fileActionFailedAlertWithTitle:@"Remove File Error"
                                                             message:[NSString stringWithFormat:@"Cannot remove file at '%@'", filePath]
                                                               error:error];
+                }
+            }
             if (![fileManager fileExistsAtPath:filePath]) {
             if (!fileExists || ((isDirectory || [PithosUtilities bytesOfFile:filePath]) && [self moveToTempTrashFile:filePath])) {
                 NSLog(@"Sync::local zero length object doesn't exist: %@", filePath);
                 error = nil;
                 if (![fileManager createFileAtPath:filePath contents:nil attributes:nil]) {
-...
                 } else {
                     fileCreated = YES;
                     storedState.hash = object.hash;
                     storedState.tmpDownloadFile = nil;
                     storedState.filePath = nil;
                     [self saveLocalState];
+                }
             } else if (!isDirectory && ![PithosUtilities bytesOfFile:filePath]) {
             } else {
                 NSLog(@"Sync::local zero length object exists: %@", filePath);
                 fileCreated = YES;
+            }
             if (fileCreated)
                 [activityFacility startAndEndActivityWithType:PithosActivityOther
                                                       message:[NSString stringWithFormat:@"Sync: Downloading '%@' (100%%)", object.name]];
         } else if (storedState.tmpDownloadFile == nil) {
         } else if (storedState.filePath == nil) {
             // Create new local object
             [self increaseSyncOperationCount];
             __block ASIPithosObjectRequest *objectRequest = [PithosUtilities objectBlockDataRequestWithContainerName:containerName
-...
             [activityFacility endActivity:[containerRequest.userInfo objectForKey:@"activity"]
                               withMessage:[containerRequest.userInfo objectForKey:@"finishedActivityMessage"]];
             NSFileManager *fileManager = [NSFileManager defaultManager];
             NSString *containerDirectoryPath = [directoryPath stringByAppendingPathComponent:containerName];
             NSError *error = nil;
             NSArray *subPaths = [fileManager subpathsOfDirectoryAtPath:containerDirectoryPath error:&error];
             if (error) {
-...
+                }
                 return;
+            }
             self.currentLocalObjectStates = [NSMutableDictionary dictionaryWithCapacity:[subPaths count]];
             for (NSString *objectName in subPaths) {
                 if (![storedLocalObjectStates objectForKey:objectName]) {
                     [storedLocalObjectStates setObject:[PithosLocalObjectState localObjectState] forKey:objectName];
+                }
                 NSString *filePath = [containerDirectoryPath stringByAppendingPathComponent:objectName];
                 [currentLocalObjectStates setObject:[PithosLocalObjectState localObjectStateWithFile:filePath
                                                                                            blockHash:blockHash
                                                                                            blockSize:blockSize]
                                              forKey:filePath];
+            }
             [self saveLocalState];
-...
                 NSLog(@"Sync::object name: %@", objectName);
                 PithosLocalObjectState *storedLocalObjectState = [storedLocalObjectStates objectForKey:object.name];
                 PithosLocalObjectState *currentLocalObjectState = [PithosLocalObjectState localObjectStateWithFile:filePath
                                                                                                          blockHash:blockHash
                                                                                                          blockSize:blockSize];
                 PithosLocalObjectState *currentLocalObjectState = [currentLocalObjectStates objectForKey:filePath];
                 if (!currentLocalObjectState)
                     currentLocalObjectState = [PithosLocalObjectState localObjectStateWithFile:filePath
                                                                                      blockHash:blockHash
                                                                                      blockSize:blockSize];
                 if (currentLocalObjectState.isDirectory)
                     object.contentType = @"application/directory";
-...
+            }
             PithosLocalObjectState *storedState = [storedLocalObjectStates objectForKey:object.name];
             if ((storedState.tmpDownloadFile == nil) || ![fileManager fileExistsAtPath:storedState.tmpDownloadFile]) {
             if ((storedState.filePath == nil) || ![fileManager fileExistsAtPath:storedState.filePath]) {
                 NSString *tempFileTemplate = [downloadsDirPath stringByAppendingPathComponent:@"download.XXXXXX"];
                 const char *tempFileTemplateCString = [tempFileTemplate fileSystemRepresentation];
                 char *tempFileNameCString = (char *)malloc(strlen(tempFileTemplateCString) + 1);
-...
                 free(tempFileNameCString);
                 if (fileDescriptor == -1) {
                     [PithosUtilities fileActionFailedAlertWithTitle:@"Create Temporary File Error"
                                                             message:[NSString stringWithFormat:@"Cannot create temporary file at '%@'", storedState.tmpDownloadFile]
                                                             message:[NSString stringWithFormat:@"Cannot create temporary file at '%@'", storedState.filePath]
                                                               error:nil];
                     [activityFacility endActivity:activity
                                       withMessage:[objectRequest.userInfo objectForKey:@"failedActivityMessage"]];
-...
                     return;
+                }
                 close(fileDescriptor);
                 storedState.tmpDownloadFile = tempFilePath;
                 storedState.filePath = tempFilePath;
                 [self saveLocalState];
+            }
             NSUInteger missingBlockIndex = [[objectRequest.userInfo objectForKey:@"missingBlockIndex"] unsignedIntegerValue];
             NSFileHandle *tempFileHandle = [NSFileHandle fileHandleForWritingAtPath:storedState.tmpDownloadFile];
             NSFileHandle *tempFileHandle = [NSFileHandle fileHandleForWritingAtPath:storedState.filePath];
             [tempFileHandle seekToFileOffset:missingBlockIndex*blockSize];
             [tempFileHandle writeData:[objectRequest responseData]];
             [tempFileHandle closeFile];
-...
             if (missingBlockIndex == NSNotFound) {
                 NSString *filePath = [objectRequest.userInfo objectForKey:@"filePath"];
                 NSString *dirPath = [filePath stringByDeletingLastPathComponent];
                 if ([fileManager fileExistsAtPath:filePath]) {
                     error = nil;
                     // XXX don't delete but move to local trash instead
                     [fileManager removeItemAtPath:filePath error:&error];
                     if (error != nil) {
                         [PithosUtilities fileActionFailedAlertWithTitle:@"Remove File Error"
                                                                 message:[NSString stringWithFormat:@"Cannot remove file at '%@'", filePath]
                                                                   error:error];
                         [activityFacility endActivity:activity
                                           withMessage:[objectRequest.userInfo objectForKey:@"failedActivityMessage"]];
                         @synchronized(self) {
                             syncIncomplete = YES;
                             [self decreaseSyncOperationCount];
                             if (newSyncRequested && !syncOperationCount)
                                 [self sync];
+                        }
                         return;
                 if ([fileManager fileExistsAtPath:filePath] && ![self moveToTempTrashFile:filePath]) {
                     [activityFacility endActivity:activity
                                       withMessage:[objectRequest.userInfo objectForKey:@"failedActivityMessage"]];
                     @synchronized(self) {
                         syncIncomplete = YES;
                         [self decreaseSyncOperationCount];
                         if (newSyncRequested && !syncOperationCount)
                             [self sync];
+                    }
                     return;
                 } else if (![fileManager fileExistsAtPath:dirPath]) {
                     // File doesn't exist but also the containing directory doesn't exist
                     // In most cases this should have been resolved as an update of the corresponding local object,
-...
+                }
                 // Move file from tmp download
                 error = nil;
                 [fileManager moveItemAtPath:storedState.tmpDownloadFile toPath:filePath error:&error];
                 [fileManager moveItemAtPath:storedState.filePath toPath:filePath error:&error];
                 if (error != nil) {
                     [PithosUtilities fileActionFailedAlertWithTitle:@"Move File Error"
                                                             message:[NSString stringWithFormat:@"Cannot move file at '%@' to '%@'", storedState.tmpDownloadFile, filePath]
                                                             message:[NSString stringWithFormat:@"Cannot move file at '%@' to '%@'", storedState.filePath, filePath]
                                                               error:error];
                     [activityFacility endActivity:activity
                                       withMessage:[objectRequest.userInfo objectForKey:@"failedActivityMessage"]];
-...
                                  currentBytes:activity.totalBytes];
                 storedState.hash = object.hash;
                 storedState.tmpDownloadFile = nil;
                 storedState.filePath = nil;
                 [self saveLocalState];
                 @synchronized(self) {
-...
             } else {
                 ASIPithosObject *object = [objectRequest.userInfo objectForKey:@"pithosObject"];
                 PithosLocalObjectState *storedState = [storedLocalObjectStates objectForKey:object.name];
                 if ([PithosUtilities bytesOfFile:storedState.tmpDownloadFile] > object.bytes)
                     [[NSFileHandle fileHandleForWritingAtPath:storedState.tmpDownloadFile] truncateFileAtOffset:object.bytes];
                 if ([PithosUtilities bytesOfFile:storedState.filePath] > object.bytes)
                     [[NSFileHandle fileHandleForWritingAtPath:storedState.filePath] truncateFileAtOffset:object.bytes];
                 PithosActivity *activity = [objectRequest.userInfo objectForKey:@"activity"];
                 NSIndexSet *missingBlocks = [PithosUtilities missingBlocksForFile:storedState.tmpDownloadFile
                 NSIndexSet *missingBlocks = [PithosUtilities missingBlocksForFile:storedState.filePath
                                                                         blockSize:blockSize
                                                                         blockHash:blockHash
                                                                        withHashes:[objectRequest hashes]];

     	<key>CFBundleExecutable</key>
     	<string>${EXECUTABLE_NAME}</string>
     	<key>CFBundleIconFile</key>
     	<string></string>
     	<string>pithos.icns</string>
     	<key>CFBundleIdentifier</key>
     	<string>gr.grnet.${PRODUCT_NAME:rfc1034identifier}</string>
     	<key>CFBundleInfoDictionaryVersion</key>
-...
     	<array>
     		<dict>
     			<key>CFBundleURLName</key>
     			<string>Pithos&apos; URL</string>
     			<string>Pithos' URL</string>
     			<key>CFBundleURLSchemes</key>
     			<array>
     				<string>pithos</string>
-...
     	<string>https://pithos.dev.grnet.gr</string>
     	<key>PithosStorageURLPrefix</key>
     	<string>https://pithos.dev.grnet.gr/v1</string>
     	<key>PithosSyncDirectoryPath</key>
     	<string></string>
     	<key>PithosSyncContainerName</key>
     	<string>pithos</string>
     	<key>PithosSyncDirectoryPath</key>
     	<string></string>
     	<key>PithosSyncTimeInterval</key>
     	<real>180</real>
     </dict>

Also available in: Unified diff

Synnefo » Pithos MacOS Client

Revision df003f06