Changeset 1319
- Timestamp:
- 09/13/10 08:41:46 (21 months ago)
- Location:
- trunk/SapphireFrappliance
- Files:
-
- 4 added
- 8 modified
-
Browser/SapphireMarkMenu.m (modified) (4 diffs)
-
MetaData/SapphireMObjects/SapphireFileMetaData.h (modified) (1 diff)
-
MetaData/SapphireMObjects/SapphireFileMetaData.m (modified) (11 diffs)
-
MetaDataImporting/SapphireAllImporter.m (modified) (3 diffs)
-
MetaDataImporting/SapphireMovieImporter.m (modified) (2 diffs)
-
MetaDataImporting/SapphireQTMovieParser.h (added)
-
MetaDataImporting/SapphireQTMovieParser.m (added)
-
MetaDataImporting/SapphireQuickTimeImporter.h (added)
-
MetaDataImporting/SapphireQuickTimeImporter.m (added)
-
MetaDataImporting/SapphireTVShowImporter.m (modified) (4 diffs)
-
MetaDataImporting/SapphireXMLFileDataImporter.m (modified) (1 diff)
-
Sapphire.xcodeproj/project.pbxproj (modified) (5 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/SapphireFrappliance/Browser/SapphireMarkMenu.m
r1285 r1319 320 320 } 321 321 int importType = [fileMeta importTypeValue]; 322 if(importType | I MPORT_TYPE_TVSHOW_MASK)322 if(importType | ImportTypeMaskTVShow) 323 323 { 324 324 [marks addObject: … … 329 329 nil]]; 330 330 } 331 if(importType | I MPORT_TYPE_MOVIE_MASK)331 if(importType | ImportTypeMaskMovie) 332 332 { 333 333 [marks addObject: … … 635 635 break; 636 636 case COMMAND_MARK_TO_REFETCH_TV: 637 setSubtreeToReimportFromMask(dirMeta, I MPORT_TYPE_TVSHOW_MASK);637 setSubtreeToReimportFromMask(dirMeta, ImportTypeMaskTVShow); 638 638 break; 639 639 case COMMAND_MARK_TO_REFETCH_MOVIE: 640 setSubtreeToReimportFromMask(dirMeta, I MPORT_TYPE_MOVIE_MASK);640 setSubtreeToReimportFromMask(dirMeta, ImportTypeMaskMovie); 641 641 break; 642 642 case COMMAND_MARK_TO_DELETE_METADATA: … … 740 740 break; 741 741 case COMMAND_MARK_TO_REFETCH_TV: 742 [fileMeta setToReimportFromMaskValue:I MPORT_TYPE_TVSHOW_MASK];742 [fileMeta setToReimportFromMaskValue:ImportTypeMaskTVShow]; 743 743 break; 744 744 case COMMAND_MARK_TO_REFETCH_MOVIE: 745 [fileMeta setToReimportFromMaskValue:I MPORT_TYPE_MOVIE_MASK];745 [fileMeta setToReimportFromMaskValue:ImportTypeMaskMovie]; 746 746 break; 747 747 case COMMAND_MARK_TO_DELETE_METADATA: -
trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.h
r1273 r1319 62 62 63 63 typedef enum { 64 IMPORT_TYPE_FILE_MASK = 1, 65 IMPORT_TYPE_XML_MASK = 2, 66 IMPORT_TYPE_TVSHOW_MASK = 4, 67 IMPORT_TYPE_MOVIE_MASK = 8, 68 IMPORT_TYPE_ALL_MASK = 0xf, 64 ImportTypeMaskFile = 1, 65 ImportTypeMaskXML = 2, 66 ImportTypeMaskTVShow = 4, 67 ImportTypeMaskMovie = 8, 68 ImportTypeMaskQT = 0x10, 69 ImportTypeMaskAll = 0x1f, 69 70 } ImportTypeMask; 70 71 -
trunk/SapphireFrappliance/MetaData/SapphireMObjects/SapphireFileMetaData.m
r1317 r1319 174 174 newFile.fileContainerType = [oldFile valueForKey:@"fileContainerType"]; 175 175 newFile.hasVideo = [oldFile valueForKey:@"hasVideo"]; 176 newFile.importTypeValue = [[oldFile valueForKey:@"importType"] intValue] & ~I MPORT_TYPE_XML_MASK;176 newFile.importTypeValue = [[oldFile valueForKey:@"importType"] intValue] & ~ImportTypeMaskXML; 177 177 newFile.modified = [oldFile valueForKey:@"modified"]; 178 178 newFile.added = [oldFile valueForKey:@"modified"]; … … 235 235 [xml insertDictionary:xmlDict]; 236 236 xml.modified = [NSDate dateWithTimeIntervalSince1970:[[xmlDict objectForKey:META_FILE_MODIFIED_KEY] intValue]]; 237 self.importTypeValue |= I MPORT_TYPE_XML_MASK;237 self.importTypeValue |= ImportTypeMaskXML; 238 238 } 239 239 value = [dict objectForKey:@"TVRage Source"]; … … 256 256 [(NSMutableDictionary *)[defer objectForKey:@"TV Shows"] setObject:ep.tvShow forKey:[value objectForKey:META_SHOW_IDENTIFIER_KEY]]; 257 257 } 258 self.importTypeValue |= I MPORT_TYPE_TVSHOW_MASK;258 self.importTypeValue |= ImportTypeMaskTVShow; 259 259 } 260 260 value = [dict objectForKey:@"IMDB Source"]; … … 276 276 } 277 277 } 278 self.importTypeValue |= I MPORT_TYPE_MOVIE_MASK;278 self.importTypeValue |= ImportTypeMaskMovie; 279 279 } 280 280 NSString *joinPath = [dict objectForKey:META_FILE_JOINED_FILE_KEY]; … … 398 398 if(xmlProps) 399 399 modTime = [[xmlProps objectForKey:NSFileModificationDate] timeIntervalSince1970]; 400 if(modTime != [self importedTimeFromSource:I MPORT_TYPE_XML_MASK])400 if(modTime != [self importedTimeFromSource:ImportTypeMaskXML]) 401 401 //XML modification time does not match our last import 402 402 return YES; 403 403 404 //Match imp rorts, but exclude xml and file b/c they are tracked through other means405 int match = I MPORT_TYPE_ALL_MASK & ~IMPORT_TYPE_FILE_MASK & ~IMPORT_TYPE_XML_MASK;404 //Match imports, but exclude xml and file b/c they are tracked through other means 405 int match = ImportTypeMaskAll & ~ImportTypeMaskFile & ~ImportTypeMaskXML; 406 406 switch (self.fileClassValue) { 407 407 case FILE_CLASS_TV_SHOW: 408 match &= ~I MPORT_TYPE_MOVIE_MASK;408 match &= ~ImportTypeMaskMovie; 409 409 break; 410 410 case FILE_CLASS_MOVIE: 411 match &= ~I MPORT_TYPE_TVSHOW_MASK;411 match &= ~ImportTypeMaskTVShow; 412 412 break; 413 413 default: … … 653 653 int currentMask = self.importTypeValue; 654 654 self.importTypeValue = currentMask & ~mask; 655 if(mask & I MPORT_TYPE_MOVIE_MASK)655 if(mask & ImportTypeMaskMovie) 656 656 { 657 657 SapphireMovie *movie = self.movie; … … 660 660 [[self managedObjectContext] deleteObject:movie]; 661 661 } 662 if(mask & I MPORT_TYPE_TVSHOW_MASK)662 if(mask & ImportTypeMaskTVShow) 663 663 { 664 664 SapphireEpisode *ep = self.tvEpisode; … … 721 721 } 722 722 723 [self setToReimportFromMaskValue:I MPORT_TYPE_ALL_MASK];723 [self setToReimportFromMaskValue:ImportTypeMaskAll]; 724 724 } 725 725 … … 1155 1155 - (long)importedTimeFromSource:(int)source 1156 1156 { 1157 if(source == I MPORT_TYPE_FILE_MASK)1157 if(source == ImportTypeMaskFile) 1158 1158 return [self.modified timeIntervalSince1970]; 1159 else if(source == I MPORT_TYPE_XML_MASK)1159 else if(source == ImportTypeMaskXML) 1160 1160 return [self.xmlData.modified timeIntervalSince1970]; 1161 1161 return 0; … … 1176 1176 { 1177 1177 [self setFileClassValue:FILE_CLASS_MOVIE]; 1178 self.importTypeValue |= I MPORT_TYPE_MOVIE_MASK;1178 self.importTypeValue |= ImportTypeMaskMovie; 1179 1179 } 1180 1180 if(movie != oldMovie) … … 1191 1191 { 1192 1192 [self setFileClassValue:FILE_CLASS_TV_SHOW]; 1193 self.importTypeValue |= I MPORT_TYPE_TVSHOW_MASK;1193 self.importTypeValue |= ImportTypeMaskTVShow; 1194 1194 } 1195 1195 if(ep != oldEp) -
trunk/SapphireFrappliance/MetaDataImporting/SapphireAllImporter.m
r1049 r1319 25 25 #import "SapphireMovieImporter.h" 26 26 #import "SapphireNfoImporter.h" 27 #import "SapphireQuickTimeImporter.h" 27 28 28 29 @implementation SapphireAllImporter … … 30 31 - (id) init 31 32 { 33 SapphireQuickTimeImporter *qt = [[SapphireQuickTimeImporter alloc] init]; 32 34 SapphireXMLFileDataImporter *xml = [[SapphireXMLFileDataImporter alloc] init]; 33 35 SapphireFileDataImporter *file = [[SapphireFileDataImporter alloc] init]; … … 36 38 SapphireMovieImporter *movie = [[SapphireMovieImporter alloc] init]; 37 39 NSArray *ourImporters = [[NSArray alloc] initWithObjects: 40 qt, 38 41 xml, 39 42 nfo, -
trunk/SapphireFrappliance/MetaDataImporting/SapphireMovieImporter.m
r1317 r1319 404 404 if(importComplete) 405 405 { 406 [currentData didImportType:I MPORT_TYPE_MOVIE_MASK];406 [currentData didImportType:ImportTypeMaskMovie]; 407 407 if (status == ImportStateNotUpdated && [currentData fileClassValue] != FILE_CLASS_TV_SHOW) 408 408 [currentData setFileClassValue:FILE_CLASS_UNKNOWN]; … … 455 455 cancelled = NO; 456 456 /*Check to see if it is already imported*/ 457 if([metaData importTypeValue] & I MPORT_TYPE_MOVIE_MASK)457 if([metaData importTypeValue] & ImportTypeMaskMovie) 458 458 return ImportStateNotUpdated; 459 459 /*Get path*/ -
trunk/SapphireFrappliance/MetaDataImporting/SapphireTVShowImporter.m
r1317 r1319 564 564 if(importComplete) 565 565 { 566 [currentData didImportType:I MPORT_TYPE_TVSHOW_MASK];566 [currentData didImportType:ImportTypeMaskTVShow]; 567 567 if (status == ImportStateNotUpdated && [currentData fileClassValue] != FILE_CLASS_MOVIE) 568 568 [currentData setFileClassValue:FILE_CLASS_UNKNOWN]; … … 601 601 cancelled = NO; 602 602 /*Check to see if it is already imported*/ 603 if([metaData importTypeValue] & I MPORT_TYPE_TVSHOW_MASK)603 if([metaData importTypeValue] & ImportTypeMaskTVShow) 604 604 return ImportStateNotUpdated; 605 605 // NSArray *pathComponents = [path pathComponents]; … … 642 642 if(index == NSNotFound) 643 643 { 644 [metaData didImportType:I MPORT_TYPE_TVSHOW_MASK];644 [metaData didImportType:ImportTypeMaskTVShow]; 645 645 return ImportStateNotUpdated; 646 646 } … … 672 672 if(season == 0) 673 673 { 674 [metaData didImportType:I MPORT_TYPE_TVSHOW_MASK];674 [metaData didImportType:ImportTypeMaskTVShow]; 675 675 return ImportStateNotUpdated; 676 676 } -
trunk/SapphireFrappliance/MetaDataImporting/SapphireXMLFileDataImporter.m
r1288 r1319 119 119 stat([xmlFilePath fileSystemRepresentation], &sb); 120 120 long modTime = sb.st_mtimespec.tv_sec; 121 long oldTime = [metaData importedTimeFromSource:I MPORT_TYPE_XML_MASK];121 long oldTime = [metaData importedTimeFromSource:ImportTypeMaskXML]; 122 122 if(oldTime == modTime) 123 123 return ImportStateNotUpdated; -
trunk/SapphireFrappliance/Sapphire.xcodeproj/project.pbxproj
r1251 r1319 102 102 F56B77D70C3858B400E934AA /* DefaultPreview.png in Resources */ = {isa = PBXBuildFile; fileRef = F56B77D60C3858B400E934AA /* DefaultPreview.png */; }; 103 103 F571B7AE0E9C360500B7FD9D /* NSManagedObject-Extensions.m in Sources */ = {isa = PBXBuildFile; fileRef = F571B7AD0E9C360500B7FD9D /* NSManagedObject-Extensions.m */; }; 104 F571FA3E11FB366A00FE07AE /* SapphireQTMovieParser.m in Sources */ = {isa = PBXBuildFile; fileRef = F571FA3B11FB366A00FE07AE /* SapphireQTMovieParser.m */; }; 105 F571FA3F11FB366A00FE07AE /* SapphireQuickTimeImporter.m in Sources */ = {isa = PBXBuildFile; fileRef = F571FA3D11FB366A00FE07AE /* SapphireQuickTimeImporter.m */; }; 104 106 F582536710E5228B00E832C7 /* _SapphireTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = F582536610E5228B00E832C7 /* _SapphireTranslation.m */; }; 105 107 F582536B10E522C400E832C7 /* SapphireTranslation.m in Sources */ = {isa = PBXBuildFile; fileRef = F582536A10E522C400E832C7 /* SapphireTranslation.m */; }; … … 516 518 F571B7AC0E9C360500B7FD9D /* NSManagedObject-Extensions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "NSManagedObject-Extensions.h"; sourceTree = "<group>"; }; 517 519 F571B7AD0E9C360500B7FD9D /* NSManagedObject-Extensions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSManagedObject-Extensions.m"; sourceTree = "<group>"; }; 520 F571FA3A11FB366A00FE07AE /* SapphireQTMovieParser.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireQTMovieParser.h; sourceTree = "<group>"; }; 521 F571FA3B11FB366A00FE07AE /* SapphireQTMovieParser.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireQTMovieParser.m; sourceTree = "<group>"; }; 522 F571FA3C11FB366A00FE07AE /* SapphireQuickTimeImporter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SapphireQuickTimeImporter.h; sourceTree = "<group>"; }; 523 F571FA3D11FB366A00FE07AE /* SapphireQuickTimeImporter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SapphireQuickTimeImporter.m; sourceTree = "<group>"; }; 518 524 F582536510E5228B00E832C7 /* _SapphireTranslation.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = _SapphireTranslation.h; sourceTree = "<group>"; }; 519 525 F582536610E5228B00E832C7 /* _SapphireTranslation.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = _SapphireTranslation.m; sourceTree = "<group>"; }; … … 1013 1019 FE4BE49D0CBEAC7F00A7B24E /* SapphirePosterChooser.h */, 1014 1020 FE4BE49E0CBEAC7F00A7B24E /* SapphirePosterChooser.m */, 1021 F571FA3A11FB366A00FE07AE /* SapphireQTMovieParser.h */, 1022 F571FA3B11FB366A00FE07AE /* SapphireQTMovieParser.m */, 1023 F571FA3C11FB366A00FE07AE /* SapphireQuickTimeImporter.h */, 1024 F571FA3D11FB366A00FE07AE /* SapphireQuickTimeImporter.m */, 1015 1025 F5F515E810DD8B21006B9DED /* SapphireSiteScraper.h */, 1016 1026 F5F515E910DD8B21006B9DED /* SapphireSiteScraper.m */, … … 1323 1333 buildConfigurationList = 1DEB913E08733D840010E9CD /* Build configuration list for PBXProject "Sapphire" */; 1324 1334 compatibilityVersion = "Xcode 3.0"; 1335 developmentRegion = English; 1325 1336 hasScannedForEncodings = 1; 1326 1337 knownRegions = ( … … 1593 1604 F595C614111A679D00C6C322 /* SapphireCMPWrapper.m in Sources */, 1594 1605 F5E3375810E98D7D00D252B6 /* SapphireOtherInformation.m in Sources */, 1606 F571FA3E11FB366A00FE07AE /* SapphireQTMovieParser.m in Sources */, 1607 F571FA3F11FB366A00FE07AE /* SapphireQuickTimeImporter.m in Sources */, 1595 1608 ); 1596 1609 runOnlyForDeploymentPostprocessing = 0;
