Skip to content
This repository has been archived by the owner on Jul 29, 2022. It is now read-only.

Rewrite Epub parsing with the new XmlParser implementation and the new Publication model #89

Merged
merged 65 commits into from
Feb 25, 2020
Merged

Rewrite Epub parsing with the new XmlParser implementation and the new Publication model #89

merged 65 commits into from
Feb 25, 2020

Commits on Jan 18, 2020

  1. Replace usages of PageProgressionDirection as a name by usages as enu… 

    …m values
    @qnga
    qnga committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    5492494 View commit details
    Browse the repository at this point in the history

  2. Rewrite Epub parsing with the new XmlParser implementation 

    Elements and attributes are every time picked from the right namespace.
Epub 3.x Property Data Type default vocabularies and prefix mechanism are carefully implemented.

As data are not organized in the same way in an Epub Package Document and in a Readium Publication,
a specific intermediate model is used to parse completely an Epub before converting it into a Publication.
This allows clearer code and should make further feature additions easier.
    @qnga
    qnga committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    45627ff View commit details
    Browse the repository at this point in the history

  3. Implement Epub media overlays parsing 

    After SMIL parsing, media overlays are stored in the mediaOverlays property of a dedicated link.
    @qnga
    qnga committed Jan 18, 2020
    Configuration menu
    Copy the full SHA
    7093b9a View commit details
    Browse the repository at this point in the history

Commits on Jan 22, 2020

  1. Fix headers in epub parser

    @qnga
    qnga committed Jan 22, 2020
    Configuration menu
    Copy the full SHA
    93fdf55 View commit details
    Browse the repository at this point in the history

Commits on Jan 24, 2020

  1. Add OEBPS 1.2 support

    @qnga
    qnga committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    637c17f View commit details
    Browse the repository at this point in the history

  2. Fix a bug and make namespaces compile-time constants

    @qnga
    qnga committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    b38ccf5 View commit details
    Browse the repository at this point in the history

  3. Add multiple subtitles support and use publication language as fallba… 

    …ck metadata language
    @qnga
    qnga committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    db72d79 View commit details
    Browse the repository at this point in the history

  4. Cosmetic changes

    @qnga
    qnga committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    6a3e764 View commit details
    Browse the repository at this point in the history

  5. Catch exceptions from Xml Parser in Epub parser

    @qnga
    qnga committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    03c4b75 View commit details
    Browse the repository at this point in the history

  6. Rewrite EncryptionParser in a stateless style

    @qnga
    qnga committed Jan 24, 2020
    Configuration menu
    Copy the full SHA
    0d116fa View commit details
    Browse the repository at this point in the history

Commits on Jan 31, 2020

  1. Rewrite Ncx and Navigation Document Parsers in a stateless style

    @qnga
    qnga committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    36f419d View commit details
    Browse the repository at this point in the history

  2. Start to adapt the streamer to the new Shared model

    @qnga
    qnga committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    bf6eeb7 View commit details
    Browse the repository at this point in the history

  3. Use the new Publication model in divina, cbz and audiobook parsers

    @qnga
    qnga committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    dd060ec View commit details
    Browse the repository at this point in the history

  4. Extract some Epub constants to a dedicated file with Xml namespaces f… 

    …or Epub
    @qnga
    qnga committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    397f49c View commit details
    Browse the repository at this point in the history

  5. Adapt the layout setting in the Epub parser to the new Publication model

    @qnga
    qnga committed Jan 31, 2020
    Configuration menu
    Copy the full SHA
    8290deb View commit details
    Browse the repository at this point in the history

Commits on Feb 1, 2020

  1. Refactor and finish to adapt the epub parser

    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    3611694 View commit details
    Browse the repository at this point in the history

  2. Make almost everything internal in the epub parser

    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    18bbd59 View commit details
    Browse the repository at this point in the history

  3. Deeply check whether a link is in readingOrder while splitting betwee… 

    …n readingOrder and resources
    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    833213f View commit details
    Browse the repository at this point in the history

  4. Use shared Subject and ReadingProgression in the Epub model, forget a… 

    …bout MultilanguageString
    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    f79ff95 View commit details
    Browse the repository at this point in the history

  5. Fix EncryptionParser

    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    93a6e17 View commit details
    Browse the repository at this point in the history

  6. Set test lifecycle of test classes to per_class

    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    96e9ac7 View commit details
    Browse the repository at this point in the history

  7. Use assertJ and backticks in ClockValueParserTest

    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    75f1d65 View commit details
    Browse the repository at this point in the history

  8. Rewrite parser.normalize so that anchors are accepted as href and the… 

    … result is percent-decoded
    @qnga
    qnga committed Feb 1, 2020
    Configuration menu
    Copy the full SHA
    420e719 View commit details
    Browse the repository at this point in the history

Commits on Feb 2, 2020

  1. Cosmetic changes

    @qnga
    qnga committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    dfd2110 View commit details
    Browse the repository at this point in the history

  2. Fix and test NavigationParser

    @qnga
    qnga committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    684ac10 View commit details
    Browse the repository at this point in the history

  3. Fix and test NcxParser

    @qnga
    qnga committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    ac99865 View commit details
    Browse the repository at this point in the history

  4. Extract code to use default language in title, subtitle and contribut… 

    …ors to a dedicated function
    @qnga
    qnga committed Feb 2, 2020
    Configuration menu
    Copy the full SHA
    d1741f9 View commit details
    Browse the repository at this point in the history

Commits on Feb 3, 2020

  1. Fix uses of LocalizedString and use shared Contributor in the Epub da… 

    …ta model
    @qnga
    qnga committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    acf2a5d View commit details
    Browse the repository at this point in the history

  2. Fix a bug in Ncx parser and simplify NavigationData model

    @qnga
    qnga committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    73a7b01 View commit details
    Browse the repository at this point in the history

  3. Fix usage of the new Publication models, and fix warnings

    @mickael-menu
    mickael-menu committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    5b2d177 View commit details
    Browse the repository at this point in the history

  4. Fix CBZ and DiViNa parsers: 

    - Sort the ZIP entries before creating the readingOrder, for CBZ
- Don't fallback on the Link.href for its title. The testapp should do that if needed.
    @mickael-menu
    mickael-menu committed Feb 3, 2020
    Configuration menu
    Copy the full SHA
    7de3521 View commit details
    Browse the repository at this point in the history

Commits on Feb 4, 2020

  1. Fix containers (remove href's / prefix, wrong dataLength and add cont… 

    …ains(relativePath))

Fix error while reading encryption.xml in the EpubParser
Filter out directories from the CBZ entries
    @mickael-menu
    mickael-menu committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    da20bd9 View commit details
    Browse the repository at this point in the history

  2. Make DrmDecoder, FontDecoder and ContentFilters internal

    @qnga
    qnga committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    825bd3d View commit details
    Browse the repository at this point in the history

  3. Fix and test Epub metadata parsing

    @qnga
    qnga committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    bf61137 View commit details
    Browse the repository at this point in the history

  4. Add basic PackageDocumentTest, required for commit bf61137

    @qnga
    qnga committed Feb 4, 2020
    Configuration menu
    Copy the full SHA
    a57a9d1 View commit details
    Browse the repository at this point in the history

Commits on Feb 6, 2020

  1. Make Ncx and NavigationDocument parsers output a map so that unknown … 

    …collection roles are allowed, fix and test PropertyDataType
    @qnga
    qnga committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    a3b0c12 View commit details
    Browse the repository at this point in the history

  2. Fix and test link properties parsing + comestic changes

    @qnga
    qnga committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    f2fec95 View commit details
    Browse the repository at this point in the history

  3. Add files missing in previous commit f2fec95

    @qnga
    qnga committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    5b2f4e3 View commit details
    Browse the repository at this point in the history

  4. Fix number parsing safety + cosmetic changes

    @qnga
    qnga committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    eb44478 View commit details
    Browse the repository at this point in the history

  5. Cosmetic changes

    @qnga
    qnga committed Feb 6, 2020
    Configuration menu
    Copy the full SHA
    eba1fbc View commit details
    Browse the repository at this point in the history

Commits on Feb 7, 2020

  1. Rewrite meta expression parsing 

    Move Metadata mapping to a separate file
Map all ununused MetaItems to otherMetadata
    @qnga
    qnga committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    ebeb03e View commit details
    Browse the repository at this point in the history

  2. Rewrite MetadataParser to allow the inclusion of unhandled Dc element… 

    …s into otherMetadata
    @qnga
    qnga committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    36f43ac View commit details
    Browse the repository at this point in the history

  3. Move metadata parsing logic from MetadataParser to MetadataMapping 

    MetadataParser now outputs only MetaItem elements, which are used in MetadataMapping
    @qnga
    qnga committed Feb 7, 2020
    Configuration menu
    Copy the full SHA
    eeef43f View commit details
    Browse the repository at this point in the history

Commits on Feb 8, 2020

  1. Rewrite metadata parsing

    @qnga
    qnga committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    3bea2f0 View commit details
    Browse the repository at this point in the history

  2. Reorganize epub package in a more traditionnal POO style

    @qnga
    qnga committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    2fea801 View commit details
    Browse the repository at this point in the history

  3. Use non null and statically checked vocabulary iris

    @qnga
    qnga committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    3759852 View commit details
    Browse the repository at this point in the history

  4. Cosmetic changes

    @qnga
    qnga committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    c396e74 View commit details
    Browse the repository at this point in the history

  5. Fix formatting in the epub package

    @qnga
    qnga committed Feb 8, 2020
    Configuration menu
    Copy the full SHA
    1c36eb3 View commit details
    Browse the repository at this point in the history

Commits on Feb 9, 2020

  1. Implement collections and series

    @qnga
    qnga committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    c6128dc View commit details
    Browse the repository at this point in the history

  2. Fix loading CSS styles

    @mickael-menu
    mickael-menu committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    1f98f97 View commit details
    Browse the repository at this point in the history

  3. Refactor Epub into EpubAdapter and use displayOptions.xml

    @qnga
    qnga committed Feb 9, 2020
    Configuration menu
    Copy the full SHA
    773a913 View commit details
    Browse the repository at this point in the history

Commits on Feb 10, 2020

  1. Merge commit '1f98f97c' into develop

    @qnga
    qnga committed Feb 10, 2020
    Configuration menu
    Copy the full SHA
    d17d14f View commit details
    Browse the repository at this point in the history

  2. Move the normalize function to shared

    @qnga
    qnga committed Feb 10, 2020
    Configuration menu
    Copy the full SHA
    14d7678 View commit details
    Browse the repository at this point in the history

  3. Fix uses of normalize function

    @qnga
    qnga committed Feb 10, 2020
    Configuration menu
    Copy the full SHA
    d3e4f30 View commit details
    Browse the repository at this point in the history

  4. Use Long for originalLength

    @mickael-menu
    mickael-menu committed Feb 10, 2020
    Configuration menu
    Copy the full SHA
    6ab8646 View commit details
    Browse the repository at this point in the history

Commits on Feb 11, 2020

  1. Various cosmetic fixes and small refactorings

    @mickael-menu
    mickael-menu committed Feb 11, 2020
    Configuration menu
    Copy the full SHA
    74f371b View commit details
    Browse the repository at this point in the history

Commits on Feb 12, 2020

  1. Some cosmetic changes from #89 (review)

    @qnga
    qnga committed Feb 12, 2020
    Configuration menu
    Copy the full SHA
    60c4491 View commit details
    Browse the repository at this point in the history

Commits on Feb 13, 2020

  1. Rename the title argument in PublicationParser.parse to fallbackTitle… 

    … and use it in parsing of Epubs
    @qnga
    qnga committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    9d9fe6a View commit details
    Browse the repository at this point in the history

  2. Use Set for rels

    @mickael-menu
    mickael-menu committed Feb 13, 2020
    Configuration menu
    Copy the full SHA
    6e1d2ea View commit details
    Browse the repository at this point in the history

Commits on Feb 14, 2020

  1. Change rels lists to sets in tests

    @qnga
    qnga committed Feb 14, 2020
    Configuration menu
    Copy the full SHA
    64e974d View commit details
    Browse the repository at this point in the history

Commits on Feb 18, 2020

  1. Merge branch 'pull/89' into fixes/publication-models

    @mickael-menu
    mickael-menu committed Feb 18, 2020
    Configuration menu
    Copy the full SHA
    a21e64c View commit details
    Browse the repository at this point in the history

Commits on Feb 20, 2020

  1. Improve MetadataAdapter organization

    @qnga
    qnga committed Feb 20, 2020
    Configuration menu
    Copy the full SHA
    a323d35 View commit details
    Browse the repository at this point in the history

  2. Fix the expected behaviour with hidden attribute in a nav test file

    @qnga
    qnga committed Feb 20, 2020
    Configuration menu
    Copy the full SHA
    1a57855 View commit details
    Browse the repository at this point in the history

Commits on Feb 21, 2020

  1. Merge branch 'pull/89' into fixes/publication-models

    @mickael-menu
    mickael-menu committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    1b0ac4c View commit details
    Browse the repository at this point in the history

  2. Remove the use of Container.contains and fix ArchiveContainer

    @mickael-menu
    mickael-menu committed Feb 21, 2020
    Configuration menu
    Copy the full SHA
    48a369d View commit details
    Browse the repository at this point in the history