linkture 4.0.0__py3-none-any.whl → 4.2.0__py3-none-any.whl

linkture/__main__.py

@@ -26,7 +26,7 @@
   SOFTWARE.
 """
 
-import argparse
+import argparse, sys, traceback
 from .linkture import _available_languages, __app__, __version__, Scriptures
 from ast import literal_eval
 
@@ -34,24 +34,31 @@ from ast import literal_eval
 def main(args):
 
     def switchboard(text):
-        if args['l'] is not None:
-            prefix = '<a href="'
-            suffix = '">'
-            if len(args['l']) > 1 and args['l'][1] != '':
-                suffix = args['l'][1]
-            if len(args['l']) > 0 and args['l'][0] != '':
-                prefix = args['l'][0]
-            return s.link_scriptures(text, prefix, suffix)
-        elif args['c']:
-            return s.code_scriptures(text)
-        elif args['d']:
-            return s.decode_scriptures(literal_eval(text))
-        elif args['x']:
-            return s.list_scriptures(text)
-        elif args['t']:
-            return s.tag_scriptures(text)
-        else:
-            return s.rewrite_scriptures(text)
+        try:
+            if args['l'] is not None:
+                prefix = '<a href="'
+                suffix = '">'
+                if len(args['l']) > 1 and args['l'][1] != '':
+                    suffix = args['l'][1]
+                if len(args['l']) > 0 and args['l'][0] != '':
+                    prefix = args['l'][0]
+                return s.link_scriptures(text, prefix, suffix)
+            elif args['c']:
+                return s.code_scriptures(text)
+            elif args['d']:
+                return s.decode_scriptures(literal_eval(text))
+            elif args['x']:
+                return s.list_scriptures(text)
+            elif args['t']:
+                return s.tag_scriptures(text)
+            else:
+                return s.rewrite_scriptures(text)
+        except Exception as e:
+            print("\n--- CRASH DETECTED ---", file=sys.stderr)
+            print("Input causing failure:", repr(text), file=sys.stderr)
+            print("Error:", str(e), file=sys.stderr)
+            traceback.print_exc()
+            raise
 
     form = None
     if args['standard']:

linkture/linkture.py

@@ -27,7 +27,7 @@
 """
 
 __app__ = 'linkture'
-__version__ = 'v4.0.0'
+__version__ = 'v4.2.0'
 
 
 import json, regex, sqlite3
@@ -97,19 +97,16 @@ class Scriptures():
                     normalized = regex.sub(r'\p{P}|\p{Z}', '', item.upper())
                     self._src_book_names[normalized] = row[0]
 
-        # Ranges: {(book, chapter): last}  (chapter 0 -> num of chapters in book)
         self._ranges = {}
         for book, chapter, last in cur.execute("SELECT Book, Chapter, Last FROM Ranges;"):
             self._ranges[(book, chapter)] = last
 
-        # Chapters: two-way mappings
         self._chapters = {}
         self._chapters_id = {}
         for chapter_id, book, chapter in cur.execute("SELECT ChapterId, Book, Chapter FROM Chapters;"):
             self._chapters[(book, chapter)] = chapter_id
             self._chapters_id[chapter_id] = (book, chapter)
 
-        # Verses: two-way mappings
         self._verses = {}
         self._verses_id = {}
         for verse_id, book, chapter, verse in cur.execute("SELECT VerseId, Book, Chapter, Verse FROM Verses;"):
@@ -276,27 +273,29 @@ class Scriptures():
     def _code_scripture(self, scripture, bk_num, rest, last):
 
         def reform_series(txt): # rewrite comma-separated consecutive sequences (1, 2, 3) as ranges (1-3)
-            for result in self._d_dd.finditer(txt, overlapped=True):
-                    end = result.group(3)
-                    mid = result.group(2)
-                    start = result.group(1)
-                    if int(end) - int(mid) == 1:
-                        txt = regex.sub(result.group(), f"{start}-{end}", txt)
-            for result in self._ddd.finditer(txt, overlapped=True):
-                end = result.group(3)
-                start = result.group(1)
-                if int(end) - int(start) == 2:
-                    txt = regex.sub(result.group(), f"{start}-{end}", txt)
-            for result in self._ddd.finditer(txt, overlapped=True):
-                end = result.group(3)
-                start = result.group(1)
-                if int(end) - int(start) == 2:
-                    txt = regex.sub(result.group(), f"{start}-{end}", txt)
-            for result in self._dd.finditer(txt, overlapped=True):
-                    end = result.group(2)
-                    start = result.group(1)
-                    if int(end) - int(start) == 1:
-                        txt = regex.sub(result.group(), f"{start}-{end}", txt)
+            numbers = []
+            for match in regex.finditer(r'\d+', txt):
+                numbers.append((int(match.group()), match.start(), match.end()))
+            if not numbers:
+                return txt
+            sequences = []
+            current_seq = [numbers[0]]
+            for i in range(1, len(numbers)):
+                current_num = numbers[i][0]
+                prev_num = current_seq[-1][0]
+                if current_num == prev_num + 1:
+                    current_seq.append(numbers[i])
+                else:
+                    if len(current_seq) >= 3:
+                        sequences.append(current_seq)
+                    current_seq = [numbers[i]]
+            if len(current_seq) >= 3:
+                sequences.append(current_seq)
+            for seq in sorted(sequences, key=lambda x: x[0][1], reverse=True):
+                start_pos = seq[0][1]
+                end_pos = seq[-1][2]
+                replacement = f"{seq[0][0]}-{seq[-1][0]}"
+                txt = txt[:start_pos] + replacement + txt[end_pos:]
             return txt
 
         def validate(b, ch, vs):
@@ -435,6 +434,26 @@ class Scriptures():
 
             return None, None
 
+        def merge_ranges(ranges):
+            if not ranges:
+                return []
+            merged = []
+            current_start, current_end = ranges[0]
+            for start, end in ranges[1:]:
+                end_bk = int(current_end[:2])
+                end_ch = int(current_end[2:5])
+                end_vs = int(current_end[5:])
+                next_bk = int(start[:2])
+                next_ch = int(start[2:5])
+                next_vs = int(start[5:])
+                if (end_bk == next_bk and ((end_ch == next_ch and end_vs + 1 == next_vs) or (end_ch + 1 == next_ch and end_vs == self._ranges.get((end_bk, end_ch), 0) and next_vs == 1))):
+                    current_end = end
+                else:
+                    merged.append((current_start, current_end))
+                    current_start, current_end = start, end
+            merged.append((current_start, current_end))
+            return merged
+
         lst = []
         if rest == '': # whole book
             v = self._ranges.get((bk_num, last))
@@ -444,6 +463,7 @@ class Scriptures():
                 rest = f'1:1-{last}:{v}'
         else:
             rest = reform_series(rest)
+        all_ranges = []
         for chunk in rest.split(';'):
             ch = None
             for bit in chunk.split(','):
@@ -454,7 +474,8 @@ class Scriptures():
                 if not tup:
                     self._error_report(scripture, f'"{bit.strip()}" OUT OF RANGE')
                     return None
-                lst.append(tup)
+                all_ranges.append(tup)
+        lst = merge_ranges(all_ranges)
         return lst
 
     def code_scriptures(self, text):

linkture/res/custom.json

@@ -17,7 +17,7 @@
     [19, "Psalm, Psal, Pss, Psa"],
     [20, "Pro"],
     [21, "Ecc, Eccles, Qoh"],
-    [22, "Cant, Son, Sng"],
+    [22, "Cant, Son, Sng, SoS"],
     [26, "Ezek"],
     [30, "Amo"],
     [31, "Oba"],

{linkture-4.0.0.dist-info → linkture-4.2.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkture
-Version: 4.0.0
+Version: 4.2.0
 Summary: PARSE and PROCESS BIBLE SCRIPTURE REFERENCES: extract, tag, link, rewrite, translate, BCV-encode and decode
 Keywords: bible,scriptures,scripture-references,scripture-translation,scripture-parser,scripture-linker
 Author-Email: "Eryk J." <infiniti@inventati.org>
@@ -11,6 +11,7 @@ Classifier: Programming Language :: Python :: 3.9
 Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Development Status :: 5 - Production/Stable
 Classifier: Environment :: Console
 Classifier: Topic :: Religion

linkture-4.2.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+linkture-4.2.0.dist-info/METADATA,sha256=riCJFu9iG4egWkaYw0oq_7JGA2STaI-dtpMcX6SnadA,11701
+linkture-4.2.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
+linkture-4.2.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+linkture-4.2.0.dist-info/licenses/LICENSE,sha256=kPqKoVmo3Tx1HgQvqfjBZuYkjT1mZXnQ5R0KBbEeFfs,1064
+linkture/__init__.py,sha256=-CsRDvXLUig8T6RvwkktRP8e8DWrpjlyqBcw26kOv1E,47
+linkture/__main__.py,sha256=NC11m6wICSMyme8AVDLezTBH_XrnMG1MMtmr3ZDbxDk,6980
+linkture/linkture.py,sha256=Kdu6ngFJv6BCJFCv21P3pH39adCTLoDJNbH-6LThc1E,25998
+linkture/res/custom.json,sha256=DKoN6Q_PcZ9EF4UdqpBtpB4ckz_lOEJhjpivfzsqUl8,2144
+linkture/res/resources.db,sha256=4CToCzX_3kkWFUpVF4RoRguIHDUwbzd5AjKgt4QPYKo,573440
+linkture-4.2.0.dist-info/RECORD,,

linkture-4.0.0.dist-info/RECORD

@@ -1,10 +0,0 @@
-linkture-4.0.0.dist-info/METADATA,sha256=l8Z9vxEgLZk2g_Yt0vjAfAg34aTDM68r0A7gEm5-4uI,11650
-linkture-4.0.0.dist-info/WHEEL,sha256=9P2ygRxDrTJz3gsagc0Z96ukrxjr-LFBGOgv3AuKlCA,90
-linkture-4.0.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-linkture-4.0.0.dist-info/licenses/LICENSE,sha256=kPqKoVmo3Tx1HgQvqfjBZuYkjT1mZXnQ5R0KBbEeFfs,1064
-linkture/__init__.py,sha256=-CsRDvXLUig8T6RvwkktRP8e8DWrpjlyqBcw26kOv1E,47
-linkture/__main__.py,sha256=IjxrpZGZKIr7mHPGs_mMVaB6ipou_ArYgvs4wRFkxXM,6607
-linkture/linkture.py,sha256=398iSQwC0pSc_j5jRlJIRcRsWm2-YWyJGO1xTTGMMFk,25256
-linkture/res/custom.json,sha256=ngpVe8OrnhBUTpJKcJc_W9rwxtEWq7qbt3_NPbGL6h0,2139
-linkture/res/resources.db,sha256=4CToCzX_3kkWFUpVF4RoRguIHDUwbzd5AjKgt4QPYKo,573440
-linkture-4.0.0.dist-info/RECORD,,