Merge pull request #248 from WycliffeAssociates/fix-for-aba-phi

Handle many more heart languages that have unusual repo URL patterns

Author: PurpleGuitar

backend/doc/domain/resource_lookup.py

@@ -16,6 +16,7 @@
   import DesktopBookDisplay from './DesktopBookDisplay.svelte'
   import Modal from '$lib/Modal.svelte'
   import ProgressIndicator from '$lib/ProgressIndicator.svelte'
+  import { errorStore } from '$lib/stores/NotificationStore'
 
   async function getSharedBookCodesAndNames(
     lang0Code: string,
@@ -109,7 +110,11 @@
           }
         }
       })
-      .catch((err) => console.error(err))
+      .catch((err) => {
+        console.error(err)
+        // Stop progress bar
+        $errorStore = err
+      })
   } else {
     getBookCodesAndNames($langCodesStore[0])
       .then((bookCodesAndNames) => {
@@ -149,7 +154,11 @@
           })
         }
       })
-      .catch((err) => console.error(err))
+      .catch((err) => {
+        console.error(err)
+        // Stop progress bar
+        $errorStore = err
+      })
   }
 
   // Derive and set the count of books for use here and in other
@@ -218,7 +227,6 @@
 <svelte:window bind:innerWidth={windowWidth} />
 
 <WizardBreadcrumb />
-
 <!-- container for "center" div -->
 <div class="flex flex-grow flex-row overflow-y-auto overflow-x-hidden">
   <!-- center -->
@@ -230,7 +238,7 @@
       Select books
     </h3>
     <div class="ml-4 mt-2 flex items-center bg-white px-2 py-2">
-      {#if !otBookCodes || !ntBookCodes}
+      {#if !$errorStore && (!otBookCodes || !ntBookCodes)}
         <div class="ml-4">
           <ProgressIndicator
             labelString="Acquiring and analyzing books available for
@@ -499,7 +507,27 @@
       {/if}
     </div>
 
-    {#if $langCountStore > 0}
+    {#if $errorStore}
+      <div class="bg-white">
+        <svg
+          class="m-auto"
+          width="44"
+          height="38"
+          viewBox="0 0 44 38"
+          fill="none"
+          xmlns="http://www.w3.org/2000/svg"
+        >
+          <path d="M24 24H20V14H24V24ZM24 32H20V28H24V32ZM0 38H44L22 0L0 38Z" fill="#B85659" />
+        </svg>
+        <div class="m-auto"><h3 class="text-center text-[#B85659]">Uh Oh...</h3></div>
+        <div class="m-auto">
+          <p class="text-xl text-[#B3B9C2]">
+            Something went wrong. Please review your selections or contact tech support for
+            assistance.
+          </p>
+        </div>
+      </div>
+    {:else if $langCountStore > 0}
       {#if windowWidth < TAILWIND_SM_MIN_WIDTH}
         <MobileBookDisplay
           {showOldTestament}

backend/stet/data/stet_en.docx

@@ -149,3 +149,19 @@ test('test optional settings', async ({ page }) => {
   await page.getByRole('button', { name: '▶ Show Optional Settings' }).click()
   await expect(page.getByRole('main')).toContainText('Use chapter labels, e.g., \'Chapter 1\' instead of \'1\'')
 })
+
+
+test('test aba philemon', async ({ page }) => {
+  await page.goto('http://localhost:8001/')
+  await page.getByRole('button', { name: 'Heart' }).click()
+  await page.getByText('Abé aba').click()
+  await page.getByRole('button', { name: 'Next' }).click()
+  await page.getByText('Philémon').click()
+  await page.getByRole('button', { name: 'Next' }).click()
+  await page.getByText('Bible').click()
+  await page.getByRole('button', { name: 'Next' }).click()
+  await page.getByText('PDF').click()
+  await page.getByRole('button', { name: 'Generate File' }).click()
+  await expect(page.locator('body')).toContainText('Philémon')
+  await expect(page.locator('body')).toContainText('Bible (aba)')
+})

backend/stet/data/stet_pt-br.docx

@@ -4,7 +4,6 @@
 from doc.domain.parsing import ensure_chapter_label, ensure_chapter_marker
 
 
-@pytest.mark.focus
 def test_ensure_chapter_marker_unchanged_if_exists() -> None:
     chapter_num = 5
 
@@ -20,7 +19,6 @@ def test_ensure_chapter_marker_unchanged_if_exists() -> None:
     )
 
 
-@pytest.mark.focus
 def test_ensure_chapter_marker_inserted_at_beginning() -> None:
     chapter_num = 5
     # Case 2: No chapter marker, insert at beginning
@@ -40,7 +38,6 @@ def test_ensure_chapter_marker_inserted_at_beginning() -> None:
     assert actual_output == expected_output
 
 
-@pytest.mark.focus
 def test_ensure_chapter_marker_inserted_at_before_chapter_label() -> None:
     chapter_num = 5
     # Case 3: Chapter marker missing, but \cl exists (insert before \cl)
@@ -52,7 +49,6 @@ def test_ensure_chapter_marker_inserted_at_before_chapter_label() -> None:
     assert actual_output == expected_output
 
 
-@pytest.mark.focus
 def test_ensure_chapter_marker_inserted() -> None:
     chapter_num = 5
 
@@ -65,7 +61,6 @@ def test_ensure_chapter_marker_inserted() -> None:
     assert actual_output == expected_output
 
 
-@pytest.mark.focus
 def test_adds_missing_chapter_label() -> None:
     input_text = "\n\\c 1\n\\v 1 In the beginning..."
     expected_output = "\n\n\\c 1\n\\cl Chapter 1\n\n\\v 1 In the beginning..."
@@ -75,14 +70,12 @@ def test_adds_missing_chapter_label() -> None:
     assert actual_output == expected_output
 
 
-@pytest.mark.focus
 def test_keeps_existing_chapter_label() -> None:
     input_text = "\n\\c 1\n\\cl Chapter\n\\v 1 In the beginning..."
     expected_output = "\n\\c 1\n\\cl Chapter 1\n\\v 1 In the beginning..."
     assert ensure_chapter_label(input_text, 1) == expected_output
 
 
-@pytest.mark.focus
 def test_no_chapter_marker() -> None:
     input_text = "\n\\v 1 In the beginning..."
     assert ensure_chapter_label(input_text, 1) == input_text

frontend/src/routes/books/+page.svelte

@@ -632,7 +632,6 @@ def test_fix_space_after_section_marker(self) -> None:
             r"\s5 5Some text.",
         )
 
-    @pytest.mark.focus
     @pytest.mark.usfm_fixes
     def test_replace_cc_with_c(self) -> None:
         expected_output = r"""