scripturelookup 0.0.6__tar.gz → 0.0.7__tar.gz

{scripturelookup-0.0.6/src/scripturelookup.egg-info → scripturelookup-0.0.7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scripturelookup
-Version: 0.0.6
+Version: 0.0.7
 Summary: Python and command-line utility for converting scripture references between formats.
 Author-email: Samuel Bradshaw <samuel.h.bradshaw@gmail.com>
 License: MIT License
@@ -161,6 +161,7 @@ Several options are available. Some are only applicable to certain commands.
 - **skip_book_name** (optional) – Whether book names should be skipped on labels. Default: False.
 - **abbreviated** (optional) – Whether book abbrevions should be used on labels. Default: False.
 - **skip_cleanup** (optional) – Whether cleanup of the input string should be skipped when parsing. Can be used to speed up parsing if the input string is guaranteed to have well-formed references. Default: False.
+- **range_split_limit** (optional) – Threshold where a range of sequential verses will be split into separate verse groups. Default: 1.
 
 
 ## Acknowledgements

{scripturelookup-0.0.6 → scripturelookup-0.0.7}/README.md

@@ -121,6 +121,7 @@ Several options are available. Some are only applicable to certain commands.
 - **skip_book_name** (optional) – Whether book names should be skipped on labels. Default: False.
 - **abbreviated** (optional) – Whether book abbrevions should be used on labels. Default: False.
 - **skip_cleanup** (optional) – Whether cleanup of the input string should be skipped when parsing. Can be used to speed up parsing if the input string is guaranteed to have well-formed references. Default: False.
+- **range_split_limit** (optional) – Threshold where a range of sequential verses will be split into separate verse groups. Default: 1.
 
 
 ## Acknowledgements

{scripturelookup-0.0.6 → scripturelookup-0.0.7}/src/scripturelookup/command_line.py

@@ -20,6 +20,7 @@ def main_cli():
   parser.add_argument('--skip_book_name', action='store_true', help='Skip scripture book name in labels.')
   parser.add_argument('--abbreviated', action='store_true', help='Prefer abbreviated scripture book name in labels.')
   parser.add_argument('--skip_cleanup', action='store_true', help='Skip cleanup of the input string for faster parsing.')
+  parser.add_argument('--range_split_limit', type=int, help='Threshold where a range of sequential verses will be split into separate verse groups. Default: 1.')
   
   args = parser.parse_args()
   
@@ -38,6 +39,7 @@ def main_cli():
     skip_book_name = args.skip_book_name,
     abbreviated = args.abbreviated,
     skip_cleanup = args.skip_cleanup,
+    range_split_limit = args.range_split_limit or 1,
   )
   
   print(result)

{scripturelookup-0.0.6 → scripturelookup-0.0.7}/src/scripturelookup/lookup.py

@@ -167,7 +167,7 @@ class Reference:
 
 # Parse verses into verse groups
 # Example: '1-2,5-7,9' –> [[1, 2], [5, 6, 7], [9]]
-def parse_verses_string(verses_string, lang = 'en'):
+def parse_verses_string(verses_string, lang = 'en', range_split_limit = 1):
   verses_string = (verses_string or '').replace('p', '').strip()
   if not verses_string:
     return None
@@ -217,7 +217,19 @@ def parse_verses_string(verses_string, lang = 'en'):
     else:
       verse_groups.append([verse])
       previous_verse = -1
-  return verse_groups
+  
+  # Split ranges at range split limit. Examples:
+  # [[2], [2, 3, 4], [2, 3]], limit 1 –> [[2], [2, 3, 4], [2, 3]]
+  # [[2], [2, 3, 4], [2, 3]], limit 2 –> [[2], [2, 3, 4], [2], [3]]
+  # [[2], [2, 3, 4], [2, 3]], limit 3 –> [[2], [2], [3], [4], [2], [3]]
+  refined_verse_groups = []
+  for group in verse_groups:
+    if len(group) <= range_split_limit:
+      refined_verse_groups.extend([v] for v in group)
+    else:
+      refined_verse_groups.append(group)
+  
+  return refined_verse_groups
 
 
 # Format verse groups to a localized string
@@ -235,7 +247,7 @@ def convert_verse_groups_to_string(verse_groups, verse_range_separator, verse_gr
 
 # Parse one or more scripture references, URIs, URLs, or slugs
 # The script will run faster if skip_cleanup is True, but all scripture references or URIs will be expected to have consistent formatting
-def parse_references_string(input_string, lang = 'en', sort_by = None, skip_cleanup = False):
+def parse_references_string(input_string, lang = 'en', sort_by = None, skip_cleanup = False, range_split_limit = 1):
   lang = data.get_bcp47(lang)
   
   # Remove leading or trailing whitespace and punctuation
@@ -382,8 +394,8 @@ def parse_references_string(input_string, lang = 'en', sort_by = None, skip_clea
         chapter_string = chapter_match.group(1)
         book_string = book_string.removesuffix(chapter_string).strip()
     
-    verse_groups = parse_verses_string(verses_string)
-    context_verse_groups = parse_verses_string(context_verses_string)
+    verse_groups = parse_verses_string(verses_string, range_split_limit = range_split_limit)
+    context_verse_groups = parse_verses_string(context_verses_string, range_split_limit = range_split_limit)
     chapter = numbers.convert_number_to_int(chapter_string)
     book_slug = None
     skip_book_name = False
@@ -436,31 +448,31 @@ def parse_references_string(input_string, lang = 'en', sort_by = None, skip_clea
 
 # Functions that can be called via Python or from the command line (see README.md for more information)
 
-def get_content(input_string, lang = 'en', separator = '\n', source = 'python-scripture-scraper', skip_cleanup = False, **kwargs):
-  references = parse_references_string(input_string, lang = lang, skip_cleanup = skip_cleanup)
+def get_content(input_string, lang = 'en', separator = '\n', source = 'python-scripture-scraper', skip_cleanup = False, range_split_limit = 1, **kwargs):
+  references = parse_references_string(input_string, lang = lang, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
   return separator.join([ref.content(source = source) for ref in references])
 
-def get_label(input_string, lang = 'en', separator = '\n', sort_by = None, skip_book_name = False, abbreviated = False, skip_cleanup = False, **kwargs):
-  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup)
+def get_label(input_string, lang = 'en', separator = '\n', sort_by = None, skip_book_name = False, abbreviated = False, skip_cleanup = False, range_split_limit = 1, **kwargs):
+  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
   return separator.join([ref.label(skip_book_name = skip_book_name, abbreviated = abbreviated) for ref in references])
 
-def get_church_uri(input_string, separator = '\n', sort_by = None, use_query_parameters = False, skip_cleanup = False, **kwargs):
-  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup)
+def get_church_uri(input_string, separator = '\n', sort_by = None, use_query_parameters = False, skip_cleanup = False, range_split_limit = 1, **kwargs):
+  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
   return separator.join([ref.church_uri(use_query_parameters = use_query_parameters) for ref in references])
 
-def get_church_url(input_string, lang = 'en', separator = '\n', sort_by = None, skip_lang = False, skip_fragment = False, skip_cleanup = False, **kwargs):
-  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup)
+def get_church_url(input_string, lang = 'en', separator = '\n', sort_by = None, skip_lang = False, skip_fragment = False, skip_cleanup = False, range_split_limit = 1, **kwargs):
+  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
   return separator.join([ref.church_url(skip_lang = skip_lang, skip_fragment = skip_fragment) for ref in references])
 
-def get_church_link(input_string, lang = 'en', separator = '\n', sort_by = None, link_class = None, link_target = None, skip_book_name = False, abbreviated = False, skip_lang = False, skip_fragment = False, skip_cleanup = False, **kwargs):
-  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup)
+def get_church_link(input_string, lang = 'en', separator = '\n', sort_by = None, link_class = None, link_target = None, skip_book_name = False, abbreviated = False, skip_lang = False, skip_fragment = False, skip_cleanup = False, range_split_limit = 1, **kwargs):
+  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
   return separator.join([ref.church_link(link_class = link_class, link_target = link_target, skip_book_name = skip_book_name, abbreviated = abbreviated, skip_lang = skip_lang, skip_fragment = skip_fragment) for ref in references])
   
-def get_reference_objects(input_string, lang = 'en', sort_by = None, skip_cleanup = False, **kwargs):
-  return parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup)
+def get_reference_objects(input_string, lang = 'en', sort_by = None, skip_cleanup = False, range_split_limit = 1, **kwargs):
+  return parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
 
-def get_reference_attributes(input_string, lang = 'en', sort_by = None, skip_cleanup = False, **kwargs):
-  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup)
+def get_reference_attributes(input_string, lang = 'en', sort_by = None, skip_cleanup = False, range_split_limit = 1, **kwargs):
+  references = parse_references_string(input_string, lang = lang, sort_by = sort_by, skip_cleanup = skip_cleanup, range_split_limit = range_split_limit)
   return [ref.attributes() for ref in references]
 
 def get_langs(**kwargs):

{scripturelookup-0.0.6 → scripturelookup-0.0.7/src/scripturelookup.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: scripturelookup
-Version: 0.0.6
+Version: 0.0.7
 Summary: Python and command-line utility for converting scripture references between formats.
 Author-email: Samuel Bradshaw <samuel.h.bradshaw@gmail.com>
 License: MIT License
@@ -161,6 +161,7 @@ Several options are available. Some are only applicable to certain commands.
 - **skip_book_name** (optional) – Whether book names should be skipped on labels. Default: False.
 - **abbreviated** (optional) – Whether book abbrevions should be used on labels. Default: False.
 - **skip_cleanup** (optional) – Whether cleanup of the input string should be skipped when parsing. Can be used to speed up parsing if the input string is guaranteed to have well-formed references. Default: False.
+- **range_split_limit** (optional) – Threshold where a range of sequential verses will be split into separate verse groups. Default: 1.
 
 
 ## Acknowledgements