From 051ee1dee227f439f5353645c58b6b3e21a8a9c7 Mon Sep 17 00:00:00 2001 From: Marco van Dijk Date: Fri, 9 Jul 2021 02:03:48 +0200 Subject: [PATCH] Moved rule that a line of text is chord data if it contains a digit from top to bottom. First check if there are any text characters which cannot ever be in chord data --- lib/dataStructures.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/dataStructures.py b/lib/dataStructures.py index 98f3e10..2f74f6a 100644 --- a/lib/dataStructures.py +++ b/lib/dataStructures.py @@ -45,10 +45,6 @@ def isTablatureData(inputString): if not inputString: return #print("Checking '{}' for line type".format(inputString)) - # Assume tablature line if any digit - if any(char.isdigit() for char in inputString): - #print("'{}' is a tablature line, since it contains a number".format(inputString)) - return True # Assume tablature line if any character {/, #, (, ), } tablatureSpecificCharacterString = r"/#" if any(elem in inputString for elem in tablatureSpecificCharacterString): @@ -61,6 +57,10 @@ def isTablatureData(inputString): if not char.lower() in lyricSpecificCharacterString: #print("'{}' is a LYRIC line, since it contains lyric specific text characters".format(inputString)) return False + # Assume tablature line if any digit + if any(char.isdigit() for char in inputString): + #print("'{}' is a tablature line, since it contains a number".format(inputString)) + return True # Assume LYRIC line if any character {.} lyricSpecialChars = r"." if any(elem in inputString for elem in lyricSpecialChars):