Merge pull request #9 from leozqin/recency

Add sort by recent and book count stats

Author: leozqin

lib.py

@@ -52,6 +52,7 @@ class Book(BaseModel):
     creators: List[str]
     local_path: str
     thumbnail_name: Optional[str] = None
+    last_updated: float
     language: str = "en"
 
     @computed_field
@@ -83,7 +84,9 @@ def from_record(cls, id: str) -> Self:
 
 def make_book(path: Path) -> Book:
     try:
-        book = read_epub(str(path.resolve()))
+        file = path.resolve()
+        book = read_epub(str(file))
+        last_updated = file.stat().st_mtime
     except Exception as e:
         raise BookNotParseableException(
             f"Book at path {path} was not parseable!"
@@ -113,6 +116,7 @@ def make_book(path: Path) -> Book:
         local_path=str(path.resolve()),
         creators=creators,
         language=language,
+        last_updated=last_updated
     )
 
     cover_items = [i for i in cover_items if i]

main.py

@@ -14,6 +14,7 @@ class SortMethod(str, Enum):
     random = "random"
     az = "az"
     za = "za"
+    recent = "recent"
 
 class ListBooksQuery(BaseModel):
     sort: Optional[SortMethod] = Field(Query(default=SortMethod.random))
@@ -31,7 +32,7 @@ async def reparse_library():
 app = FastAPI(lifespan=lifespan)
 
 @app.get("/list-books")
-def list_books(sort: SortMethod = SortMethod.random):
+def list_books(sort: SortMethod = SortMethod.recent):
     books = lib.list_books()
 
     if sort is SortMethod.random:
@@ -40,6 +41,8 @@ def list_books(sort: SortMethod = SortMethod.random):
         books.sort(key=attrgetter("title"), reverse=False)
     elif sort is SortMethod.za:
         books.sort(key=attrgetter("title"), reverse=True)
+    elif sort is SortMethod.recent:
+        books.sort(key=attrgetter("last_updated"), reverse=True)
 
     return books
 

web/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "web",
   "type": "module",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "scripts": {
     "dev": "astro dev",
     "build": "astro build",

web/package.json

@@ -1,5 +1,6 @@
 ---
 import BookCard from "./BookCard.astro";
+import Stats from "./Stats.astro";
 
 type Book = {
     id: string;
@@ -8,16 +9,17 @@ type Book = {
     creators: Array<string>;
 };
 
-const sort = Astro.url.searchParams.get("sort") || "random";
+const sort = Astro.url.searchParams.get("sort") || "recent";
 
 const apiEndpoint: string = import.meta.env.API_BASE_URL
     ? import.meta.env.API_BASE_URL
     : "http://api";
 
 const response = await fetch(`${apiEndpoint}/list-books?sort=${sort}`);
 const data: Array<Book> = await response.json();
+const books: Number = data.length
 ---
-
+<Stats books={books} />
 <section class="books">
     <div class="book-card-grid">
         {

web/src/components/Books.astro

@@ -2,6 +2,7 @@
     <li class="header-item sort-button"><a href="/?sort=random">Sort Random</a></li>
     <li class="header-item sort-button"><a href="/?sort=az">Sort A-Z</a></li>
     <li class="header-item sort-button"><a href="/?sort=za">Sort Z-A</a></li>
+    <li class="header-item sort-button"><a href="/?sort=recent">Sort Recent</a></li>
 </ul>
 
 <style>

web/src/components/SortOption.astro

@@ -0,0 +1,18 @@
+---
+const { books } = Astro.props
+---
+<div class="stats-block">
+    <p>You have {books} books!</p>
+</div>
+
+<style>
+    .stats-block {
+        width: 50%;
+        align-self: auto;
+        align-items: center;
+        margin-right: auto;
+        margin-left: auto;
+        display: flex;
+        justify-content: center;
+    }
+</style>