From da0fb55ae0edeabb594ccb9c4236442cbf5a6180 Mon Sep 17 00:00:00 2001 From: Matthias Neeracher Date: Mon, 16 Mar 2015 16:02:09 +0100 Subject: [PATCH] Clean print job names, modification dates for logs --- AVRsack/ASFileTree.swift | 6 ------ AVRsack/ASProjDoc.swift | 14 ++++++++++++-- 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/AVRsack/ASFileTree.swift b/AVRsack/ASFileTree.swift index 66c21cf..49f612f 100644 --- a/AVRsack/ASFileTree.swift +++ b/AVRsack/ASFileTree.swift @@ -111,12 +111,6 @@ class ASLogNode : ASFileNode { override func nodeName() -> String { return "📜 "+name } - override func modDate() -> NSDate? { - let url = NSURL(fileURLWithPath: path) - var date: AnyObject? - url?.getResourceValue(&date, forKey: NSURLContentModificationDateKey, error: nil) - return date as? NSDate - } } class ASFileGroup : ASFileNode { diff --git a/AVRsack/ASProjDoc.swift b/AVRsack/ASProjDoc.swift index 354a4c3..5dd205a 100644 --- a/AVRsack/ASProjDoc.swift +++ b/AVRsack/ASProjDoc.swift @@ -293,7 +293,17 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa NSThread.detachNewThreadSelector(didPrintSelector, toTarget: del, withObject: contextInfo as? AnyObject) } } - printModDate = mainEditor?.modDate() + if let logNode = mainEditor as? ASLogNode { + let url = fileURL!.URLByDeletingLastPathComponent?.URLByAppendingPathComponent(logNode.path) + var modified : AnyObject? + if url?.getResourceValue(&modified, forKey:NSURLAttributeModificationDateKey, error:nil) != nil { + printModDate = modified as? NSDate + } else { + printModDate = nil + } + } else { + printModDate = mainEditor?.modDate() + } printRevision = mainEditor?.revision() printShowPanel = showPrintPanel @@ -330,7 +340,7 @@ class ASProjDoc: NSDocument, NSOutlineViewDelegate, NSMenuDelegate, NSOpenSavePa } func startPrintOperation(printOp: NSPrintOperation) { - printOp.jobTitle = mainEditor?.nodeName() ?? + printOp.jobTitle = mainEditor?.name ?? fileURL?.lastPathComponent?.stringByDeletingPathExtension ?? "Untitled" printOp.showsPrintPanel = printShowPanel