Added scene number parsing

HendrikNoeller · May 11, 2016 · 872a5a5 · 872a5a5
1 parent a7b215f
commit 872a5a5
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 1 deletion.
diff --git a/...odeproj/project.xcworkspace/xcuserdata/Hendrik.xcuserdatad/UserInterfaceState.xcuserstate b/...odeproj/project.xcworkspace/xcuserdata/Hendrik.xcuserdatad/UserInterfaceState.xcuserstate
diff --git a/Writer/ContinousFountainParser.h b/Writer/ContinousFountainParser.h
@@ -22,6 +22,7 @@
 - (NSString*)stringAtLine:(NSUInteger)line;
 - (LineType)typeAtLine:(NSUInteger)line;
 - (NSUInteger)positionAtLine:(NSUInteger)line;
+- (NSString*)sceneNumberAtLine:(NSUInteger)line;
 
 //Convenience Methods for Outlineview data
 - (BOOL)getAndResetChangeInOutline;

diff --git a/Writer/ContinousFountainParser.m b/Writer/ContinousFountainParser.m
@@ -323,6 +323,15 @@ - (void)parseTypeAndFormattingForLine:(Line*)line atIndex:(NSUInteger)index
                                       and:NOTE_CLOSE_PATTERN
                                withLength:NOTE_PATTERN_LENGTH
                          excludingIndices:nil];
+
+    if (line.type == heading) {
+        NSRange sceneNumberRange = [self sceneNumberForChars:charArray ofLength:length];
+        if (sceneNumberRange.length == 0) {
+            line.sceneNumber = nil;
+        } else {
+            line.sceneNumber = [line.string substringWithRange:sceneNumberRange];
+        }
+    }
 }
 
 - (LineType)parseLineType:(Line*)line atIndex:(NSUInteger)index
@@ -591,6 +600,25 @@ - (NSMutableIndexSet*)rangesOfOmitChars:(unichar*)string ofLength:(NSUInteger)le
     return indexSet;
 }
 
+- (NSRange)sceneNumberForChars:(unichar*)string ofLength:(NSUInteger)length
+{
+    NSUInteger backNumberIndex = NSNotFound;
+    for(NSInteger i = length - 1; i >= 0; i--) {
+        char c = string[i];
+        if (c == ' ') continue;
+        if (backNumberIndex == NSNotFound) {
+            if (c == '#') backNumberIndex = i;
+            else break;
+        } else {
+            if (c == '#') {
+                return NSMakeRange(i+1, backNumberIndex-i-1);
+            }
+        }
+    }
+    return NSMakeRange(0, 0);
+}
+
+
 #pragma mark - Data access
 
 - (NSString*)stringAtLine:(NSUInteger)line
@@ -623,6 +651,16 @@ - (NSUInteger)positionAtLine:(NSUInteger)line
     }
 }
 
+- (NSString*)sceneNumberAtLine:(NSUInteger)line
+{
+    if (line >= [self.lines count]) {
+        return nil;
+    } else {
+        Line* l = self.lines[line];
+        return l.sceneNumber;
+    }
+}
+
 
 #pragma mark - Outline Dat
 

diff --git a/Writer/Line.h b/Writer/Line.h
@@ -40,6 +40,8 @@ typedef enum : NSUInteger {
 @property (strong, nonatomic) NSString* string;
 @property NSUInteger position;
 @property NSUInteger numberOfPreceedingFormattingCharacters;
+@property NSString* sceneNumber;
+
 @property NSMutableIndexSet* boldRanges;
 @property NSMutableIndexSet* italicRanges;
 @property NSMutableIndexSet* underlinedRanges;

diff --git a/WriterTests/WriterParserTests.m b/WriterTests/WriterParserTests.m
@@ -64,9 +64,11 @@ - (void)testInitialParse
     XCTAssertEqual([parser typeAtLine:i], titlePageUnknown); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertEqualObjects([parser sceneNumberAtLine:i-1], @"1");
     XCTAssertEqual([parser typeAtLine:i], action); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
     XCTAssertEqual([parser typeAtLine:i], action); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], character); i++;
@@ -92,6 +94,7 @@ - (void)testInitialParse
     XCTAssertEqual([parser typeAtLine:i], action); i++;
     XCTAssertEqual([parser typeAtLine:i], transition); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
     XCTAssertEqual([parser typeAtLine:i], action); i++;
     XCTAssertEqual([parser typeAtLine:i], lyrics); i++;
     XCTAssertEqual([parser typeAtLine:i], transition); i++;
@@ -108,12 +111,16 @@ - (void)testInitialParse
     XCTAssertEqual([parser typeAtLine:i], dialogue); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
 }
 
 - (void)testInsertions
@@ -232,9 +239,11 @@ - (void)testInsertions
     XCTAssertEqual([parser typeAtLine:i], titlePageUnknown); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertEqualObjects([parser sceneNumberAtLine:i-1], @"1");
     XCTAssertEqual([parser typeAtLine:i], action); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], heading); i++;
+    XCTAssertNil([parser sceneNumberAtLine:i-1]);
     XCTAssertEqual([parser typeAtLine:i], action); i++;
     XCTAssertEqual([parser typeAtLine:i], empty); i++;
     XCTAssertEqual([parser typeAtLine:i], character); i++;
@@ -486,7 +495,7 @@ - (void)testOmmitParsing
 @"\ttest@abc.\nde"
 @"Key: value\n"
 @"\n"
-@"INT. DAY - LIVING ROOM\n"
+@"INT. DAY - LIVING ROOM #1# \n"
 @"EXT. DAY - LIVING ROOM\n"
 @"\n"
 @"EXT. DAY - LIVING ROOM\n"