Add workaround for bad formatted inpx

Author: shemanaev

internal/model/book.go

@@ -90,6 +90,18 @@ func (b *Book) PublishedAt() string {
 	return b.PubDate.Format("2006-01-02")
 }
 
+func (f *File) IsArchived() bool {
+	return f.Folder == "" || strings.HasSuffix(f.Folder, ".zip")
+}
+
+func (f *File) ArchivePath() string {
+	if strings.HasSuffix(f.Folder, ".zip") {
+		return f.Folder
+	}
+
+	return fmt.Sprintf("%s.zip", f.Archive)
+}
+
 func (a Author) String() string {
 	var name string
 	if a.FirstName == "" && a.MiddleName == "" {

internal/server/download.go

@@ -51,7 +51,7 @@ func (h *DownloadHandler) Download(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	if book.File.Folder == "" {
+	if book.File.IsArchived() {
 		data, err := h.getFileFromArchive(book)
 		if err != nil {
 			notFound(w, id)
@@ -117,7 +117,7 @@ func (h *DownloadHandler) DownloadConverted(w http.ResponseWriter, r *http.Reque
 	}
 
 	var filename string
-	if book.File.Folder == "" {
+	if book.File.IsArchived() {
 		data, err := h.getFileFromArchive(book)
 		if err != nil {
 			notFound(w, id)
@@ -189,7 +189,7 @@ func (h *DownloadHandler) getDirectFilePath(book *model.Book) (string, error) {
 }
 
 func (h *DownloadHandler) getFileFromArchive(book *model.Book) ([]byte, error) {
-	archivePath := filepath.Join(h.cfg.LibraryPath, book.File.Archive+".zip")
+	archivePath := filepath.Join(h.cfg.LibraryPath, book.File.ArchivePath())
 	zf, err := zip.OpenReader(archivePath)
 	if err != nil {
 		log.Printf("Can't open archive `%s` (id: %s) not found: %v", archivePath, book.LibId, err)

pkg/inpx/parser.go

@@ -374,7 +374,7 @@ func (p *Parser) getFileByName(name string) (io.ReadCloser, error) {
 // Read line from reader and returns it trimmed.
 func readCleanString(r *bufio.Reader) (string, error) {
 	s, err := r.ReadString('\n')
-	if err != nil {
+	if err != nil && err != io.EOF {
 		return "", err
 	}
 

pkg/inpx/parser_test.go

@@ -110,3 +110,64 @@ func TestFlibustaRev20(t *testing.T) {
 
 	assert.Equal(53, bookCount)
 }
+
+func TestFlibustaAllLocal20250202(t *testing.T) {
+	assert := assert.New(t)
+	collection, err := Open("testdata/flibusta_all_local-2025-02-02.inpx")
+	if err != nil {
+		t.Fatalf(`collection is not opened: %v`, err)
+	}
+	defer collection.Close()
+
+	assert.Equal("Flibusta Offline 2 February 2025", collection.Name)
+	assert.Equal(65537, collection.Id)
+	assert.Equal("Flibusta. A local collection. Total: 771171 books", collection.Comment)
+
+	assert.Equal("20250202", collection.Version)
+
+	bookCount := 0
+	for book := range collection.Stream() {
+		bookCount = bookCount + 1
+
+		if book.LibId == 754865 {
+			assert.Equal("Книги фантастики українських видавництв за 1960-1991 рр.", book.Title)
+			assert.Equal("", book.Series)
+			assert.Equal(time.Date(2023, 11, 01, 0, 0, 0, 0, time.UTC), book.PublishedDate)
+			assert.Equal([]string{"reference", "sf_etc"}, book.Genres)
+			assert.Equal("754865", book.File.Name)
+			assert.Equal("rtf", book.File.Ext)
+			assert.Equal(1436043, book.File.Size)
+			assert.Equal("f.usr-754754-759835.zip", book.File.Folder)
+			assert.Equal("uk", book.Language)
+			authors := []Author{
+				{
+					LastName:   "Левченко",
+					FirstName:  "Александр",
+					MiddleName: "Николаевич",
+				},
+			}
+			assert.Equal(authors, book.Authors)
+		}
+		if book.LibId == 362143 {
+			assert.Equal("Сан Феличе", book.Title)
+			assert.Equal("", book.Series)
+			assert.Equal(time.Date(2014, 05, 03, 0, 0, 0, 0, time.UTC), book.PublishedDate)
+			assert.Equal([]string{"prose_history", "adventure", "sci_culture", "design"}, book.Genres)
+			assert.Equal("362143", book.File.Name)
+			assert.Equal("fb2", book.File.Ext)
+			assert.Equal(2607193, book.File.Size)
+			assert.Equal("f.fb2-361575-365133.zip", book.File.Folder)
+			assert.Equal("bg", book.Language)
+			authors := []Author{
+				{
+					LastName:   "Дюма",
+					FirstName:  "Александр",
+					MiddleName: "",
+				},
+			}
+			assert.Equal(authors, book.Authors)
+		}
+	}
+
+	assert.Equal(3, bookCount)
+}