Merge pull request #304 from volz-io/aglv

#299 again
horosproject · Mar 29, 2018 · 682bc83 · 682bc83
2 parents 531e005 + 9cfd232
commit 682bc83
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 2 deletions.
diff --git a/Horos/Sources/BurnerWindowController.m b/Horos/Sources/BurnerWindowController.m
@@ -61,6 +61,7 @@ This file is part of the Horos Project (www.horosproject.org)
 #import "DicomFileDCMTKCategory.h"
 #import "DCMUIDs.h"
 #import "DicomDatabase+DCMTK.h"
+#import "Horos.h"
 
 @implementation BurnerWindowController
 
@@ -1045,10 +1046,28 @@ - (void) prepareCDContent: (NSMutableArray*) dbObjects :(NSMutableArray*) origin
             {
                 thread.name = NSLocalizedString( @"Burning...", nil);
                 thread.status = NSLocalizedString( @"Adding Weasis...", nil);
+
                 NSString* weasisPath = [[AppController sharedAppController] weasisBasePath];
                 for (NSString* subpath in [[NSFileManager defaultManager] contentsOfDirectoryAtPath:weasisPath error:NULL])
                     [[NSFileManager defaultManager] copyItemAtPath:[weasisPath stringByAppendingPathComponent:subpath] toPath:[burnFolder stringByAppendingPathComponent:subpath] error:NULL];
 
+                NSString *burnWeasisPath = [burnFolder stringByAppendingPathComponent:@"weasis"];
+                NSArray *skips = @[ @".DS_Store" ];
+                for (NSString *weasisPath in [[Horos WeasisCustomizationPaths] reverseObjectEnumerator]) { // reversed to mimic the WebPortal priorities
+                    NSDirectoryEnumerator *de = [[NSFileManager defaultManager] enumeratorAtPath:weasisPath];
+                    for (NSString *subpath in de)
+                        if (![skips containsObject:subpath.lastPathComponent]) {
+                            NSString *source = [weasisPath stringByAppendingPathComponent:subpath], *dest = [burnWeasisPath stringByAppendingPathComponent:subpath];;
+                            if ([de.fileAttributes[NSFileType] isEqual:NSFileTypeDirectory]) {
+                                [[NSFileManager defaultManager] createDirectoryAtPath:dest withIntermediateDirectories:YES attributes:nil error:NULL];
+                            } else {
+                                if ([[NSFileManager defaultManager] fileExistsAtPath:dest])
+                                    [[NSFileManager defaultManager] removeItemAtPath:dest error:NULL];
+                                [[NSFileManager defaultManager] copyItemAtPath:[weasisPath stringByAppendingPathComponent:subpath] toPath:dest error:NULL];
+                            }
+                        }
+                }
+
                 // Change Label in Autorun.inf
                 NSStringEncoding encoding;
                 NSString *autorunInf = [NSString stringWithContentsOfFile: [burnFolder stringByAppendingPathComponent: @"Autorun.inf"] usedEncoding: &encoding error: nil];

diff --git a/Horos/Sources/Horos.h b/Horos/Sources/Horos.h
@@ -47,6 +47,8 @@ NS_ASSUME_NONNULL_BEGIN
 + (NSDateComponents *)components:(NSCalendarUnit)flags fromDate:(NSDate *)date;
 + (NSString *):(NSDate *)date descriptionWithCalendarFormat:(NSString *)format;
 
++ (NSArray<NSString *> *)WeasisCustomizationPaths;
+
 @end
 
 NS_ASSUME_NONNULL_END
diff --git a/Horos/Sources/Horos.m b/Horos/Sources/Horos.m
@@ -106,4 +106,8 @@ + (NSDateComponents *)components:(NSCalendarUnit)flags fromDate:(NSDate *)date {
 #pragma clang diagnostic pop
 }
 
++ (NSArray<NSString *> *)WeasisCustomizationPaths {
+    return @[ [@"~/Library/Application Support/Horos/Weasis" stringByExpandingTildeInPath], @"/Library/Application Support/Horos/Weasis" ];
+}
+
 @end
diff --git a/Horos/Sources/WebPortalConnection.mm b/Horos/Sources/WebPortalConnection.mm
@@ -75,6 +75,7 @@ This file is part of the Horos Project (www.horosproject.org)
 #import "N2Alignment.h"
 #import "AppController.h"
 #import "PluginManager.h"
+#import "Horos.h"
 
 #import "JSON.h"
 
@@ -495,8 +496,8 @@ - (void) alive:(id) sender
 	{
 		#ifndef OSIRIX_LIGHT
         BOOL assigned = false;
-        for (NSString *dir in self.portal.dirsToScanForFiles) {
-            NSString *path = [dir stringByAppendingPathComponent:self.requestedPath];
+        for (NSString *dir in [Horos WeasisCustomizationPaths]) {
+            NSString *path = [dir stringByAppendingPathComponent:[self.requestedPath substringFromIndex:8]];
             BOOL isDir;
             if ([[NSFileManager defaultManager] fileExistsAtPath:path isDirectory:&isDir] && !isDir)
                 if ((response.data = [NSData dataWithContentsOfFile:path])) {