Count Pages - use podofo rather than pdfinfo

kiwidude68 · Apr 7, 2024 · a9b72b1 · a9b72b1
1 parent 65ad164
commit a9b72b1
Show file tree

Hide file tree

Showing 21 changed files with 37 additions and 11 deletions.
diff --git a/count_pages/CHANGELOG.md b/count_pages/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Count Pages Change Log
 
+## [1.13.6] - 2024-04-07
+### Changed
+- Use podofo rather than pdfinfo to retrieve pdf page count. Shoudl fix issues for some users having problems with pdfinfo.exe
+### Fixed
+- Fix libpng warning: icCCP: known incorrect sRGB profile using `magick mogrify *.png`
+
 ## [1.13.5] - 2024-02-13
 ### Added
 - Finnish translation

diff --git a/count_pages/__init__.py b/count_pages/__init__.py
@@ -20,7 +20,7 @@ class ActionCountPages(InterfaceActionBase):
     description             = 'Count number of pages/words in an ePub/Mobi to store in custom columns'
     supported_platforms     = ['windows', 'osx', 'linux']
     author                  = 'Grant Drake'
-    version                 = (1, 13, 5)
+    version                 = (1, 13, 6)
     minimum_calibre_version = (2, 0, 0)
 
     #: This field defines the GUI plugin class that contains all the code

diff --git a/count_pages/images/cbdb.png b/count_pages/images/cbdb.png
diff --git a/count_pages/images/count_pages.png b/count_pages/images/count_pages.png
diff --git a/count_pages/images/databazeknih.png b/count_pages/images/databazeknih.png
diff --git a/count_pages/images/download_all_sources.png b/count_pages/images/download_all_sources.png
diff --git a/count_pages/images/estimate.png b/count_pages/images/estimate.png
diff --git a/count_pages/images/goodreads.png b/count_pages/images/goodreads.png
diff --git a/count_pages/images/lubimyczytac.png b/count_pages/images/lubimyczytac.png
diff --git a/count_pages/images/skoob.png b/count_pages/images/skoob.png
diff --git a/count_pages/statistics.py b/count_pages/statistics.py
@@ -19,6 +19,26 @@
 RE_STRIP_MARKUP = re.compile(u'<[^>]+>', re.UNICODE)
 
 def get_pdf_page_count(book_path):
+    '''
+    Try to use podofo to parse the page count.
+    This apparently can file for badly formatted pdfs in which case fall back to
+    trying to use pdfinfo (which some users have reported issues with).
+    '''
+    from calibre.utils.podofo import get_podofo
+    podofo = get_podofo()
+    try:
+        p = podofo.PDFDoc()
+        with open(book_path, 'rb') as f:
+            raw = f.read()
+        p.load(raw)
+        page_count = p.page_count()
+        print('\tPDF page count using podofo:', page_count)
+        return int(page_count)
+    except:
+        print('\tFailed to get count using podofo, trying pdfinfo')
+        return get_pdf_page_count_using_pdfinfo(book_path)
+
+def get_pdf_page_count_using_pdfinfo(book_path):
     '''
     Optimisation to read the actual page count for PDFs from the PDF itself.
     '''

diff --git a/count_pages/translations/cs.po b/count_pages/translations/cs.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Grant Drake, 2022\n"
 "Language-Team: Czech (https://app.transifex.com/calibre/teams/19337/cs/)\n"

diff --git a/count_pages/translations/de.po b/count_pages/translations/de.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: e13493b2a936f499f30a988e8a2df4be_22a66bf <faf36a540214319109e3a8bf5cbd8af8_453360>, 2023\n"
 "Language-Team: German (https://app.transifex.com/calibre/teams/19337/de/)\n"

diff --git a/count_pages/translations/es.po b/count_pages/translations/es.po
@@ -10,7 +10,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Jellby <jellby@yahoo.com>, 2024\n"
 "Language-Team: Spanish (https://app.transifex.com/calibre/teams/19337/es/)\n"

diff --git a/count_pages/translations/fi.po b/count_pages/translations/fi.po
@@ -8,7 +8,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Veikko Muurikainen, 2024\n"
 "Language-Team: Finnish (https://app.transifex.com/calibre/teams/19337/fi/)\n"

diff --git a/count_pages/translations/fr.po b/count_pages/translations/fr.po
@@ -13,7 +13,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Walter Paterno <walter.paterno@gmail.com>, 2024\n"
 "Language-Team: French (https://app.transifex.com/calibre/teams/19337/fr/)\n"

diff --git a/count_pages/translations/pl.po b/count_pages/translations/pl.po
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Silatiw Witalis, 2022\n"
 "Language-Team: Polish (https://app.transifex.com/calibre/teams/19337/pl/)\n"

diff --git a/count_pages/translations/ru.po b/count_pages/translations/ru.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: ashed <craysy@gmail.com>, 2022\n"
 "Language-Team: Russian (https://app.transifex.com/calibre/teams/19337/ru/)\n"

diff --git a/count_pages/translations/ta.po b/count_pages/translations/ta.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: தமிழ்நேரம் <anishprabu.t@gmail.com>, 2023\n"
 "Language-Team: Tamil (https://app.transifex.com/calibre/teams/19337/ta/)\n"

diff --git a/count_pages/translations/tr.po b/count_pages/translations/tr.po
@@ -12,7 +12,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Bora Atıcı, 2023\n"
 "Language-Team: Turkish (https://app.transifex.com/calibre/teams/19337/tr/)\n"

diff --git a/count_pages/translations/uk.po b/count_pages/translations/uk.po
@@ -9,7 +9,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2024-02-14 02:13+1000\n"
+"POT-Creation-Date: 2024-03-24 17:57+1000\n"
 "PO-Revision-Date: 2022-09-19 15:22+0000\n"
 "Last-Translator: Yuri Chornoivan <yurchor@ukr.net>, 2024\n"
 "Language-Team: Ukrainian (https://app.transifex.com/calibre/teams/19337/uk/)\n"