linkture 2.6.4__py3-none-any.whl → 3.0.0__py3-none-any.whl

linkture/__main__.py

@@ -34,14 +34,6 @@ from ast import literal_eval
 def main(args):
 
     def switchboard(text):
-        if args['cc']:
-            return s.code_chapter(args['cc'])
-        elif args['cv']:
-            return s.code_verse(args['cv'])
-        elif args['sc']:
-            return s.serial_chapter_number(args['sc'])
-        elif args['sv']:
-            return s.serial_verse_number(args['sv'])
         if args['l'] is not None:
             prefix = '<a href="'
             suffix = '">'
@@ -80,7 +72,15 @@ def main(args):
     else:
         txt = args['r']
 
-    if txt:
+    if args['cc']:
+        txt = s.code_chapter(args['cc'])
+    elif args['cv']:
+        txt = s.code_verse(args['cv'])
+    elif args['sc']:
+        txt = s.serial_chapter_number(args['sc'])
+    elif args['sv']:
+        txt = s.serial_verse_number(args['sv'])
+    elif txt:
         txt = switchboard(txt)
     else:
         print(parser.format_help())
@@ -125,7 +125,7 @@ tpe.add_argument('-x', action='store_true', help='extract list of scripture refe
 aux_group = parser.add_argument_group('auxiliary functions')
 aux = aux_group.add_mutually_exclusive_group(required=False)
 aux.add_argument('-sc', metavar=('BCV'), help='return the serial number (1-1189) of the chapter with code "BCV" ("bbcccvvv")')
-aux.add_argument('-sv', metavar=('BCV'), help='return the serial number (1-31091) of the verse with code "BCV" ("bbcccvvv")')
+aux.add_argument('-sv', metavar=('BCV'), help='return the serial number (1-31194) of the verse with code "BCV" ("bbcccvvv")')
 aux.add_argument('-cc', metavar=('chapter'), help='return the BCV range for serial chapter number "chapter" (integer value)')
 aux.add_argument('-cv', metavar=('verse'), help='return the BCV code for serial verse number "verse" (integer value)')
 

linkture/linkture.py

@@ -27,7 +27,7 @@
 """
 
 __app__ = 'linkture'
-__version__ = 'v2.6.4'
+__version__ = 'v3.0.0'
 
 
 import json, regex, sqlite3
@@ -98,6 +98,7 @@ class Scriptures():
         self._ranges = pd.read_sql_query("SELECT * FROM Ranges;", con)
         self._verses = pd.read_sql_query("SELECT * FROM Verses;", con)
         self._chapters = pd.read_sql_query("SELECT * FROM Chapters;", con)
+        self._headings = (3, 4, 5, 6, 7, 8, 9, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 34, 35, 36, 37, 38, 39, 40, 41, 42, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 92, 98, 100, 101, 102, 103, 108, 109, 110, 120, 121, 122, 123, 124, 125, 126, 127, 128, 129, 130, 131, 132, 133, 134, 138, 139, 140, 141, 142, 143, 144, 145)
         cur.close()
         con.close()
         self._reported = []
@@ -359,7 +360,10 @@ class Scriptures():
                     if not validate(book, c, v):
                         return None, 0
                     ch1 = c.zfill(3)
-                    v1 = '001'
+                    if book == 19 and int(c) in self._headings: # some chapters start at verse 0
+                        v1 = '000'
+                    else:
+                        v1 = '001'
 
                     c = result.group(2)
                     if not validate(book, c, v):
@@ -390,7 +394,10 @@ class Scriptures():
                     if not validate(book, c, v):
                         return None, 0
                     ch1 = c.zfill(3)
-                    v1 = '001'
+                    if book == 19 and int(c) in self._headings: # some chapters start at verse 0
+                        v1 = '000'
+                    else:
+                        v1 = '001'
                     v2 = str(self._ranges.loc[(self._ranges.Book == book) & (self._ranges.Chapter == int(ch1)), ['Last']].values[0][0]).zfill(3)
                     return (b+ch1+v1, b+ch1+v2), None
                 else:
@@ -456,7 +463,13 @@ class Scriptures():
             return None, '', 0, False
         se = self._ranges.loc[(self._ranges.Book == sb) & (self._ranges.Chapter == sc), ['Last']].values[0][0]
         le = self._ranges.loc[(self._ranges.Book == sb) & (self._ranges.Chapter == ec), ['Last']].values[0][0]
-        if not ((0 < sv <= se) & (0 < ev <= le)): # verse(s) out of range
+        minsv = minev = 1
+        if sb == 19:
+            if sc in self._headings: # some chapters start at verse 0
+                minsv = 0
+            if ec in self._headings:
+                minev = 0
+        if not ((minsv <= sv <= se) & (minev <= ev <= le)): # verse(s) out of range
             return None, '', 0, False
         bk_name = self._tr_book_names[sb]
         if book == bk_name:
@@ -532,7 +545,8 @@ class Scriptures():
         return scriptures
 
 
-    def link_scriptures(self, text, prefix='<a href=', suffix='>'): # NOTE: this always rewrites (full by default) - what if one wants to leave as is??
+    def link_scriptures(self, text, prefix='<a href=', suffix='>'):
+        # this always rewrites (full by default); if rewrite not desired, get code the scripture and build your own link
 
         def convert_range(bcv_range):
             if not bcv_range:
@@ -583,7 +597,7 @@ class Scriptures():
 
     def serial_verse_number(self, bcv):
         try:
-            return int(self._verses.loc[(self._verses['Book'] == int(bcv[0:2])) & (self._verses['Chapter'] == int(bcv[2:5])) & (self._verses['Verse'] == int(bcv[5:]))].values[0][0])
+            return int(self._verses.loc[(self._verses['Book'] == int(bcv[0:2])) & (self._verses['Chapter'] == int(bcv[2:5])) & (self._verses['Verse'] == int(bcv[5:]))].values[0][0]) + 1
         except:
             self._error_report(bcv, 'OUT OF RANGE')
             return None
@@ -592,8 +606,12 @@ class Scriptures():
         try:
             book, chapter = self._chapters[self._chapters['ChapterId'] == int(chapter)].values[0][1:]
             last = self._ranges.loc[(self._ranges.Book == book) & (self._ranges.Chapter == chapter), ['Last']].values[0][0]
-            bcv = str(book).zfill(2) + str(chapter).zfill(3)
-            return f"('{bcv}001', '{bcv}{str(last).zfill(3)}')"
+            bc = str(book).zfill(2) + str(chapter).zfill(3)
+            if book == 19 and chapter in self._headings: # some chapters start at verse 0
+                v = '000'
+            else:
+                v = '001'
+            return f"('{bc}{v}', '{bc}{str(last).zfill(3)}')"
         except:
             self._error_report(chapter, 'OUT OF RANGE')
             return None
@@ -601,7 +619,7 @@ class Scriptures():
     def code_verse(self, verse):
         bcv = ''
         try:
-            for i in self._verses[self._verses['VerseId'] == int(verse)].values[0][1:]:
+            for i in self._verses[self._verses['VerseId'] == int(verse)-1].values[0][1:]:
                 bcv += str(i).zfill(3)
             return f"('{bcv[1:]}', '{bcv[1:]}')"
         except:

{linkture-2.6.4.dist-info → linkture-3.0.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: linkture
-Version: 2.6.4
+Version: 3.0.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>
@@ -23,7 +23,7 @@ Requires-Dist: setuptools>=59.6.0
 Requires-Dist: argparse>=1.4.0
 Requires-Dist: regex>=2023.8.8
 Requires-Dist: unidecode>=1.3.8
-Requires-Dist: pandas==2.2.2
+Requires-Dist: pandas==2.2.*
 Requires-Dist: pathlib>=1.0.1
 Description-Content-Type: text/markdown
 
@@ -100,7 +100,7 @@ type of conversion:
 
 auxiliary functions:
   -sc BCV               return the serial number (1-1189) of the chapter with code "BCV" ("bbcccvvv")
-  -sv BCV               return the serial number (1-31091) of the verse with code "BCV" ("bbcccvvv")
+  -sv BCV               return the serial number (1-31194) of the verse with code "BCV" ("bbcccvvv")
   -cc chapter           return the BCV range for serial chapter number "chapter" (integer value)
   -cv verse             return the BCV code for serial verse number "verse" (integer value)
 ```
@@ -144,22 +144,20 @@ $ python3 -m linkture -r "Mat 17:17; Paul 3:16, 17" --full -x
 $ python3 -m linkture -cc 2
 ('01002001', '01002025')
 
-$ python3 -m linkture -cv 31091
+$ python3 -m linkture -cv 31194
 ('66022021', '66022021')
 
 $ python3 -m linkture -sv '01001001'
 1
 
-python3 -m linkture -sc '66022001'
+$ python3 -m linkture -sc '66022001'
 1189
 
 
-python3 -m linkture -r '2Ti 3:16, 17' --full -s '_'
+$ python3 -m linkture -r '2Ti 3:16, 17' --full -s '_'
 2_Timothy_3:16,_17
 ```
 
-**Note**: The serial verse options (`-sv` and `-cv`) *do not* count Psalm headings as separate verses.
-
 Of course, you can pass a whole text file to parse and process using the `-f in_file` flag, instead of `-r "references"`. And you can output to another text file (instead of the terminal) using `-o out_file`.
 
 Unless you use `-q`, you will see in the terminal any out-of-range errors encountered while parsing. Of course, these entries will not be processed, but they will not affect the rest of the operation.
@@ -195,13 +193,13 @@ i = s.serial_chapter_number(ch_bcv)
 # returns the serial number (1-1189) of the chapter identified by the provided BCV-format string; verse digits irrelevant
 
 i = s.serial_verse_number(vs_bcv)
-# returns the serial number (1-31091) of the verse identified by the provided BCV-format string
+# returns the serial number (1-31194) of the verse identified by the provided BCV-format string
 
 ch_bcv = s.code_chapter(i)
 # returns a BCV-format range string for the whole chapter indicated by the provided integer (1-1189)
 
 vs_bcv = s.code_verse(i)
-# returns a BCV-format range string for the verse indicated by the provided integer (1-31091)
+# returns a BCV-format range string for the verse indicated by the provided integer (1-31194)
 ```
 
 Parameters:

linkture-3.0.0.dist-info/RECORD

@@ -0,0 +1,10 @@
+linkture-3.0.0.dist-info/METADATA,sha256=GeDDtoiK1KJHOhgZC2aN9q6i0THUxCi-n7lpRi9n8aY,11304
+linkture-3.0.0.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
+linkture-3.0.0.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
+linkture-3.0.0.dist-info/licenses/LICENSE,sha256=kPqKoVmo3Tx1HgQvqfjBZuYkjT1mZXnQ5R0KBbEeFfs,1064
+linkture/__init__.py,sha256=-CsRDvXLUig8T6RvwkktRP8e8DWrpjlyqBcw26kOv1E,47
+linkture/__main__.py,sha256=_HuNLVB-JSzNqxSxhkSrfJ5ZkQ6nK9jqaoy4xhMoC3c,6444
+linkture/linkture.py,sha256=Gvt9ldcDClOCPtgFji4jKC4OtSq190LVr8z3fZ-Qt4Q,25032
+linkture/res/custom.json,sha256=qlpTEux2w7kb-w9ZimDqTLhnB0Eyy1Mj3zfbQ1sxKvg,2046
+linkture/res/resources.db,sha256=0l6lUJB5p4cQ6YpnIn9rDTnmbiZGSKb6k3OKNZmVF7M,569344
+linkture-3.0.0.dist-info/RECORD,,

linkture-2.6.4.dist-info/RECORD

@@ -1,10 +0,0 @@
-linkture-2.6.4.dist-info/METADATA,sha256=2fsK7M6RTXzEdven47AXhrDPcUTWS5d1P8ffgLPGuzw,11404
-linkture-2.6.4.dist-info/WHEEL,sha256=thaaA2w1JzcGC48WYufAs8nrYZjJm8LqNfnXFOFyCC4,90
-linkture-2.6.4.dist-info/entry_points.txt,sha256=6OYgBcLyFCUgeqLgnvMyOJxPCWzgy7se4rLPKtNonMs,34
-linkture-2.6.4.dist-info/licenses/LICENSE,sha256=kPqKoVmo3Tx1HgQvqfjBZuYkjT1mZXnQ5R0KBbEeFfs,1064
-linkture/__init__.py,sha256=-CsRDvXLUig8T6RvwkktRP8e8DWrpjlyqBcw26kOv1E,47
-linkture/__main__.py,sha256=K1TDrBlT-_N_-iWpjOK_XW2rdm_IRiI7aWyKbFcdFxg,6478
-linkture/linkture.py,sha256=hT1YuJRhXnB8PMWVsIca-P80PBoAn5O6W9RfvMf9hPE,23779
-linkture/res/custom.json,sha256=qlpTEux2w7kb-w9ZimDqTLhnB0Eyy1Mj3zfbQ1sxKvg,2046
-linkture/res/resources.db,sha256=9yD2RK1DOevcBnq9dEXpEyjZpln0enew4rpPr5fjoEQ,589824
-linkture-2.6.4.dist-info/RECORD,,