Author: rmottola
Date: Wed Dec 2 18:03:23 2015
New Revision: 39210
URL: http://svn.gna.org/viewcvs/gnustep?rev=39210&view=rev
Log:
Factor out writing thumbnail dictionary in a common method
Modified:
apps/gworkspace/trunk/ChangeLog
apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.h
apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.m
Modified: apps/gworkspace/trunk/ChangeLog
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/ChangeLog?rev=39210&r1=39209&r2=39210&view=diff
==============================================================================
--- apps/gworkspace/trunk/ChangeLog (original)
+++ apps/gworkspace/trunk/ChangeLog Wed Dec 2 18:03:23 2015
@@ -1,3 +1,9 @@
+2015-12-02 Riccardo Mottola <[email protected]>
+
+ * GWorkspace/Thumbnailer/GWThumbnailer.h
+ * GWorkspace/Thumbnailer/GWThumbnailer.m
+ Factor out writing thumbnail dictionary in a common method.
+
2015-12-02 Riccardo Mottola <[email protected]>
* GWorkspace/Thumbnailer/GWThumbnailer.h
Modified: apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.h
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.h?rev=39210&r1=39209&r2=39210&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.h
(original)
+++ apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.h Wed Dec
2 18:03:23 2015
@@ -51,9 +51,12 @@
NSTimer *timer;
NSConnection *conn;
NSFileManager *fm;
+ NSLock *dictLock;
}
+ (Thumbnailer *)sharedThumbnailer;
+
+- (void)writeDictToFile;
- (void)loadThumbnailers;
Modified: apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.m
URL:
http://svn.gna.org/viewcvs/gnustep/apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.m?rev=39210&r1=39209&r2=39210&view=diff
==============================================================================
--- apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.m
(original)
+++ apps/gworkspace/trunk/GWorkspace/Thumbnailer/GWThumbnailer.m Wed Dec
2 18:03:23 2015
@@ -49,6 +49,7 @@
{
if (nil == sharedThumbnailerInstance)
{
+ NSLog(@"first shared instance");
sharedThumbnailerInstance = [[Thumbnailer allocWithZone:NULL] init];
countInstances = 1;
}
@@ -93,7 +94,7 @@
NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults];
id entry;
BOOL isdir;
-
+
fm = [NSFileManager defaultManager];
extProviders = [NSMutableDictionary new];
[self loadThumbnailers];
@@ -130,7 +131,8 @@
thumbsDict = [NSMutableDictionary new];
}
- [thumbsDict writeToFile: dictPath atomically: YES];
+ [self writeDictToFile];
+
/* FIXME: this could be a problem with different instances for View
@@ -141,6 +143,12 @@
}
return self;
+}
+
+- (void)writeDictToFile
+{
+ NSLog(@"writing to: %@", dictPath);
+ [thumbsDict writeToFile: dictPath atomically: YES];
}
@@ -269,9 +277,9 @@
NSMutableDictionary *info = [NSMutableDictionary dictionary];
[info setObject: deleted forKey: @"deleted"];
- [info setObject: [NSArray array] forKey: @"created"];
-
- [thumbsDict writeToFile: dictPath atomically: YES];
+ [info setObject: [NSArray array] forKey: @"created"];
+
+ [self writeDictToFile];
[[NSDistributedNotificationCenter defaultCenter]
postNotificationName: GWThumbnailsDidChangeNotification
@@ -332,10 +340,10 @@
forKey: @"thumbref"];
[defaults synchronize];
- [info setObject: [NSArray array] forKey: @"deleted"];
+ [info setObject: [NSArray array] forKey: @"deleted"];
[info setObject: added forKey: @"created"];
- [thumbsDict writeToFile: dictPath atomically: YES];
+ [self writeDictToFile];
[[NSDistributedNotificationCenter defaultCenter]
postNotificationName: GWThumbnailsDidChangeNotification
@@ -383,9 +391,9 @@
NSMutableDictionary *info = [NSMutableDictionary dictionary];
[info setObject: deleted forKey: @"deleted"];
- [info setObject: [NSArray array] forKey: @"created"];
-
- [thumbsDict writeToFile: dictPath atomically: YES];
+ [info setObject: [NSArray array] forKey: @"created"];
+
+ [self writeDictToFile];
[[NSDistributedNotificationCenter defaultCenter]
postNotificationName: GWThumbnailsDidChangeNotification
_______________________________________________
Gnustep-cvs mailing list
[email protected]
https://mail.gna.org/listinfo/gnustep-cvs
