Merge pull request #44 from ynhhoJ/bugfixes/43

Implement support of OPDF object entries #43

Author: ynhhoJ

.yarnrc.yml

@@ -0,0 +1 @@
+nodeLinker: node-modules

package.json

@@ -1,6 +1,6 @@
 {
   "name": "flibusta",
-  "version": "0.4.4",
+  "version": "0.4.5",
   "author": "ynhhoJ",
   "description": "Unofficial Flibusta API based on website search engine. If you like to read books - buy",
   "license": "MIT",
@@ -77,4 +77,4 @@
     "unofficial",
     "search"
   ]
-}
+}

src/flibustaOpdsApiHelper.ts

@@ -82,22 +82,28 @@ class FlibustaOpdsApiHelper {
     this.axiosInstance = axiosController;
   }
 
-  public prepareResponseFromOpdsEntry(entry: Array<OpdsEntry>): Array<SearchBooksByNameOpdsResult> {
-    return entry.map((item) => {
-      const {
-        author, link, title, updated, content, category,
-      } = item;
-
-      return {
-        author: FlibustaOpdsApiHelper.getAuthorsFromOpdsEntry(author),
-        title,
-        updated,
-        categories: FlibustaOpdsApiHelper.getCategoriesFromOpdsEntry(category),
-        cover: FlibustaOpdsApiHelper.getCoverFromLink(link),
-        downloads: FlibustaOpdsApiHelper.getDownloadsItemList(link),
-        description: content['#text'],
-      };
-    });
+  private prepareResponseFromOpdsObjectEntry(entry: OpdsEntry): SearchBooksByNameOpdsResult {
+    const {
+      author, link, title, updated, content, category,
+    } = entry;
+
+    return {
+      author: FlibustaOpdsApiHelper.getAuthorsFromOpdsEntry(author),
+      title,
+      updated,
+      categories: FlibustaOpdsApiHelper.getCategoriesFromOpdsEntry(category),
+      cover: FlibustaOpdsApiHelper.getCoverFromLink(link),
+      downloads: FlibustaOpdsApiHelper.getDownloadsItemList(link),
+      description: content['#text'],
+    };
+  }
+
+  public prepareResponseFromOpdsEntry(entry: Array<OpdsEntry> | OpdsEntry): Array<SearchBooksByNameOpdsResult> {
+    if (!Array.isArray(entry)) {
+      return [this.prepareResponseFromOpdsObjectEntry(entry)];
+    }
+
+    return entry.map((item) => this.prepareResponseFromOpdsObjectEntry(item));
   }
 
   public getTotalPagesCount(totalResults: number, itemsPerPage: number): number {

tests/api/getBooksByNameOpds.ts

@@ -54,6 +54,38 @@ describe('getBooksByNameOpds', () => {
 
       expect(booksByNameFromOpds).to.be.equal(undefined);
     });
+
+    it('should be returned correct response when entry is an object', async () => {
+      const name = 'Почему я отвлекаюсь';
+
+      const booksByNameFromOpds = await getBooksByNameOpdsApi.getBooksByNameFromOpds(name);
+
+      if (isNil(booksByNameFromOpds)) {
+        return;
+      }
+
+      booksByNameFromOpds.forEach((booksItem) => {
+        expect(booksItem.author).to.satisfy(
+          (item: SearchBooksByNameOpdsResult['author']) => item.every(
+            (authorItem) => isString(authorItem.name) && isString(authorItem.uri),
+          ),
+        );
+        expect(booksItem.title).to.satisfy((item: SearchBooksByNameOpdsResult['title']) => isString(item));
+        expect(booksItem.updated).to.satisfy((item: SearchBooksByNameOpdsResult['updated']) => isString(item));
+        expect(booksItem.categories).to.satisfy((item: SearchBooksByNameOpdsResult['categories']) => item.every(
+          (categoriesItem) => isString(categoriesItem),
+        ));
+        expect(booksItem.cover).to.satisfy(
+          (item: SearchBooksByNameOpdsResult['cover']) => isNil(item) || isString(item),
+        );
+        expect(booksItem.downloads).to.satisfy(
+          (item: SearchBooksByNameOpdsResult['downloads']) => item.every(
+            (downloadItems) => isString(downloadItems.link) && isString(downloadItems.type),
+          ),
+        );
+        expect(booksItem.description).to.satisfy((item: SearchBooksByNameOpdsResult['description']) => isString(item));
+      });
+    });
   });
 
   describe('getBooksByNameFromOpdsPaginated()', () => {

tests/flibustaApiHelper.ts

@@ -39,7 +39,7 @@ describe('FlibustaAPIHelper', () => {
       expect(currentPageInformation).to.be.deep.equal({
         hasNextPage: true,
         hasPreviousPage: false,
-        totalPages: 5,
+        totalPages: 6,
       });
     });
   });

types/opdsSearchResult.d.ts

@@ -49,7 +49,7 @@ export type OpdsSearchResult = {
     updated: string;
     icon: string;
     link: Array<OpdsLinkType>;
-    entry: Nullable<Array<OpdsEntry>>;
+    entry: Nullable<Array<OpdsEntry>> | Nullable<OpdsEntry>;
     'os:totalResults': number;
     'os:startIndex': number;
     'os:itemsPerPage': number;