fix: Handle project name for filename regex

mseag · Sep 10, 2023 · 684ac43 · 684ac43
1 parent 4e019ac
commit 684ac43
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/backTranslation.ts b/src/backTranslation.ts
@@ -21,11 +21,13 @@ export const VERSE_PATTERN = /(\d+)-?(\d+)?\s?(.*)/;
 /**
  * Extract a book name and chapter number from the filename
  * @param {string} file - Path to the Toolbox text file
+ * @param {string} projectName - Name of the project (expected at the start of the filenames)
  * @returns {fileInfoType} - Object containing the book name and chapter number
  */
-export function getBookAndChapter(file: string) : toolbox.fileInfoType {
+export function getBookAndChapter(file: string, projectName: string) : toolbox.fileInfoType {
   const filename = path.parse(file).base;
-  const pattern = /(Lem|lem)?(\d*\D+)(\d+)\D?\.rtf/;
+  const patternFormatStr = `(${projectName}|${projectName.toLowerCase()})?(\\d*\\D+)(\\d+)\\D?\\.rtf`;
+  const pattern = new RegExp(patternFormatStr);
   const match = filename.match(pattern);
   const obj: toolbox.fileInfoType = {
     bookName: "Placeholder",

diff --git a/src/index.ts b/src/index.ts
@@ -220,7 +220,7 @@ function processDirectory(directory: string){
  * @returns {books.bookType} bookObj - modified book object
  */
 async function processBackText(filepath: string, bookObj: books.objType): Promise<books.objType> {
-  const bookInfo = backTranslation.getBookAndChapter(filepath);
+  const bookInfo = backTranslation.getBookAndChapter(filepath, options.projectName);
   const currentChapter = bookInfo.chapterNumber;
   const bookType = books.getBookByName(bookInfo.bookName);
   if (bookInfo.bookName === "Placeholder") {