From 86892a255f5db478ea87652897388feb6444e012 Mon Sep 17 00:00:00 2001 From: Serge Shkurko Date: Sat, 23 Oct 2021 06:14:11 +0300 Subject: [PATCH 01/24] Upgrade dependencies --- CHANGELOG.md | 7 +++---- lib/src/epub_reader.dart | 32 +++++++++++++++++++++++++++++++- pubspec.yaml | 15 ++++++++------- 3 files changed, 42 insertions(+), 12 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6adc9b26..28c82733 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,8 +1,7 @@ -# Changelog -All notable changes to this project will be documented in this file. +## 3.0.0 +### Changed +- `metadata` file now saves as `mimetype` [pull#1](https://github.com/rbcprolabs/epubx.dart/pull/1) -The format is based on Keep a Changelog(https://keepachangelog.com/en/1.0.0/) -and this project adheres to Semantic Versioning(https://semver.org/spec/v2.0.0.html). ## 3.0.0-dev.3 ### Changed diff --git a/lib/src/epub_reader.dart b/lib/src/epub_reader.dart index 8efb459d..eec1f55e 100644 --- a/lib/src/epub_reader.dart +++ b/lib/src/epub_reader.dart @@ -18,8 +18,38 @@ import 'ref_entities/epub_content_ref.dart'; import 'ref_entities/epub_text_content_file_ref.dart'; import 'schema/opf/epub_metadata_creator.dart'; +/// A class that provides the primary interface to read Epub files. +/// +/// To open an Epub and load all data at once use the [readBook()] method. +/// +/// To open an Epub and load only basic metadata use the [openBook()] method. +/// This is a good option to quickly load text-based metadata, while leaving the +/// heavier lifting of loading images and main content for subsequent operations. +/// +/// ## Example +/// ```dart +/// // Read the basic metadata. +/// EpubBookRef epub = await EpubReader.openBook(epubFileBytes); +/// // Extract values of interest. +/// String title = epub.Title; +/// String author = epub.Author; +/// var metadata = epub.Schema.Package.Metadata; +/// String genres = metadata.Subjects.join(', '); +/// ``` class EpubReader { - /// Opens the book asynchronously without reading its content. Holds the handle to the EPUB file. + /// Loads basics metadata. + /// + /// Opens the book asynchronously without reading its main content. + /// Holds the handle to the EPUB file. + /// + /// Argument [bytes] should be the bytes of + /// the epub file you have loaded with something like the [dart:io] package's + /// [readAsBytes()]. + /// + /// This is a fast and convenient way to get the most important information + /// about the book, notably the [Title], [Author] and [AuthorList]. + /// Additional information is loaded in the [Schema] property such as the + /// Epub version, Publishers, Languages and more. static Future openBook(FutureOr> bytes) async { List loadedBytes; if (bytes is Future) { diff --git a/pubspec.yaml b/pubspec.yaml index e86cfddf..83d9d34f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -1,17 +1,18 @@ name: epubx -version: 3.0.0-dev.3 -description: Epub Parser for Dart. Suitable for use on the Server, the Web, or in Flutter +description: Epub Parser for Dart. Epub package fork. Suitable for use on the Server, the Web, or in Flutter homepage: https://github.com/rbcprolabs/epubx.dart +issue_tracker: https://github.com/rbcprolabs/epubx.dart +version: 3.0.0 environment: sdk: '>=2.12.0 <3.0.0' dependencies: - archive: ^3.1.2 - quiver: ^3.0.0 - xml: ^5.0.2 - image: ^3.0.1 - collection: ^1.15.0-nullsafety.4 + archive: ^3.1.6 + quiver: ^3.0.1+1 + xml: ^5.3.1 + image: ^3.0.8 + collection: ^1.15.0 dev_dependencies: test: ^1.16.7 From 6f9e995f8f897ddddd45b273dd7a327716a2990c Mon Sep 17 00:00:00 2001 From: Serge Shkurko Date: Sat, 23 Oct 2021 06:29:23 +0300 Subject: [PATCH 02/24] Squashed commit of the following: commit 4bf0bbe67f12105d8ad9a02d455a8122f5b2d7ec Merge: 9c67bd2 be9dafb Author: shoaibomar Date: Mon Aug 24 16:25:03 2020 +0530 Merge branch 'dev' of github-oneummah:1Ummah/dart-epub into dev commit 9c67bd25429b6fd91f117a903893847aa31cddbc Author: shoaibomar Date: Mon Aug 24 16:24:49 2020 +0530 removed requirenment for title in Nav Doc commit 2c0a37be61c0993e16063a39850bbcfbb31dc024 Author: shoaibomar Date: Mon Aug 24 16:23:02 2020 +0530 removed requirenment for title in Nav Doc commit be9dafb5b5ad05f4a96171e92524ca5365595b55 Author: Shoaib Omar Date: Sun Jul 5 15:57:49 2020 +0530 all meta attributes are now accessible commit 0d635840045e27ece3e32fe25a91360217f0a1f2 Author: shoaibomar Date: Thu Jun 18 13:56:32 2020 +0530 now gets media-overlays for manifest items commit ee803494a0def50e4e91aa2300fa90d0f8271b52 Author: shoaibomar Date: Wed Jun 17 16:38:10 2020 +0530 now supports relative file paths for navigation epub v3 commit 5bc22dd5ce9a95a84f2b40408cf20b5f80524900 Author: shoaibomar Date: Wed Jun 17 16:35:31 2020 +0530 now supports relative file paths for navigation epub v3 commit 99a0f65c5000414aab31d84087eb16c84ab05bdc Author: shoaibomar Date: Wed Jun 17 15:53:31 2020 +0530 got page progression direction commit 602d46758aa9a6f089d13c10b91cd0367a2b5f3a Author: shoaibomar Date: Tue Jun 16 17:28:53 2020 +0530 switched to dart trim commit 1c1c5cfb2d8eaa26e14a94e3f5d10684313c7af3 Author: shoaibomar Date: Tue Jun 16 00:30:35 2020 +0530 fixed recursive search commit 197364749b4ef6cba4e666910072a8eabde118ec Author: shoaibomar Date: Tue Jun 16 00:04:18 2020 +0530 fix typo commit 0a99ed71c869d9e70d172e2cce1d2bce5e0a34b4 Author: shoaibomar Date: Tue Jun 16 00:00:32 2020 +0530 fix typo commit 076ac2739bdc8e08c0f96cb52d24b6ab46758473 Author: SHB743 Date: Mon Jun 15 23:49:53 2020 +0530 added support for V3 Epubs --- lib/src/readers/navigation_reader.dart | 401 +++++++++++++++------ lib/src/readers/package_reader.dart | 19 +- lib/src/schema/opf/epub_manifest_item.dart | 12 +- lib/src/schema/opf/epub_metadata_meta.dart | 1 + lib/src/schema/opf/epub_spine.dart | 5 +- 5 files changed, 328 insertions(+), 110 deletions(-) diff --git a/lib/src/readers/navigation_reader.dart b/lib/src/readers/navigation_reader.dart index 94aa2189..e2df9f4d 100644 --- a/lib/src/readers/navigation_reader.dart +++ b/lib/src/readers/navigation_reader.dart @@ -25,100 +25,195 @@ import '../schema/opf/epub_package.dart'; import '../utils/enum_from_string.dart'; import '../utils/zip_path_utils.dart'; +// ignore: omit_local_variable_types + class NavigationReader { - static Future readNavigation(Archive epubArchive, + static String? _tocFileEntryPath; + static Future readNavigation(Archive epubArchive, String contentDirectoryPath, EpubPackage package) async { - var result = EpubNavigation(); - var tocId = package.Spine!.TableOfContents; - if (tocId == null || tocId.isEmpty) { - if (package.Version == EpubVersion.Epub2) { - throw Exception('EPUB parsing error: TOC ID is empty.'); + EpubNavigation result = EpubNavigation(); + if (package.Version == EpubVersion.Epub2) { + String tocId = package.Spine!.TableOfContents!; + if (tocId == null || tocId.isEmpty) { + throw Exception("EPUB parsing error: TOC ID is empty."); } - return null; - } - var tocManifestItem = package.Manifest!.Items!.firstWhereOrNull( - (EpubManifestItem item) => - item.Id!.toLowerCase() == tocId.toLowerCase()); - if (tocManifestItem == null) { - throw Exception( - 'EPUB parsing error: TOC item $tocId not found in EPUB manifest.'); - } + var tocManifestItem = + package.Manifest!.Items!.cast().firstWhere( + (EpubManifestItem? item) => + item!.Id!.toLowerCase() == tocId.toLowerCase(), + orElse: () => null, + ); + if (tocManifestItem == null) { + throw Exception( + "EPUB parsing error: TOC item ${tocId} not found in EPUB manifest."); + } - var tocFileEntryPath = - ZipPathUtils.combine(contentDirectoryPath, tocManifestItem.Href); - var tocFileEntry = epubArchive.files.firstWhereOrNull((ArchiveFile file) => - file.name.toLowerCase() == tocFileEntryPath!.toLowerCase()); - if (tocFileEntry == null) { - throw Exception( - 'EPUB parsing error: TOC file $tocFileEntryPath not found in archive.'); - } + _tocFileEntryPath = + ZipPathUtils.combine(contentDirectoryPath, tocManifestItem.Href); + ArchiveFile? tocFileEntry = epubArchive.files + .cast() + .firstWhere( + (ArchiveFile? file) => + file!.name.toLowerCase() == _tocFileEntryPath!.toLowerCase(), + orElse: () => null); + if (tocFileEntry == null) { + throw Exception( + "EPUB parsing error: TOC file ${_tocFileEntryPath} not found in archive."); + } - var containerDocument = - xml.XmlDocument.parse(convert.utf8.decode(tocFileEntry.content)); + xml.XmlDocument containerDocument = + xml.parse(convert.utf8.decode(tocFileEntry.content)); + + String ncxNamespace = "http://www.daisy.org/z3986/2005/ncx/"; + xml.XmlElement? ncxNode = containerDocument + .findAllElements("ncx", namespace: ncxNamespace) + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (ncxNode == null) { + throw Exception( + "EPUB parsing error: TOC file does not contain ncx element."); + } - var ncxNamespace = 'http://www.daisy.org/z3986/2005/ncx/'; - var ncxNode = containerDocument - .findAllElements('ncx', namespace: ncxNamespace) - .firstWhereOrNull((xml.XmlElement? elem) => elem != null); - if (ncxNode == null) { - throw Exception( - 'EPUB parsing error: TOC file does not contain ncx element.'); - } + xml.XmlElement? headNode = ncxNode + .findAllElements("head", namespace: ncxNamespace) + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (headNode == null) { + throw Exception( + "EPUB parsing error: TOC file does not contain head element."); + } - var headNode = ncxNode - .findAllElements('head', namespace: ncxNamespace) - .firstWhereOrNull((xml.XmlElement? elem) => elem != null); - if (headNode == null) { - throw Exception( - 'EPUB parsing error: TOC file does not contain head element.'); - } + EpubNavigationHead navigationHead = readNavigationHead(headNode); + result.Head = navigationHead; + xml.XmlElement? docTitleNode = ncxNode + .findElements("docTitle", namespace: ncxNamespace) + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (docTitleNode == null) { + throw Exception( + "EPUB parsing error: TOC file does not contain docTitle element."); + } - var navigationHead = readNavigationHead(headNode); - result.Head = navigationHead; - var docTitleNode = ncxNode - .findElements('docTitle', namespace: ncxNamespace) - .firstWhereOrNull((xml.XmlElement? elem) => elem != null); - if (docTitleNode == null) { - throw Exception( - 'EPUB parsing error: TOC file does not contain docTitle element.'); - } + EpubNavigationDocTitle navigationDocTitle = + readNavigationDocTitle(docTitleNode); + result.DocTitle = navigationDocTitle; + result.DocAuthors = []; + ncxNode + .findElements("docAuthor", namespace: ncxNamespace) + .forEach((xml.XmlElement docAuthorNode) { + EpubNavigationDocAuthor navigationDocAuthor = + readNavigationDocAuthor(docAuthorNode); + result.DocAuthors!.add(navigationDocAuthor); + }); + + xml.XmlElement? navMapNode = ncxNode + .findElements("navMap", namespace: ncxNamespace) + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (navMapNode == null) { + throw Exception( + "EPUB parsing error: TOC file does not contain navMap element."); + } - var navigationDocTitle = readNavigationDocTitle(docTitleNode); - result.DocTitle = navigationDocTitle; - result.DocAuthors = []; - ncxNode - .findElements('docAuthor', namespace: ncxNamespace) - .forEach((xml.XmlElement docAuthorNode) { - var navigationDocAuthor = readNavigationDocAuthor(docAuthorNode); - result.DocAuthors!.add(navigationDocAuthor); - }); + EpubNavigationMap navMap = readNavigationMap(navMapNode); + result.NavMap = navMap; + xml.XmlElement? pageListNode = ncxNode + .findElements("pageList", namespace: ncxNamespace) + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (pageListNode != null) { + EpubNavigationPageList pageList = readNavigationPageList(pageListNode); + result.PageList = pageList; + } - var navMapNode = ncxNode - .findElements('navMap', namespace: ncxNamespace) - .firstWhereOrNull((xml.XmlElement? elem) => elem != null); - if (navMapNode == null) { - throw Exception( - 'EPUB parsing error: TOC file does not contain navMap element.'); - } + result.NavLists = []; + ncxNode + .findElements("navList", namespace: ncxNamespace) + .forEach((xml.XmlElement navigationListNode) { + EpubNavigationList navigationList = + readNavigationList(navigationListNode); + result.NavLists!.add(navigationList); + }); + } else { + //Version 3 + + EpubManifestItem? tocManifestItem = package.Manifest!.Items! + .cast() + .firstWhere((element) => element!.Properties == "nav", + orElse: () => null); + if (tocManifestItem == null) { + throw Exception( + "EPUB parsing error: TOC item, not found in EPUB manifest."); + } - var navMap = readNavigationMap(navMapNode); - result.NavMap = navMap; - var pageListNode = ncxNode - .findElements('pageList', namespace: ncxNamespace) - .firstWhereOrNull((xml.XmlElement? elem) => elem != null); - if (pageListNode != null) { - var pageList = readNavigationPageList(pageListNode); - result.PageList = pageList; - } + _tocFileEntryPath = + ZipPathUtils.combine(contentDirectoryPath, tocManifestItem.Href); + ArchiveFile? tocFileEntry = epubArchive.files + .cast() + .firstWhere( + (ArchiveFile? file) => + file!.name.toLowerCase() == _tocFileEntryPath!.toLowerCase(), + orElse: () => null); + if (tocFileEntry == null) { + throw Exception( + "EPUB parsing error: TOC file ${_tocFileEntryPath} not found in archive."); + } + //Get relative toc file path + _tocFileEntryPath = ((_tocFileEntryPath!.split("/")..removeLast()) + ..removeAt(0)) + .join("/") + + '/'; + + xml.XmlDocument containerDocument = + xml.parse(convert.utf8.decode(tocFileEntry.content)); + + xml.XmlElement? headNode = containerDocument + .findAllElements("head") + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (headNode == null) { + throw Exception( + "EPUB parsing error: TOC file does not contain head element."); + } - result.NavLists = []; - ncxNode - .findElements('navList', namespace: ncxNamespace) - .forEach((xml.XmlElement navigationListNode) { - var navigationList = readNavigationList(navigationListNode); - result.NavLists!.add(navigationList); - }); + result.DocTitle = EpubNavigationDocTitle(); + result.DocTitle!.Titles = package.Metadata!.Titles; +// result.DocTitle.Titles.add(headNode.findAllElements("title").firstWhere((element) => element != null, orElse: () => null).text.trim()); + + result.DocAuthors = []; + + xml.XmlElement? navNode = containerDocument + .findAllElements("nav") + .cast() + .firstWhere((xml.XmlElement? elem) => elem != null, + orElse: () => null); + if (navNode == null) { + throw Exception( + "EPUB parsing error: TOC file does not contain head element."); + } + xml.XmlElement navMapNode = navNode.findElements("ol").single; + + EpubNavigationMap navMap = readNavigationMapV3(navMapNode); + result.NavMap = navMap; + + //TODO : Implement pagesLists +// xml.XmlElement pageListNode = ncxNode +// .findElements("pageList", namespace: ncxNamespace) +// .firstWhere((xml.XmlElement elem) => elem != null, +// orElse: () => null); +// if (pageListNode != null) { +// EpubNavigationPageList pageList = readNavigationPageList(pageListNode); +// result.PageList = pageList; +// } + + } return result; } @@ -146,6 +241,34 @@ class NavigationReader { return result; } + static EpubNavigationContent readNavigationContentV3( + xml.XmlElement navigationContentNode) { + EpubNavigationContent result = EpubNavigationContent(); + navigationContentNode.attributes + .forEach((xml.XmlAttribute navigationContentNodeAttribute) { + String attributeValue = navigationContentNodeAttribute.value; + switch (navigationContentNodeAttribute.name.local.toLowerCase()) { + case "id": + result.Id = attributeValue; + break; + case "href": + if (_tocFileEntryPath!.length < 2 || + attributeValue.contains(_tocFileEntryPath!)) { + result.Source = attributeValue; + } else { + result.Source = _tocFileEntryPath! + attributeValue; + } + + break; + } + }); + if (result.Source == null || result.Source!.isEmpty) { + throw Exception( + "Incorrect EPUB navigation content: content source is missing."); + } + return result; + } + static EpubNavigationDocAuthor readNavigationDocAuthor( xml.XmlElement docAuthorNode) { var result = EpubNavigationDocAuthor(); @@ -230,6 +353,13 @@ class NavigationReader { return result; } + static EpubNavigationLabel readNavigationLabelV3( + xml.XmlElement navigationLabelNode) { + EpubNavigationLabel result = EpubNavigationLabel(); + result.Text = navigationLabelNode.text.trim(); + return result; + } + static EpubNavigationList readNavigationList( xml.XmlElement navigationListNode) { var result = EpubNavigationList(); @@ -249,12 +379,14 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationListChildNode) { switch (navigationListChildNode.name.local.toLowerCase()) { - case 'navlabel': - var navigationLabel = readNavigationLabel(navigationListChildNode); + case "navlabel": + EpubNavigationLabel navigationLabel = + readNavigationLabel(navigationListChildNode); result.NavigationLabels!.add(navigationLabel); break; - case 'navtarget': - var navigationTarget = readNavigationTarget(navigationListChildNode); + case "navtarget": + EpubNavigationTarget navigationTarget = + readNavigationTarget(navigationListChildNode); result.NavigationTargets!.add(navigationTarget); break; } @@ -272,8 +404,25 @@ class NavigationReader { navigationMapNode.children .whereType() .forEach((xml.XmlElement navigationPointNode) { - if (navigationPointNode.name.local.toLowerCase() == 'navpoint') { - var navigationPoint = readNavigationPoint(navigationPointNode); + if (navigationPointNode.name.local.toLowerCase() == "navpoint") { + EpubNavigationPoint navigationPoint = + readNavigationPoint(navigationPointNode); + result.Points!.add(navigationPoint); + } + }); + return result; + } + + static EpubNavigationMap readNavigationMapV3( + xml.XmlElement navigationMapNode) { + EpubNavigationMap result = EpubNavigationMap(); + result.Points = []; + navigationMapNode.children + .whereType() + .forEach((xml.XmlElement navigationPointNode) { + if (navigationPointNode.name.local.toLowerCase() == "li") { + EpubNavigationPoint navigationPoint = + readNavigationPointV3(navigationPointNode); result.Points!.add(navigationPoint); } }); @@ -287,8 +436,9 @@ class NavigationReader { navigationPageListNode.children .whereType() .forEach((xml.XmlElement pageTargetNode) { - if (pageTargetNode.name.local == 'pageTarget') { - var pageTarget = readNavigationPageTarget(pageTargetNode); + if (pageTargetNode.name.local == "pageTarget") { + EpubNavigationPageTarget pageTarget = + readNavigationPageTarget(pageTargetNode); result.Targets!.add(pageTarget); } }); @@ -333,13 +483,14 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationPageTargetChildNode) { switch (navigationPageTargetChildNode.name.local.toLowerCase()) { - case 'navlabel': - var navigationLabel = + case "navlabel": + EpubNavigationLabel navigationLabel = readNavigationLabel(navigationPageTargetChildNode); result.NavigationLabels!.add(navigationLabel); break; - case 'content': - var content = readNavigationContent(navigationPageTargetChildNode); + case "content": + EpubNavigationContent content = + readNavigationContent(navigationPageTargetChildNode); result.Content = content; break; } @@ -380,16 +531,18 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationPointChildNode) { switch (navigationPointChildNode.name.local.toLowerCase()) { - case 'navlabel': - var navigationLabel = readNavigationLabel(navigationPointChildNode); + case "navlabel": + EpubNavigationLabel navigationLabel = + readNavigationLabel(navigationPointChildNode); result.NavigationLabels!.add(navigationLabel); break; - case 'content': - var content = readNavigationContent(navigationPointChildNode); + case "content": + EpubNavigationContent content = + readNavigationContent(navigationPointChildNode); result.Content = content; break; - case 'navpoint': - var childNavigationPoint = + case "navpoint": + EpubNavigationPoint childNavigationPoint = readNavigationPoint(navigationPointChildNode); result.ChildNavigationPoints!.add(childNavigationPoint); break; @@ -408,6 +561,46 @@ class NavigationReader { return result; } + static EpubNavigationPoint readNavigationPointV3( + xml.XmlElement navigationPointNode) { + EpubNavigationPoint result = EpubNavigationPoint(); + + result.NavigationLabels = []; + result.ChildNavigationPoints = []; + navigationPointNode.children + .whereType() + .forEach((xml.XmlElement navigationPointChildNode) { + switch (navigationPointChildNode.name.local.toLowerCase()) { + case "a": + EpubNavigationLabel navigationLabel = + readNavigationLabelV3(navigationPointChildNode); + result.NavigationLabels!.add(navigationLabel); + EpubNavigationContent content = + readNavigationContentV3(navigationPointChildNode); + result.Content = content; + break; + case "ol": + readNavigationMapV3(navigationPointChildNode) + .Points! + .forEach((point) { + result.ChildNavigationPoints!.add(point); + }); + break; + } + }); + + if (result.NavigationLabels!.isEmpty) { + throw Exception( + "EPUB parsing error: navigation point ${result.Id} should contain at least one navigation label."); + } + if (result.Content == null) { + throw Exception( + "EPUB parsing error: navigation point ${result.Id} should contain content."); + } + + return result; + } + static EpubNavigationTarget readNavigationTarget( xml.XmlElement navigationTargetNode) { var result = EpubNavigationTarget(); @@ -438,12 +631,14 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationTargetChildNode) { switch (navigationTargetChildNode.name.local.toLowerCase()) { - case 'navlabel': - var navigationLabel = readNavigationLabel(navigationTargetChildNode); + case "navlabel": + EpubNavigationLabel navigationLabel = + readNavigationLabel(navigationTargetChildNode); result.NavigationLabels!.add(navigationLabel); break; - case 'content': - var content = readNavigationContent(navigationTargetChildNode); + case "content": + EpubNavigationContent content = + readNavigationContent(navigationTargetChildNode); result.Content = content; break; } diff --git a/lib/src/readers/package_reader.dart b/lib/src/readers/package_reader.dart index f3ee7749..62e1f491 100644 --- a/lib/src/readers/package_reader.dart +++ b/lib/src/readers/package_reader.dart @@ -77,7 +77,10 @@ class PackageReader { case 'media-type': manifestItem.MediaType = attributeValue; break; - case 'required-namespace': + case "media-overlay": + manifestItem.MediaOverlay = attributeValue; + break; + case "required-namespace": manifestItem.RequiredNamespace = attributeValue; break; case 'required-modules': @@ -89,6 +92,9 @@ class PackageReader { case 'fallback-style': manifestItem.FallbackStyle = attributeValue; break; + case "properties": + manifestItem.Properties = attributeValue; + break; } }); @@ -282,10 +288,13 @@ class PackageReader { static EpubMetadataMeta readMetadataMetaVersion3( XmlElement metadataMetaNode) { - var result = EpubMetadataMeta(); + EpubMetadataMeta result = EpubMetadataMeta(); + result.Attributes = {}; metadataMetaNode.attributes .forEach((XmlAttribute metadataMetaNodeAttribute) { - var attributeValue = metadataMetaNodeAttribute.value; + String attributeValue = metadataMetaNodeAttribute.value; + result.Attributes![metadataMetaNodeAttribute.name.local.toLowerCase()] = + attributeValue; switch (metadataMetaNodeAttribute.name.local.toLowerCase()) { case 'id': result.Id = attributeValue; @@ -370,6 +379,10 @@ class PackageReader { result.Items = []; var tocAttribute = spineNode.getAttribute('toc'); result.TableOfContents = tocAttribute; + String? pageProgression = + spineNode.getAttribute("page-progression-direction"); + result.ltr = + ((pageProgression == null) || pageProgression.toLowerCase() == "ltr"); spineNode.children .whereType() .forEach((XmlElement spineItemNode) { diff --git a/lib/src/schema/opf/epub_manifest_item.dart b/lib/src/schema/opf/epub_manifest_item.dart index 106b21de..157261dc 100644 --- a/lib/src/schema/opf/epub_manifest_item.dart +++ b/lib/src/schema/opf/epub_manifest_item.dart @@ -4,20 +4,24 @@ class EpubManifestItem { String? Id; String? Href; String? MediaType; + String? MediaOverlay; String? RequiredNamespace; String? RequiredModules; String? Fallback; String? FallbackStyle; + String? Properties; @override int get hashCode => hashObjects([ Id.hashCode, Href.hashCode, MediaType.hashCode, + MediaOverlay.hashCode, RequiredNamespace.hashCode, RequiredModules.hashCode, Fallback.hashCode, - FallbackStyle.hashCode + FallbackStyle.hashCode, + Properties.hashCode ]); bool operator ==(other) { @@ -29,13 +33,15 @@ class EpubManifestItem { return Id == otherAs.Id && Href == otherAs.Href && MediaType == otherAs.MediaType && + MediaOverlay == otherAs.MediaOverlay && RequiredNamespace == otherAs.RequiredNamespace && RequiredModules == otherAs.RequiredModules && Fallback == otherAs.Fallback && - FallbackStyle == otherAs.FallbackStyle; + FallbackStyle == otherAs.FallbackStyle && + Properties == otherAs.Properties; } String toString() { - return 'Id: ${Id}, Href = ${Href}, MediaType = ${MediaType}'; + return "Id: ${Id}, Href = ${Href}, MediaType = ${MediaType}, Properties = ${Properties}, MediaOverlay = ${MediaOverlay}"; } } diff --git a/lib/src/schema/opf/epub_metadata_meta.dart b/lib/src/schema/opf/epub_metadata_meta.dart index 0a01618a..38d38c34 100644 --- a/lib/src/schema/opf/epub_metadata_meta.dart +++ b/lib/src/schema/opf/epub_metadata_meta.dart @@ -7,6 +7,7 @@ class EpubMetadataMeta { String? Refines; String? Property; String? Scheme; + Map? Attributes; @override int get hashCode => hashObjects([ diff --git a/lib/src/schema/opf/epub_spine.dart b/lib/src/schema/opf/epub_spine.dart index fa72cf46..167fdbd2 100644 --- a/lib/src/schema/opf/epub_spine.dart +++ b/lib/src/schema/opf/epub_spine.dart @@ -6,11 +6,13 @@ import 'epub_spine_item_ref.dart'; class EpubSpine { String? TableOfContents; List? Items; + bool? ltr; @override int get hashCode { var objs = [] ..add(TableOfContents.hashCode) + ..add(ltr.hashCode) ..addAll(Items!.map((item) => item.hashCode)); return hashObjects(objs); } @@ -22,6 +24,7 @@ class EpubSpine { if (!collections.listsEqual(Items, otherAs.Items)) { return false; } - return TableOfContents == otherAs.TableOfContents; + return ((TableOfContents == otherAs.TableOfContents) && + (ltr == otherAs.ltr)); } } From ddd441eae2e0264352e4354ff569d8d8c58f6e48 Mon Sep 17 00:00:00 2001 From: Serge Shkurko Date: Sat, 23 Oct 2021 07:34:54 +0300 Subject: [PATCH 03/24] Update example --- example/dart_ex/README.md | 2 +- .../dart_ex/{example.dart => bin/main.dart} | 58 +- example/dart_ex/pubspec.yaml | 11 + example/flutter_ex/.gitignore | 9 +- example/flutter_ex/analysis_options.yaml | 29 + example/flutter_ex/android/.gitignore | 13 + example/flutter_ex/android/app/build.gradle | 23 +- .../android/app/src/main/AndroidManifest.xml | 38 +- .../com/example/flutter_ex/MainActivity.java | 13 - .../com/example/flutter_ex/MainActivity.kt | 6 + .../res/drawable-v21/launch_background.xml | 12 + .../app/src/main/res/values-night/styles.xml | 18 + .../app/src/main/res/values/styles.xml | 12 +- example/flutter_ex/android/build.gradle | 10 +- example/flutter_ex/android/gradle.properties | 2 + .../gradle/wrapper/gradle-wrapper.properties | 2 +- example/flutter_ex/android/settings.gradle | 18 +- example/flutter_ex/ios/.gitignore | 34 ++ .../ios/Flutter/AppFrameworkInfo.plist | 2 +- .../ios/Runner.xcodeproj/project.pbxproj | 103 ++-- .../contents.xcworkspacedata | 2 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 4 +- .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/WorkspaceSettings.xcsettings | 4 +- example/flutter_ex/ios/Runner/AppDelegate.h | 6 - example/flutter_ex/ios/Runner/AppDelegate.m | 13 - .../flutter_ex/ios/Runner/AppDelegate.swift | 13 + .../Icon-App-1024x1024@1x.png | Bin 11112 -> 10932 bytes example/flutter_ex/ios/Runner/Info.plist | 2 +- .../ios/Runner/Runner-Bridging-Header.h | 1 + example/flutter_ex/ios/Runner/main.m | 9 - example/flutter_ex/lib/main.dart | 220 ++++--- example/flutter_ex/macos/.gitignore | 7 + .../macos/Flutter/Flutter-Debug.xcconfig | 1 + .../macos/Flutter/Flutter-Release.xcconfig | 1 + .../Flutter/GeneratedPluginRegistrant.swift | 10 + .../macos/Runner.xcodeproj/project.pbxproj | 572 ++++++++++++++++++ .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../xcshareddata/xcschemes/Runner.xcscheme | 89 +++ .../contents.xcworkspacedata | 7 + .../xcshareddata/IDEWorkspaceChecks.plist | 8 + .../flutter_ex/macos/Runner/AppDelegate.swift | 9 + .../AppIcon.appiconset/Contents.json | 68 +++ .../AppIcon.appiconset/app_icon_1024.png | Bin 0 -> 46993 bytes .../AppIcon.appiconset/app_icon_128.png | Bin 0 -> 3276 bytes .../AppIcon.appiconset/app_icon_16.png | Bin 0 -> 1429 bytes .../AppIcon.appiconset/app_icon_256.png | Bin 0 -> 5933 bytes .../AppIcon.appiconset/app_icon_32.png | Bin 0 -> 1243 bytes .../AppIcon.appiconset/app_icon_512.png | Bin 0 -> 14800 bytes .../AppIcon.appiconset/app_icon_64.png | Bin 0 -> 1874 bytes .../macos/Runner/Base.lproj/MainMenu.xib | 339 +++++++++++ .../macos/Runner/Configs/AppInfo.xcconfig | 14 + .../macos/Runner/Configs/Debug.xcconfig | 2 + .../macos/Runner/Configs/Release.xcconfig | 2 + .../macos/Runner/Configs/Warnings.xcconfig | 13 + .../macos/Runner/DebugProfile.entitlements | 14 + example/flutter_ex/macos/Runner/Info.plist | 32 + .../macos/Runner/MainFlutterWindow.swift | 15 + .../macos/Runner/Release.entitlements | 12 + example/flutter_ex/pubspec.yaml | 19 +- example/flutter_ex/test/widget_test.dart | 30 - example/flutter_ex/web/favicon.png | Bin 0 -> 917 bytes example/flutter_ex/web/icons/Icon-192.png | Bin 0 -> 5292 bytes example/flutter_ex/web/icons/Icon-512.png | Bin 0 -> 8252 bytes .../web/icons/Icon-maskable-192.png | Bin 0 -> 5594 bytes .../web/icons/Icon-maskable-512.png | Bin 0 -> 20998 bytes example/flutter_ex/web/index.html | 101 ++++ example/flutter_ex/web/manifest.json | 35 ++ 70 files changed, 1797 insertions(+), 324 deletions(-) rename example/dart_ex/{example.dart => bin/main.dart} (55%) create mode 100644 example/dart_ex/pubspec.yaml create mode 100644 example/flutter_ex/analysis_options.yaml create mode 100644 example/flutter_ex/android/.gitignore delete mode 100644 example/flutter_ex/android/app/src/main/java/com/example/flutter_ex/MainActivity.java create mode 100644 example/flutter_ex/android/app/src/main/kotlin/com/example/flutter_ex/MainActivity.kt create mode 100644 example/flutter_ex/android/app/src/main/res/drawable-v21/launch_background.xml create mode 100644 example/flutter_ex/android/app/src/main/res/values-night/styles.xml create mode 100644 example/flutter_ex/ios/.gitignore create mode 100644 example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings create mode 100644 example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist delete mode 100644 example/flutter_ex/ios/Runner/AppDelegate.h delete mode 100644 example/flutter_ex/ios/Runner/AppDelegate.m create mode 100644 example/flutter_ex/ios/Runner/AppDelegate.swift create mode 100644 example/flutter_ex/ios/Runner/Runner-Bridging-Header.h delete mode 100644 example/flutter_ex/ios/Runner/main.m create mode 100644 example/flutter_ex/macos/.gitignore create mode 100644 example/flutter_ex/macos/Flutter/Flutter-Debug.xcconfig create mode 100644 example/flutter_ex/macos/Flutter/Flutter-Release.xcconfig create mode 100644 example/flutter_ex/macos/Flutter/GeneratedPluginRegistrant.swift create mode 100644 example/flutter_ex/macos/Runner.xcodeproj/project.pbxproj create mode 100644 example/flutter_ex/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/flutter_ex/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme create mode 100644 example/flutter_ex/macos/Runner.xcworkspace/contents.xcworkspacedata create mode 100644 example/flutter_ex/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist create mode 100644 example/flutter_ex/macos/Runner/AppDelegate.swift create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_16.png create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_32.png create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png create mode 100644 example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_64.png create mode 100644 example/flutter_ex/macos/Runner/Base.lproj/MainMenu.xib create mode 100644 example/flutter_ex/macos/Runner/Configs/AppInfo.xcconfig create mode 100644 example/flutter_ex/macos/Runner/Configs/Debug.xcconfig create mode 100644 example/flutter_ex/macos/Runner/Configs/Release.xcconfig create mode 100644 example/flutter_ex/macos/Runner/Configs/Warnings.xcconfig create mode 100644 example/flutter_ex/macos/Runner/DebugProfile.entitlements create mode 100644 example/flutter_ex/macos/Runner/Info.plist create mode 100644 example/flutter_ex/macos/Runner/MainFlutterWindow.swift create mode 100644 example/flutter_ex/macos/Runner/Release.entitlements delete mode 100644 example/flutter_ex/test/widget_test.dart create mode 100644 example/flutter_ex/web/favicon.png create mode 100644 example/flutter_ex/web/icons/Icon-192.png create mode 100644 example/flutter_ex/web/icons/Icon-512.png create mode 100644 example/flutter_ex/web/icons/Icon-maskable-192.png create mode 100644 example/flutter_ex/web/icons/Icon-maskable-512.png create mode 100644 example/flutter_ex/web/index.html create mode 100644 example/flutter_ex/web/manifest.json diff --git a/example/dart_ex/README.md b/example/dart_ex/README.md index 2929c38d..b785e80b 100644 --- a/example/dart_ex/README.md +++ b/example/dart_ex/README.md @@ -5,5 +5,5 @@ An example of using the `epub` library in a "standard" command line application. ## To Run ```shell -dart example.dart +dart bin/main.dart ``` \ No newline at end of file diff --git a/example/dart_ex/example.dart b/example/dart_ex/bin/main.dart similarity index 55% rename from example/dart_ex/example.dart rename to example/dart_ex/bin/main.dart index 21ce4ee1..634763d1 100644 --- a/example/dart_ex/example.dart +++ b/example/dart_ex/bin/main.dart @@ -1,7 +1,7 @@ import 'dart:io' as io; import 'package:path/path.dart' as path; -import 'package:epubx/epub.dart'; +import 'package:epubx/epubx.dart'; main(List args) async { //Get the epub into memory somehow @@ -16,98 +16,98 @@ main(List args) async { // COMMON PROPERTIES // Book's title - String title = epubBook.Title; + String? title = epubBook.Title; // Book's authors (comma separated list) - String author = epubBook.Author; + String? author = epubBook.Author; // Book's authors (list of authors names) - List authors = epubBook.AuthorList; + List? authors = epubBook.AuthorList; // Book's cover image (null if there is no cover) - Image coverImage = epubBook.CoverImage; + Image? coverImage = epubBook.CoverImage; // CHAPTERS // Enumerating chapters - epubBook.Chapters.forEach((EpubChapter chapter) { + epubBook.Chapters!.forEach((EpubChapter chapter) { // Title of chapter - String chapterTitle = chapter.Title; + String chapterTitle = chapter.Title!; // HTML content of current chapter - String chapterHtmlContent = chapter.HtmlContent; + String chapterHtmlContent = chapter.HtmlContent!; // Nested chapters - List subChapters = chapter.SubChapters; + List subChapters = chapter.SubChapters!; }); // CONTENT // Book's content (HTML files, stlylesheets, images, fonts, etc.) - EpubContent bookContent = epubBook.Content; + EpubContent bookContent = epubBook.Content!; // IMAGES // All images in the book (file name is the key) - Map images = bookContent.Images; + Map images = bookContent.Images!; - EpubByteContentFile firstImage = + EpubByteContentFile? firstImage = images.isNotEmpty ? images.values.first : null; // Content type (e.g. EpubContentType.IMAGE_JPEG, EpubContentType.IMAGE_PNG) - EpubContentType contentType = firstImage?.ContentType; + EpubContentType contentType = firstImage!.ContentType!; // MIME type (e.g. "image/jpeg", "image/png") - String mimeContentType = firstImage?.ContentMimeType; + String mimeContentType = firstImage.ContentMimeType!; // HTML & CSS // All XHTML files in the book (file name is the key) - Map htmlFiles = bookContent.Html; + Map htmlFiles = bookContent.Html!; // All CSS files in the book (file name is the key) - Map cssFiles = bookContent.Css; + Map cssFiles = bookContent.Css!; // Entire HTML content of the book htmlFiles.values.forEach((EpubTextContentFile htmlFile) { - String htmlContent = htmlFile.Content; + String htmlContent = htmlFile.Content!; }); // All CSS content in the book cssFiles.values.forEach((EpubTextContentFile cssFile) { - String cssContent = cssFile.Content; + String cssContent = cssFile.Content!; }); // OTHER CONTENT // All fonts in the book (file name is the key) - Map fonts = bookContent.Fonts; + Map fonts = bookContent.Fonts!; // All files in the book (including HTML, CSS, images, fonts, and other types of files) - Map allFiles = bookContent.AllFiles; + Map allFiles = bookContent.AllFiles!; // ACCESSING RAW SCHEMA INFORMATION // EPUB OPF data - EpubPackage package = epubBook.Schema.Package; + EpubPackage package = epubBook.Schema!.Package!; // Enumerating book's contributors - package.Metadata.Contributors.forEach((contributor) { - String contributorName = contributor.Contributor; - String contributorRole = contributor.Role; + package.Metadata!.Contributors!.forEach((contributor) { + String contributorName = contributor.Contributor!; + String contributorRole = contributor.Role!; }); // EPUB NCX data - EpubNavigation navigation = epubBook.Schema.Navigation; + EpubNavigation navigation = epubBook.Schema!.Navigation!; // Enumerating NCX metadata - navigation.Head.Metadata.forEach((meta) { - String metadataItemName = meta.Name; - String metadataItemContent = meta.Content; + navigation.Head!.Metadata!.forEach((meta) { + String metadataItemName = meta.Name!; + String metadataItemContent = meta.Content!; }); // Write the Book var written = EpubWriter.writeBook(epubBook); // Read the book into a new object! - var newBook = await EpubReader.readBook(written); + var newBook = await EpubReader.readBook(written!); } diff --git a/example/dart_ex/pubspec.yaml b/example/dart_ex/pubspec.yaml new file mode 100644 index 00000000..7a6837b6 --- /dev/null +++ b/example/dart_ex/pubspec.yaml @@ -0,0 +1,11 @@ +name: dart_ex +description: Example dart project +version: 1.0.0+1 + +environment: + sdk: '>=2.12.0 <3.0.0' + +dependencies: + # Epub + epubx: + path: ../../ diff --git a/example/flutter_ex/.gitignore b/example/flutter_ex/.gitignore index 07488ba6..3132dc5f 100644 --- a/example/flutter_ex/.gitignore +++ b/example/flutter_ex/.gitignore @@ -15,8 +15,10 @@ *.iws .idea/ -# Visual Studio Code related -.vscode/ +# The .vscode folder contains launch configuration and tasks you configure in +# VS Code which you may wish to be included in version control, so this line +# is commented out by default. +#.vscode/ # Flutter/Dart/Pub related **/doc/api/ @@ -25,7 +27,7 @@ .packages .pub-cache/ .pub/ -/build/ +build/ # Android related **/android/**/gradle-wrapper.jar @@ -59,6 +61,7 @@ **/ios/Flutter/app.flx **/ios/Flutter/app.zip **/ios/Flutter/flutter_assets/ +**/ios/Flutter/flutter_export_environment.sh **/ios/ServiceDefinitions.json **/ios/Runner/GeneratedPluginRegistrant.* diff --git a/example/flutter_ex/analysis_options.yaml b/example/flutter_ex/analysis_options.yaml new file mode 100644 index 00000000..61b6c4de --- /dev/null +++ b/example/flutter_ex/analysis_options.yaml @@ -0,0 +1,29 @@ +# This file configures the analyzer, which statically analyzes Dart code to +# check for errors, warnings, and lints. +# +# The issues identified by the analyzer are surfaced in the UI of Dart-enabled +# IDEs (https://dart.dev/tools#ides-and-editors). The analyzer can also be +# invoked from the command line by running `flutter analyze`. + +# The following line activates a set of recommended lints for Flutter apps, +# packages, and plugins designed to encourage good coding practices. +include: package:flutter_lints/flutter.yaml + +linter: + # The lint rules applied to this project can be customized in the + # section below to disable rules from the `package:flutter_lints/flutter.yaml` + # included above or to enable additional rules. A list of all available lints + # and their documentation is published at + # https://dart-lang.github.io/linter/lints/index.html. + # + # Instead of disabling a lint rule for the entire project in the + # section below, it can also be suppressed for a single line of code + # or a specific dart file by using the `// ignore: name_of_lint` and + # `// ignore_for_file: name_of_lint` syntax on the line or in the file + # producing the lint. + rules: + # avoid_print: false # Uncomment to disable the `avoid_print` rule + # prefer_single_quotes: true # Uncomment to enable the `prefer_single_quotes` rule + +# Additional information about this file can be found at +# https://dart.dev/guides/language/analysis-options diff --git a/example/flutter_ex/android/.gitignore b/example/flutter_ex/android/.gitignore new file mode 100644 index 00000000..6f568019 --- /dev/null +++ b/example/flutter_ex/android/.gitignore @@ -0,0 +1,13 @@ +gradle-wrapper.jar +/.gradle +/captures/ +/gradlew +/gradlew.bat +/local.properties +GeneratedPluginRegistrant.java + +# Remember to never publicly share your keystore. +# See https://flutter.dev/docs/deployment/android#reference-the-keystore-from-the-app +key.properties +**/*.keystore +**/*.jks diff --git a/example/flutter_ex/android/app/build.gradle b/example/flutter_ex/android/app/build.gradle index b537edde..a19fe6c5 100644 --- a/example/flutter_ex/android/app/build.gradle +++ b/example/flutter_ex/android/app/build.gradle @@ -22,23 +22,32 @@ if (flutterVersionName == null) { } apply plugin: 'com.android.application' +apply plugin: 'kotlin-android' apply from: "$flutterRoot/packages/flutter_tools/gradle/flutter.gradle" android { - compileSdkVersion 28 + compileSdkVersion 30 - lintOptions { - disable 'InvalidPackage' + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + + kotlinOptions { + jvmTarget = '1.8' + } + + sourceSets { + main.java.srcDirs += 'src/main/kotlin' } defaultConfig { // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html). applicationId "com.example.flutter_ex" minSdkVersion 16 - targetSdkVersion 28 + targetSdkVersion 30 versionCode flutterVersionCode.toInteger() versionName flutterVersionName - testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" } buildTypes { @@ -55,7 +64,5 @@ flutter { } dependencies { - testImplementation 'junit:junit:4.12' - androidTestImplementation 'com.android.support.test:runner:1.0.2' - androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2' + implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" } diff --git a/example/flutter_ex/android/app/src/main/AndroidManifest.xml b/example/flutter_ex/android/app/src/main/AndroidManifest.xml index ed56d9e3..d39d75c0 100644 --- a/example/flutter_ex/android/app/src/main/AndroidManifest.xml +++ b/example/flutter_ex/android/app/src/main/AndroidManifest.xml @@ -1,33 +1,41 @@ - - - - + + android:name="io.flutter.embedding.android.NormalTheme" + android:resource="@style/NormalTheme" + /> + + + + diff --git a/example/flutter_ex/android/app/src/main/java/com/example/flutter_ex/MainActivity.java b/example/flutter_ex/android/app/src/main/java/com/example/flutter_ex/MainActivity.java deleted file mode 100644 index c800c3b5..00000000 --- a/example/flutter_ex/android/app/src/main/java/com/example/flutter_ex/MainActivity.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.example.flutter_ex; - -import android.os.Bundle; -import io.flutter.app.FlutterActivity; -import io.flutter.plugins.GeneratedPluginRegistrant; - -public class MainActivity extends FlutterActivity { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - GeneratedPluginRegistrant.registerWith(this); - } -} diff --git a/example/flutter_ex/android/app/src/main/kotlin/com/example/flutter_ex/MainActivity.kt b/example/flutter_ex/android/app/src/main/kotlin/com/example/flutter_ex/MainActivity.kt new file mode 100644 index 00000000..d1b63010 --- /dev/null +++ b/example/flutter_ex/android/app/src/main/kotlin/com/example/flutter_ex/MainActivity.kt @@ -0,0 +1,6 @@ +package com.example.flutter_ex + +import io.flutter.embedding.android.FlutterActivity + +class MainActivity: FlutterActivity() { +} diff --git a/example/flutter_ex/android/app/src/main/res/drawable-v21/launch_background.xml b/example/flutter_ex/android/app/src/main/res/drawable-v21/launch_background.xml new file mode 100644 index 00000000..f74085f3 --- /dev/null +++ b/example/flutter_ex/android/app/src/main/res/drawable-v21/launch_background.xml @@ -0,0 +1,12 @@ + + + + + + + + diff --git a/example/flutter_ex/android/app/src/main/res/values-night/styles.xml b/example/flutter_ex/android/app/src/main/res/values-night/styles.xml new file mode 100644 index 00000000..449a9f93 --- /dev/null +++ b/example/flutter_ex/android/app/src/main/res/values-night/styles.xml @@ -0,0 +1,18 @@ + + + + + + + diff --git a/example/flutter_ex/android/app/src/main/res/values/styles.xml b/example/flutter_ex/android/app/src/main/res/values/styles.xml index 00fa4417..d74aa35c 100644 --- a/example/flutter_ex/android/app/src/main/res/values/styles.xml +++ b/example/flutter_ex/android/app/src/main/res/values/styles.xml @@ -1,8 +1,18 @@ - + + diff --git a/example/flutter_ex/android/build.gradle b/example/flutter_ex/android/build.gradle index bb8a3038..ed45c658 100644 --- a/example/flutter_ex/android/build.gradle +++ b/example/flutter_ex/android/build.gradle @@ -1,26 +1,26 @@ buildscript { + ext.kotlin_version = '1.3.50' repositories { google() - jcenter() + mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:3.2.1' + classpath 'com.android.tools.build:gradle:4.1.0' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version" } } allprojects { repositories { google() - jcenter() + mavenCentral() } } rootProject.buildDir = '../build' subprojects { project.buildDir = "${rootProject.buildDir}/${project.name}" -} -subprojects { project.evaluationDependsOn(':app') } diff --git a/example/flutter_ex/android/gradle.properties b/example/flutter_ex/android/gradle.properties index 8bd86f68..94adc3a3 100644 --- a/example/flutter_ex/android/gradle.properties +++ b/example/flutter_ex/android/gradle.properties @@ -1 +1,3 @@ org.gradle.jvmargs=-Xmx1536M +android.useAndroidX=true +android.enableJetifier=true diff --git a/example/flutter_ex/android/gradle/wrapper/gradle-wrapper.properties b/example/flutter_ex/android/gradle/wrapper/gradle-wrapper.properties index 2819f022..bc6a58af 100644 --- a/example/flutter_ex/android/gradle/wrapper/gradle-wrapper.properties +++ b/example/flutter_ex/android/gradle/wrapper/gradle-wrapper.properties @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-all.zip diff --git a/example/flutter_ex/android/settings.gradle b/example/flutter_ex/android/settings.gradle index 5a2f14fb..44e62bcf 100644 --- a/example/flutter_ex/android/settings.gradle +++ b/example/flutter_ex/android/settings.gradle @@ -1,15 +1,11 @@ include ':app' -def flutterProjectRoot = rootProject.projectDir.parentFile.toPath() +def localPropertiesFile = new File(rootProject.projectDir, "local.properties") +def properties = new Properties() -def plugins = new Properties() -def pluginsFile = new File(flutterProjectRoot.toFile(), '.flutter-plugins') -if (pluginsFile.exists()) { - pluginsFile.withReader('UTF-8') { reader -> plugins.load(reader) } -} +assert localPropertiesFile.exists() +localPropertiesFile.withReader("UTF-8") { reader -> properties.load(reader) } -plugins.each { name, path -> - def pluginDirectory = flutterProjectRoot.resolve(path).resolve('android').toFile() - include ":$name" - project(":$name").projectDir = pluginDirectory -} +def flutterSdkPath = properties.getProperty("flutter.sdk") +assert flutterSdkPath != null, "flutter.sdk not set in local.properties" +apply from: "$flutterSdkPath/packages/flutter_tools/gradle/app_plugin_loader.gradle" diff --git a/example/flutter_ex/ios/.gitignore b/example/flutter_ex/ios/.gitignore new file mode 100644 index 00000000..7a7f9873 --- /dev/null +++ b/example/flutter_ex/ios/.gitignore @@ -0,0 +1,34 @@ +**/dgph +*.mode1v3 +*.mode2v3 +*.moved-aside +*.pbxuser +*.perspectivev3 +**/*sync/ +.sconsign.dblite +.tags* +**/.vagrant/ +**/DerivedData/ +Icon? +**/Pods/ +**/.symlinks/ +profile +xcuserdata +**/.generated/ +Flutter/App.framework +Flutter/Flutter.framework +Flutter/Flutter.podspec +Flutter/Generated.xcconfig +Flutter/ephemeral/ +Flutter/app.flx +Flutter/app.zip +Flutter/flutter_assets/ +Flutter/flutter_export_environment.sh +ServiceDefinitions.json +Runner/GeneratedPluginRegistrant.* + +# Exceptions to above rules. +!default.mode1v3 +!default.mode2v3 +!default.pbxuser +!default.perspectivev3 diff --git a/example/flutter_ex/ios/Flutter/AppFrameworkInfo.plist b/example/flutter_ex/ios/Flutter/AppFrameworkInfo.plist index 9367d483..8d4492f9 100644 --- a/example/flutter_ex/ios/Flutter/AppFrameworkInfo.plist +++ b/example/flutter_ex/ios/Flutter/AppFrameworkInfo.plist @@ -21,6 +21,6 @@ CFBundleVersion 1.0 MinimumOSVersion - 8.0 + 9.0 diff --git a/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj b/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj index aac5bedd..2b1442e3 100644 --- a/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj +++ b/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj @@ -9,13 +9,7 @@ /* Begin PBXBuildFile section */ 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; }; 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; }; - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; }; - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 3B80C3931E831B6300D905FE /* App.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; }; - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */ = {isa = PBXBuildFile; fileRef = 9740EEBA1CF902C7004384FC /* Flutter.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; }; - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */ = {isa = PBXBuildFile; fileRef = 9740EEB21CF90195004384FC /* Debug.xcconfig */; }; - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */; }; - 97C146F31CF9000F007C117D /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 97C146F21CF9000F007C117D /* main.m */; }; + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; }; 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; }; 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FD1CF9000F007C117D /* Assets.xcassets */; }; 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */; }; @@ -28,8 +22,6 @@ dstPath = ""; dstSubfolderSpec = 10; files = ( - 3B80C3951E831B6300D905FE /* App.framework in Embed Frameworks */, - 9705A1C71CF904A300538489 /* Flutter.framework in Embed Frameworks */, ); name = "Embed Frameworks"; runOnlyForDeploymentPostprocessing = 0; @@ -40,15 +32,12 @@ 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = ""; }; 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = ""; }; 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = ""; }; - 3B80C3931E831B6300D905FE /* App.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = App.framework; path = Flutter/App.framework; sourceTree = ""; }; + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = ""; }; + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = ""; }; - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppDelegate.h; sourceTree = ""; }; - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppDelegate.m; sourceTree = ""; }; 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = ""; }; 9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = ""; }; - 9740EEBA1CF902C7004384FC /* Flutter.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Flutter.framework; path = Flutter/Flutter.framework; sourceTree = ""; }; 97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; }; - 97C146F21CF9000F007C117D /* main.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = main.m; sourceTree = ""; }; 97C146FB1CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/Main.storyboard; sourceTree = ""; }; 97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = ""; }; @@ -60,8 +49,6 @@ isa = PBXFrameworksBuildPhase; buildActionMask = 2147483647; files = ( - 9705A1C61CF904A100538489 /* Flutter.framework in Frameworks */, - 3B80C3941E831B6300D905FE /* App.framework in Frameworks */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -71,9 +58,7 @@ 9740EEB11CF90186004384FC /* Flutter */ = { isa = PBXGroup; children = ( - 3B80C3931E831B6300D905FE /* App.framework */, 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */, - 9740EEBA1CF902C7004384FC /* Flutter.framework */, 9740EEB21CF90195004384FC /* Debug.xcconfig */, 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, 9740EEB31CF90195004384FC /* Generated.xcconfig */, @@ -87,7 +72,6 @@ 9740EEB11CF90186004384FC /* Flutter */, 97C146F01CF9000F007C117D /* Runner */, 97C146EF1CF9000F007C117D /* Products */, - CF3B75C9A7D2FA2A4C99F110 /* Frameworks */, ); sourceTree = ""; }; @@ -102,27 +86,18 @@ 97C146F01CF9000F007C117D /* Runner */ = { isa = PBXGroup; children = ( - 7AFFD8ED1D35381100E5BB4D /* AppDelegate.h */, - 7AFFD8EE1D35381100E5BB4D /* AppDelegate.m */, 97C146FA1CF9000F007C117D /* Main.storyboard */, 97C146FD1CF9000F007C117D /* Assets.xcassets */, 97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */, 97C147021CF9000F007C117D /* Info.plist */, - 97C146F11CF9000F007C117D /* Supporting Files */, 1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */, 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */, + 74858FAE1ED2DC5600515810 /* AppDelegate.swift */, + 74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */, ); path = Runner; sourceTree = ""; }; - 97C146F11CF9000F007C117D /* Supporting Files */ = { - isa = PBXGroup; - children = ( - 97C146F21CF9000F007C117D /* main.m */, - ); - name = "Supporting Files"; - sourceTree = ""; - }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -152,17 +127,18 @@ 97C146E61CF9000F007C117D /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0910; - ORGANIZATIONNAME = "The Chromium Authors"; + LastUpgradeCheck = 1020; + ORGANIZATIONNAME = ""; TargetAttributes = { 97C146ED1CF9000F007C117D = { CreatedOnToolsVersion = 7.3.1; + LastSwiftMigration = 1100; }; }; }; buildConfigurationList = 97C146E91CF9000F007C117D /* Build configuration list for PBXProject "Runner" */; - compatibilityVersion = "Xcode 3.2"; - developmentRegion = English; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( en, @@ -185,7 +161,6 @@ files = ( 97C147011CF9000F007C117D /* LaunchScreen.storyboard in Resources */, 3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */, - 9740EEB41CF90195004384FC /* Debug.xcconfig in Resources */, 97C146FE1CF9000F007C117D /* Assets.xcassets in Resources */, 97C146FC1CF9000F007C117D /* Main.storyboard in Resources */, ); @@ -206,7 +181,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" thin"; + shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin"; }; 9740EEB61CF901F6004384FC /* Run Script */ = { isa = PBXShellScriptBuildPhase; @@ -229,8 +204,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( - 978B8F6F1D3862AE00F588F7 /* AppDelegate.m in Sources */, - 97C146F31CF9000F007C117D /* main.m in Sources */, + 74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */, 1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */, ); runOnlyForDeploymentPostprocessing = 0; @@ -259,7 +233,6 @@ /* Begin XCBuildConfiguration section */ 249021D3217E4FDB00AE95B9 /* Profile */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -271,12 +244,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -297,9 +272,10 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -310,28 +286,21 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; - DEVELOPMENT_TEAM = S8QB4VV633; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterEx; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Profile; }; 97C147031CF9000F007C117D /* Debug */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -343,12 +312,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -375,7 +346,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -385,7 +356,6 @@ }; 97C147041CF9000F007C117D /* Release */ = { isa = XCBuildConfiguration; - baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; CLANG_ANALYZER_NONNULL = YES; @@ -397,12 +367,14 @@ CLANG_WARN_BOOL_CONVERSION = YES; CLANG_WARN_COMMA = YES; CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; @@ -423,9 +395,11 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 8.0; + IPHONEOS_DEPLOYMENT_TARGET = 9.0; MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; + SUPPORTED_PLATFORMS = iphoneos; + SWIFT_OPTIMIZATION_LEVEL = "-Owholemodule"; TARGETED_DEVICE_FAMILY = "1,2"; VALIDATE_PRODUCT = YES; }; @@ -436,20 +410,16 @@ baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterEx; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Debug; @@ -459,20 +429,15 @@ baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; buildSettings = { ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)"; ENABLE_BITCODE = NO; - FRAMEWORK_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); INFOPLIST_FILE = Runner/Info.plist; LD_RUNPATH_SEARCH_PATHS = "$(inherited) @executable_path/Frameworks"; - LIBRARY_SEARCH_PATHS = ( - "$(inherited)", - "$(PROJECT_DIR)/Flutter", - ); PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterEx; PRODUCT_NAME = "$(TARGET_NAME)"; + SWIFT_OBJC_BRIDGING_HEADER = "Runner/Runner-Bridging-Header.h"; + SWIFT_VERSION = 5.0; VERSIONING_SYSTEM = "apple-generic"; }; name = Release; diff --git a/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata index 1d526a16..919434a6 100644 --- a/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata +++ b/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -2,6 +2,6 @@ + location = "self:"> diff --git a/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings new file mode 100644 index 00000000..f9b0d7c5 --- /dev/null +++ b/example/flutter_ex/ios/Runner.xcodeproj/project.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -0,0 +1,8 @@ + + + + + PreviewsEnabled + + + diff --git a/example/flutter_ex/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/flutter_ex/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme index 786d6aad..a28140cf 100644 --- a/example/flutter_ex/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme +++ b/example/flutter_ex/ios/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -1,6 +1,6 @@ @@ -46,7 +45,6 @@ buildConfiguration = "Debug" selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB" selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB" - language = "" launchStyle = "0" useCustomWorkingDirectory = "NO" ignoresPersistentStateOnLaunch = "NO" diff --git a/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings b/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings index 949b6789..f9b0d7c5 100644 --- a/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings +++ b/example/flutter_ex/ios/Runner.xcworkspace/xcshareddata/WorkspaceSettings.xcsettings @@ -2,7 +2,7 @@ - BuildSystemType - Original + PreviewsEnabled + diff --git a/example/flutter_ex/ios/Runner/AppDelegate.h b/example/flutter_ex/ios/Runner/AppDelegate.h deleted file mode 100644 index 36e21bbf..00000000 --- a/example/flutter_ex/ios/Runner/AppDelegate.h +++ /dev/null @@ -1,6 +0,0 @@ -#import -#import - -@interface AppDelegate : FlutterAppDelegate - -@end diff --git a/example/flutter_ex/ios/Runner/AppDelegate.m b/example/flutter_ex/ios/Runner/AppDelegate.m deleted file mode 100644 index 59a72e90..00000000 --- a/example/flutter_ex/ios/Runner/AppDelegate.m +++ /dev/null @@ -1,13 +0,0 @@ -#include "AppDelegate.h" -#include "GeneratedPluginRegistrant.h" - -@implementation AppDelegate - -- (BOOL)application:(UIApplication *)application - didFinishLaunchingWithOptions:(NSDictionary *)launchOptions { - [GeneratedPluginRegistrant registerWithRegistry:self]; - // Override point for customization after application launch. - return [super application:application didFinishLaunchingWithOptions:launchOptions]; -} - -@end diff --git a/example/flutter_ex/ios/Runner/AppDelegate.swift b/example/flutter_ex/ios/Runner/AppDelegate.swift new file mode 100644 index 00000000..70693e4a --- /dev/null +++ b/example/flutter_ex/ios/Runner/AppDelegate.swift @@ -0,0 +1,13 @@ +import UIKit +import Flutter + +@UIApplicationMain +@objc class AppDelegate: FlutterAppDelegate { + override func application( + _ application: UIApplication, + didFinishLaunchingWithOptions launchOptions: [UIApplication.LaunchOptionsKey: Any]? + ) -> Bool { + GeneratedPluginRegistrant.register(with: self) + return super.application(application, didFinishLaunchingWithOptions: launchOptions) + } +} diff --git a/example/flutter_ex/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png b/example/flutter_ex/ios/Runner/Assets.xcassets/AppIcon.appiconset/Icon-App-1024x1024@1x.png index 3d43d11e66f4de3da27ed045ca4fe38ad8b48094..dc9ada4725e9b0ddb1deab583e5b5102493aa332 100644 GIT binary patch literal 10932 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 P-1+_A+?hGkL;m(J7kc&K diff --git a/example/flutter_ex/ios/Runner/Info.plist b/example/flutter_ex/ios/Runner/Info.plist index b0b270b8..e6ab1882 100644 --- a/example/flutter_ex/ios/Runner/Info.plist +++ b/example/flutter_ex/ios/Runner/Info.plist @@ -3,7 +3,7 @@ CFBundleDevelopmentRegion - en + $(DEVELOPMENT_LANGUAGE) CFBundleExecutable $(EXECUTABLE_NAME) CFBundleIdentifier diff --git a/example/flutter_ex/ios/Runner/Runner-Bridging-Header.h b/example/flutter_ex/ios/Runner/Runner-Bridging-Header.h new file mode 100644 index 00000000..308a2a56 --- /dev/null +++ b/example/flutter_ex/ios/Runner/Runner-Bridging-Header.h @@ -0,0 +1 @@ +#import "GeneratedPluginRegistrant.h" diff --git a/example/flutter_ex/ios/Runner/main.m b/example/flutter_ex/ios/Runner/main.m deleted file mode 100644 index dff6597e..00000000 --- a/example/flutter_ex/ios/Runner/main.m +++ /dev/null @@ -1,9 +0,0 @@ -#import -#import -#import "AppDelegate.h" - -int main(int argc, char* argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, NSStringFromClass([AppDelegate class])); - } -} diff --git a/example/flutter_ex/lib/main.dart b/example/flutter_ex/lib/main.dart index afbbbbe2..b3ae1ee7 100644 --- a/example/flutter_ex/lib/main.dart +++ b/example/flutter_ex/lib/main.dart @@ -1,19 +1,19 @@ +import 'dart:typed_data'; + import 'package:flutter/material.dart'; import 'package:http/http.dart' as http; -import 'package:epubx/epub.dart' as epub; +import 'package:epubx/epubx.dart' as epub; import 'package:image/image.dart' as image; void main() => runApp(EpubWidget()); class EpubWidget extends StatefulWidget { @override - State createState() { - return new EpubState(); - } + State createState() => EpubState(); } class EpubState extends State { - Future book; + Future? book; final _urlController = TextEditingController(); @@ -23,84 +23,125 @@ class EpubState extends State { }); } + void fetchBookPresets(String link) { + setState(() { + book = fetchBook(link); + }); + } + @override Widget build(BuildContext context) { return MaterialApp( - debugShowCheckedModeBanner: false, - title: "Fetch Epub Example", - home: new Material( - child: new Container( - padding: const EdgeInsets.all(30.0), - color: Colors.white, - child: new Container( - child: new Center( - child: new ListView(children: [ - new Padding(padding: EdgeInsets.only(top: 70.0)), - new Text( - 'Epub Inspector', - style: new TextStyle(fontSize: 25.0), - ), - new Padding(padding: EdgeInsets.only(top: 50.0)), - new Text( - 'Enter the Url of an Epub to view some of it\'s metadata.', - style: new TextStyle(fontSize: 18.0), - textAlign: TextAlign.center, + title: "Fetch Epub Example", + theme: ThemeData.light(), + darkTheme: ThemeData.dark(), + home: SingleChildScrollView( + padding: const EdgeInsets.all(32.0), + child: Material( + child: Padding( + padding: const EdgeInsets.all(16.0), + child: Column( + children: [ + Padding(padding: EdgeInsets.only(top: 16.0)), + Text( + 'Epub Inspector', + style: TextStyle(fontSize: 25.0), + ), + Padding(padding: EdgeInsets.only(top: 50.0)), + Text( + 'Enter the Url of an Epub to view some of it\'s metadata.', + style: TextStyle(fontSize: 18.0), + textAlign: TextAlign.center, + ), + Padding(padding: EdgeInsets.only(top: 20.0)), + TextFormField( + decoration: InputDecoration( + labelText: "Enter Url", + fillColor: Colors.white, + border: OutlineInputBorder( + borderRadius: BorderRadius.circular(25.0), + borderSide: BorderSide(), ), - new Padding(padding: EdgeInsets.only(top: 20.0)), - new TextFormField( - decoration: new InputDecoration( - labelText: "Enter Url", - fillColor: Colors.white, - border: new OutlineInputBorder( - borderRadius: new BorderRadius.circular(25.0), - borderSide: new BorderSide(), - ), - ), - validator: (val) { - if (val.length == 0) { - return "Url cannot be empty"; - } else { - return null; - } - }, - controller: _urlController, - keyboardType: TextInputType.url, - style: new TextStyle( - fontFamily: "Poppins", - ), - ), - new Padding( - padding: EdgeInsets.only(top: 20.0), - ), - new RaisedButton( - padding: const EdgeInsets.all(8.0), - textColor: Colors.white, - color: Colors.blue, - onPressed: fetchBookButton, - child: new Text("Inspect Book"), - ), - new Padding(padding: EdgeInsets.only(top: 25.0)), - Center( - child: FutureBuilder( - future: book, - builder: (context, snapshot) { - if (snapshot.hasData) { - return new Material( - color: Colors.white, - child: buildEpubWidget(snapshot.data)); - } else if (snapshot.hasError) { - return Text("${snapshot.error}"); - } - // By default, show a loading spinner - // return CircularProgressIndicator(); + ), + validator: (val) { + if (val!.length == 0) { + return "Url cannot be empty"; + } else { + return null; + } + }, + controller: _urlController, + keyboardType: TextInputType.url, + style: TextStyle( + fontFamily: "Poppins", + ), + ), + Padding( + padding: EdgeInsets.only(top: 20.0), + ), + ElevatedButton( + onPressed: fetchBookButton, + style: ButtonStyle( + padding: MaterialStateProperty.all( + EdgeInsets.all(8.0)), + textStyle: MaterialStateProperty.all(TextStyle( + color: Colors.white, + )), + backgroundColor: + MaterialStateProperty.all(Colors.blue), + ), + child: Text("Inspect Book"), + ), + Padding(padding: EdgeInsets.only(top: 25.0)), + Text( + 'Or select available links:', + style: TextStyle(fontSize: 18.0), + textAlign: TextAlign.center, + ), + Padding(padding: EdgeInsets.only(top: 12.0)), + Column( + children: [ + ...[ + 'https://filesamples.com/samples/ebook/epub/Around%20the%20World%20in%2028%20Languages.epub', + 'https://filesamples.com/samples/ebook/epub/Sway.epub', + 'https://filesamples.com/samples/ebook/epub/Alices%20Adventures%20in%20Wonderland.epub', + 'https://filesamples.com/samples/ebook/epub/sample1.epub', + ] + .map((link) => TextButton( + child: Text(link), + onPressed: () => fetchBookPresets(link), + )) + .cast() + .toList(), + ], + ), + Padding(padding: EdgeInsets.only(top: 25.0)), + Center( + child: FutureBuilder( + future: book, + builder: (context, snapshot) { + if (snapshot.hasData) { + return Material( + color: Colors.white, + child: buildEpubWidget(snapshot.data!), + ); + } else if (snapshot.hasError) { + return Text("${snapshot.error}"); + } + // By default, show a loading spinner + // return CircularProgressIndicator(); - // By default, show just empty. - return Container(); - }, - ), - ), - ])), - )))); + // By default, show just empty. + return Container(); + }, + ), + ), + ], + ), + ), + ), + ), + ); } } @@ -108,17 +149,17 @@ Widget buildEpubWidget(epub.EpubBookRef book) { var chapters = book.getChapters(); var cover = book.readCover(); return Container( - child: new Column( + child: Column( children: [ Text( "Title", style: TextStyle(fontSize: 20.0), ), Text( - book.Title, + book.Title!, style: TextStyle(fontSize: 15.0), ), - new Padding( + Padding( padding: EdgeInsets.only(top: 15.0), ), Text( @@ -126,10 +167,10 @@ Widget buildEpubWidget(epub.EpubBookRef book) { style: TextStyle(fontSize: 20.0), ), Text( - book.Author, + book.Author!, style: TextStyle(fontSize: 15.0), ), - new Padding( + Padding( padding: EdgeInsets.only(top: 15.0), ), FutureBuilder>( @@ -140,7 +181,7 @@ Widget buildEpubWidget(epub.EpubBookRef book) { children: [ Text("Chapters", style: TextStyle(fontSize: 20.0)), Text( - snapshot.data.length.toString(), + snapshot.data!.length.toString(), style: TextStyle(fontSize: 15.0), ) ], @@ -150,17 +191,18 @@ Widget buildEpubWidget(epub.EpubBookRef book) { } return Container(); }), - new Padding( + Padding( padding: EdgeInsets.only(top: 15.0), ), - FutureBuilder( + FutureBuilder( future: cover, - builder: (context, snapshot) { + builder: (context, AsyncSnapshot snapshot) { if (snapshot.hasData) { return Column( children: [ Text("Cover", style: TextStyle(fontSize: 20.0)), - Image.memory(image.encodePng(snapshot.data)), + Image.memory( + Uint8List.fromList(image.encodePng(snapshot.data!))), ], ); } else if (snapshot.hasError) { @@ -179,7 +221,7 @@ Widget buildEpubWidget(epub.EpubBookRef book) { // https://www.gutenberg.org/ebooks/19002.epub.images Future fetchBook(String url) async { // Hard coded to Alice Adventures In Wonderland in Project Gutenberb - final response = await http.get(url); + final response = await http.get(Uri.parse(url)); if (response.statusCode == 200) { // If server returns an OK response, parse the EPUB diff --git a/example/flutter_ex/macos/.gitignore b/example/flutter_ex/macos/.gitignore new file mode 100644 index 00000000..746adbb6 --- /dev/null +++ b/example/flutter_ex/macos/.gitignore @@ -0,0 +1,7 @@ +# Flutter-related +**/Flutter/ephemeral/ +**/Pods/ + +# Xcode-related +**/dgph +**/xcuserdata/ diff --git a/example/flutter_ex/macos/Flutter/Flutter-Debug.xcconfig b/example/flutter_ex/macos/Flutter/Flutter-Debug.xcconfig new file mode 100644 index 00000000..c2efd0b6 --- /dev/null +++ b/example/flutter_ex/macos/Flutter/Flutter-Debug.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/example/flutter_ex/macos/Flutter/Flutter-Release.xcconfig b/example/flutter_ex/macos/Flutter/Flutter-Release.xcconfig new file mode 100644 index 00000000..c2efd0b6 --- /dev/null +++ b/example/flutter_ex/macos/Flutter/Flutter-Release.xcconfig @@ -0,0 +1 @@ +#include "ephemeral/Flutter-Generated.xcconfig" diff --git a/example/flutter_ex/macos/Flutter/GeneratedPluginRegistrant.swift b/example/flutter_ex/macos/Flutter/GeneratedPluginRegistrant.swift new file mode 100644 index 00000000..cccf817a --- /dev/null +++ b/example/flutter_ex/macos/Flutter/GeneratedPluginRegistrant.swift @@ -0,0 +1,10 @@ +// +// Generated file. Do not edit. +// + +import FlutterMacOS +import Foundation + + +func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) { +} diff --git a/example/flutter_ex/macos/Runner.xcodeproj/project.pbxproj b/example/flutter_ex/macos/Runner.xcodeproj/project.pbxproj new file mode 100644 index 00000000..2729429f --- /dev/null +++ b/example/flutter_ex/macos/Runner.xcodeproj/project.pbxproj @@ -0,0 +1,572 @@ +// !$*UTF8*$! +{ + archiveVersion = 1; + classes = { + }; + objectVersion = 51; + objects = { + +/* Begin PBXAggregateTarget section */ + 33CC111A2044C6BA0003C045 /* Flutter Assemble */ = { + isa = PBXAggregateTarget; + buildConfigurationList = 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */; + buildPhases = ( + 33CC111E2044C6BF0003C045 /* ShellScript */, + ); + dependencies = ( + ); + name = "Flutter Assemble"; + productName = FLX; + }; +/* End PBXAggregateTarget section */ + +/* Begin PBXBuildFile section */ + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */ = {isa = PBXBuildFile; fileRef = 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */; }; + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC10F02044A3C60003C045 /* AppDelegate.swift */; }; + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; }; + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; }; + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; }; +/* End PBXBuildFile section */ + +/* Begin PBXContainerItemProxy section */ + 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */ = { + isa = PBXContainerItemProxy; + containerPortal = 33CC10E52044A3C60003C045 /* Project object */; + proxyType = 1; + remoteGlobalIDString = 33CC111A2044C6BA0003C045; + remoteInfo = FLX; + }; +/* End PBXContainerItemProxy section */ + +/* Begin PBXCopyFilesBuildPhase section */ + 33CC110E2044A8840003C045 /* Bundle Framework */ = { + isa = PBXCopyFilesBuildPhase; + buildActionMask = 2147483647; + dstPath = ""; + dstSubfolderSpec = 10; + files = ( + ); + name = "Bundle Framework"; + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXCopyFilesBuildPhase section */ + +/* Begin PBXFileReference section */ + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = ""; }; + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = ""; }; + 33CC10ED2044A3C60003C045 /* flutter_ex.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "flutter_ex.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; + 33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = ""; }; + 33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; + 33CC10F72044A3C60003C045 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; name = Info.plist; path = Runner/Info.plist; sourceTree = ""; }; + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MainFlutterWindow.swift; sourceTree = ""; }; + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Debug.xcconfig"; sourceTree = ""; }; + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = "Flutter-Release.xcconfig"; sourceTree = ""; }; + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = "Flutter-Generated.xcconfig"; path = "ephemeral/Flutter-Generated.xcconfig"; sourceTree = ""; }; + 33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = ""; }; + 33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = ""; }; + 33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = ""; }; + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = ""; }; + 9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = ""; }; +/* End PBXFileReference section */ + +/* Begin PBXFrameworksBuildPhase section */ + 33CC10EA2044A3C60003C045 /* Frameworks */ = { + isa = PBXFrameworksBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXFrameworksBuildPhase section */ + +/* Begin PBXGroup section */ + 33BA886A226E78AF003329D5 /* Configs */ = { + isa = PBXGroup; + children = ( + 33E5194F232828860026EE4D /* AppInfo.xcconfig */, + 9740EEB21CF90195004384FC /* Debug.xcconfig */, + 7AFA3C8E1D35360C0083082E /* Release.xcconfig */, + 333000ED22D3DE5D00554162 /* Warnings.xcconfig */, + ); + path = Configs; + sourceTree = ""; + }; + 33CC10E42044A3C60003C045 = { + isa = PBXGroup; + children = ( + 33FAB671232836740065AC1E /* Runner */, + 33CEB47122A05771004F2AC0 /* Flutter */, + 33CC10EE2044A3C60003C045 /* Products */, + D73912EC22F37F3D000D13A0 /* Frameworks */, + ); + sourceTree = ""; + }; + 33CC10EE2044A3C60003C045 /* Products */ = { + isa = PBXGroup; + children = ( + 33CC10ED2044A3C60003C045 /* flutter_ex.app */, + ); + name = Products; + sourceTree = ""; + }; + 33CC11242044D66E0003C045 /* Resources */ = { + isa = PBXGroup; + children = ( + 33CC10F22044A3C60003C045 /* Assets.xcassets */, + 33CC10F42044A3C60003C045 /* MainMenu.xib */, + 33CC10F72044A3C60003C045 /* Info.plist */, + ); + name = Resources; + path = ..; + sourceTree = ""; + }; + 33CEB47122A05771004F2AC0 /* Flutter */ = { + isa = PBXGroup; + children = ( + 335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */, + 33CEB47222A05771004F2AC0 /* Flutter-Debug.xcconfig */, + 33CEB47422A05771004F2AC0 /* Flutter-Release.xcconfig */, + 33CEB47722A0578A004F2AC0 /* Flutter-Generated.xcconfig */, + ); + path = Flutter; + sourceTree = ""; + }; + 33FAB671232836740065AC1E /* Runner */ = { + isa = PBXGroup; + children = ( + 33CC10F02044A3C60003C045 /* AppDelegate.swift */, + 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */, + 33E51913231747F40026EE4D /* DebugProfile.entitlements */, + 33E51914231749380026EE4D /* Release.entitlements */, + 33CC11242044D66E0003C045 /* Resources */, + 33BA886A226E78AF003329D5 /* Configs */, + ); + path = Runner; + sourceTree = ""; + }; + D73912EC22F37F3D000D13A0 /* Frameworks */ = { + isa = PBXGroup; + children = ( + ); + name = Frameworks; + sourceTree = ""; + }; +/* End PBXGroup section */ + +/* Begin PBXNativeTarget section */ + 33CC10EC2044A3C60003C045 /* Runner */ = { + isa = PBXNativeTarget; + buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */; + buildPhases = ( + 33CC10E92044A3C60003C045 /* Sources */, + 33CC10EA2044A3C60003C045 /* Frameworks */, + 33CC10EB2044A3C60003C045 /* Resources */, + 33CC110E2044A8840003C045 /* Bundle Framework */, + 3399D490228B24CF009A79C7 /* ShellScript */, + ); + buildRules = ( + ); + dependencies = ( + 33CC11202044C79F0003C045 /* PBXTargetDependency */, + ); + name = Runner; + productName = Runner; + productReference = 33CC10ED2044A3C60003C045 /* flutter_ex.app */; + productType = "com.apple.product-type.application"; + }; +/* End PBXNativeTarget section */ + +/* Begin PBXProject section */ + 33CC10E52044A3C60003C045 /* Project object */ = { + isa = PBXProject; + attributes = { + LastSwiftUpdateCheck = 0920; + LastUpgradeCheck = 0930; + ORGANIZATIONNAME = ""; + TargetAttributes = { + 33CC10EC2044A3C60003C045 = { + CreatedOnToolsVersion = 9.2; + LastSwiftMigration = 1100; + ProvisioningStyle = Automatic; + SystemCapabilities = { + com.apple.Sandbox = { + enabled = 1; + }; + }; + }; + 33CC111A2044C6BA0003C045 = { + CreatedOnToolsVersion = 9.2; + ProvisioningStyle = Manual; + }; + }; + }; + buildConfigurationList = 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */; + compatibilityVersion = "Xcode 9.3"; + developmentRegion = en; + hasScannedForEncodings = 0; + knownRegions = ( + en, + Base, + ); + mainGroup = 33CC10E42044A3C60003C045; + productRefGroup = 33CC10EE2044A3C60003C045 /* Products */; + projectDirPath = ""; + projectRoot = ""; + targets = ( + 33CC10EC2044A3C60003C045 /* Runner */, + 33CC111A2044C6BA0003C045 /* Flutter Assemble */, + ); + }; +/* End PBXProject section */ + +/* Begin PBXResourcesBuildPhase section */ + 33CC10EB2044A3C60003C045 /* Resources */ = { + isa = PBXResourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */, + 33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXResourcesBuildPhase section */ + +/* Begin PBXShellScriptBuildPhase section */ + 3399D490228B24CF009A79C7 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + ); + inputPaths = ( + ); + outputFileListPaths = ( + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "echo \"$PRODUCT_NAME.app\" > \"$PROJECT_DIR\"/Flutter/ephemeral/.app_filename && \"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh embed\n"; + }; + 33CC111E2044C6BF0003C045 /* ShellScript */ = { + isa = PBXShellScriptBuildPhase; + buildActionMask = 2147483647; + files = ( + ); + inputFileListPaths = ( + Flutter/ephemeral/FlutterInputs.xcfilelist, + ); + inputPaths = ( + Flutter/ephemeral/tripwire, + ); + outputFileListPaths = ( + Flutter/ephemeral/FlutterOutputs.xcfilelist, + ); + outputPaths = ( + ); + runOnlyForDeploymentPostprocessing = 0; + shellPath = /bin/sh; + shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire"; + }; +/* End PBXShellScriptBuildPhase section */ + +/* Begin PBXSourcesBuildPhase section */ + 33CC10E92044A3C60003C045 /* Sources */ = { + isa = PBXSourcesBuildPhase; + buildActionMask = 2147483647; + files = ( + 33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */, + 33CC10F12044A3C60003C045 /* AppDelegate.swift in Sources */, + 335BBD1B22A9A15E00E9071D /* GeneratedPluginRegistrant.swift in Sources */, + ); + runOnlyForDeploymentPostprocessing = 0; + }; +/* End PBXSourcesBuildPhase section */ + +/* Begin PBXTargetDependency section */ + 33CC11202044C79F0003C045 /* PBXTargetDependency */ = { + isa = PBXTargetDependency; + target = 33CC111A2044C6BA0003C045 /* Flutter Assemble */; + targetProxy = 33CC111F2044C79F0003C045 /* PBXContainerItemProxy */; + }; +/* End PBXTargetDependency section */ + +/* Begin PBXVariantGroup section */ + 33CC10F42044A3C60003C045 /* MainMenu.xib */ = { + isa = PBXVariantGroup; + children = ( + 33CC10F52044A3C60003C045 /* Base */, + ); + name = MainMenu.xib; + path = Runner; + sourceTree = ""; + }; +/* End PBXVariantGroup section */ + +/* Begin XCBuildConfiguration section */ + 338D0CE9231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Profile; + }; + 338D0CEA231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Profile; + }; + 338D0CEB231458BD00FA5F75 /* Profile */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Profile; + }; + 33CC10F92044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 9740EEB21CF90195004384FC /* Debug.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = dwarf; + ENABLE_STRICT_OBJC_MSGSEND = YES; + ENABLE_TESTABILITY = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_DYNAMIC_NO_PIC = NO; + GCC_NO_COMMON_BLOCKS = YES; + GCC_OPTIMIZATION_LEVEL = 0; + GCC_PREPROCESSOR_DEFINITIONS = ( + "DEBUG=1", + "$(inherited)", + ); + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = YES; + ONLY_ACTIVE_ARCH = YES; + SDKROOT = macosx; + SWIFT_ACTIVE_COMPILATION_CONDITIONS = DEBUG; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + }; + name = Debug; + }; + 33CC10FA2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 7AFA3C8E1D35360C0083082E /* Release.xcconfig */; + buildSettings = { + ALWAYS_SEARCH_USER_PATHS = NO; + CLANG_ANALYZER_NONNULL = YES; + CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; + CLANG_CXX_LANGUAGE_STANDARD = "gnu++14"; + CLANG_CXX_LIBRARY = "libc++"; + CLANG_ENABLE_MODULES = YES; + CLANG_ENABLE_OBJC_ARC = YES; + CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; + CLANG_WARN_BOOL_CONVERSION = YES; + CLANG_WARN_CONSTANT_CONVERSION = YES; + CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; + CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; + CLANG_WARN_DOCUMENTATION_COMMENTS = YES; + CLANG_WARN_EMPTY_BODY = YES; + CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; + CLANG_WARN_INT_CONVERSION = YES; + CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; + CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; + CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; + CLANG_WARN_SUSPICIOUS_MOVE = YES; + CODE_SIGN_IDENTITY = "-"; + COPY_PHASE_STRIP = NO; + DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; + ENABLE_NS_ASSERTIONS = NO; + ENABLE_STRICT_OBJC_MSGSEND = YES; + GCC_C_LANGUAGE_STANDARD = gnu11; + GCC_NO_COMMON_BLOCKS = YES; + GCC_WARN_64_TO_32_BIT_CONVERSION = YES; + GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; + GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; + GCC_WARN_UNUSED_FUNCTION = YES; + GCC_WARN_UNUSED_VARIABLE = YES; + MACOSX_DEPLOYMENT_TARGET = 10.11; + MTL_ENABLE_DEBUG_INFO = NO; + SDKROOT = macosx; + SWIFT_COMPILATION_MODE = wholemodule; + SWIFT_OPTIMIZATION_LEVEL = "-O"; + }; + name = Release; + }; + 33CC10FC2044A3C60003C045 /* Debug */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_OPTIMIZATION_LEVEL = "-Onone"; + SWIFT_VERSION = 5.0; + }; + name = Debug; + }; + 33CC10FD2044A3C60003C045 /* Release */ = { + isa = XCBuildConfiguration; + baseConfigurationReference = 33E5194F232828860026EE4D /* AppInfo.xcconfig */; + buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; + CLANG_ENABLE_MODULES = YES; + CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements; + CODE_SIGN_STYLE = Automatic; + COMBINE_HIDPI_IMAGES = YES; + INFOPLIST_FILE = Runner/Info.plist; + LD_RUNPATH_SEARCH_PATHS = ( + "$(inherited)", + "@executable_path/../Frameworks", + ); + PROVISIONING_PROFILE_SPECIFIER = ""; + SWIFT_VERSION = 5.0; + }; + name = Release; + }; + 33CC111C2044C6BA0003C045 /* Debug */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Manual; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Debug; + }; + 33CC111D2044C6BA0003C045 /* Release */ = { + isa = XCBuildConfiguration; + buildSettings = { + CODE_SIGN_STYLE = Automatic; + PRODUCT_NAME = "$(TARGET_NAME)"; + }; + name = Release; + }; +/* End XCBuildConfiguration section */ + +/* Begin XCConfigurationList section */ + 33CC10E82044A3C60003C045 /* Build configuration list for PBXProject "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10F92044A3C60003C045 /* Debug */, + 33CC10FA2044A3C60003C045 /* Release */, + 338D0CE9231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC10FC2044A3C60003C045 /* Debug */, + 33CC10FD2044A3C60003C045 /* Release */, + 338D0CEA231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; + 33CC111B2044C6BA0003C045 /* Build configuration list for PBXAggregateTarget "Flutter Assemble" */ = { + isa = XCConfigurationList; + buildConfigurations = ( + 33CC111C2044C6BA0003C045 /* Debug */, + 33CC111D2044C6BA0003C045 /* Release */, + 338D0CEB231458BD00FA5F75 /* Profile */, + ); + defaultConfigurationIsVisible = 0; + defaultConfigurationName = Release; + }; +/* End XCConfigurationList section */ + }; + rootObject = 33CC10E52044A3C60003C045 /* Project object */; +} diff --git a/example/flutter_ex/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/flutter_ex/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/flutter_ex/macos/Runner.xcodeproj/project.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/flutter_ex/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme b/example/flutter_ex/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme new file mode 100644 index 00000000..674b8f4e --- /dev/null +++ b/example/flutter_ex/macos/Runner.xcodeproj/xcshareddata/xcschemes/Runner.xcscheme @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/flutter_ex/macos/Runner.xcworkspace/contents.xcworkspacedata b/example/flutter_ex/macos/Runner.xcworkspace/contents.xcworkspacedata new file mode 100644 index 00000000..1d526a16 --- /dev/null +++ b/example/flutter_ex/macos/Runner.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ + + + + + diff --git a/example/flutter_ex/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist b/example/flutter_ex/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist new file mode 100644 index 00000000..18d98100 --- /dev/null +++ b/example/flutter_ex/macos/Runner.xcworkspace/xcshareddata/IDEWorkspaceChecks.plist @@ -0,0 +1,8 @@ + + + + + IDEDidComputeMac32BitWarning + + + diff --git a/example/flutter_ex/macos/Runner/AppDelegate.swift b/example/flutter_ex/macos/Runner/AppDelegate.swift new file mode 100644 index 00000000..d53ef643 --- /dev/null +++ b/example/flutter_ex/macos/Runner/AppDelegate.swift @@ -0,0 +1,9 @@ +import Cocoa +import FlutterMacOS + +@NSApplicationMain +class AppDelegate: FlutterAppDelegate { + override func applicationShouldTerminateAfterLastWindowClosed(_ sender: NSApplication) -> Bool { + return true + } +} diff --git a/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json b/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 00000000..a2ec33f1 --- /dev/null +++ b/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "app_icon_64.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "app_icon_1024.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} diff --git a/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png b/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_1024.png new file mode 100644 index 0000000000000000000000000000000000000000..3c4935a7ca84f0976aca34b7f2895d65fb94d1ea GIT binary patch literal 46993 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 literal 0 HcmV?d00001 diff --git a/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png b/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_128.png new file mode 100644 index 0000000000000000000000000000000000000000..ed4cc16421680a50164ba74381b4b35ceaa0ccfc GIT binary patch literal 3276 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 N;OXk;vd$@?2>?>Ex^Vyi literal 0 HcmV?d00001 diff --git a/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png b/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_256.png new file mode 100644 index 0000000000000000000000000000000000000000..bcbf36df2f2aaaa0a63c7dabc94e600184229d0d GIT binary patch literal 5933 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 f$KZHO*s&vt|9^w-6P?|#0pRK8NSwWJ?9znhg z3{`3j3=J&|48MRv4KElNN(~qoUL`OvSj}Ky5HFasE6@fg!ItFh?!xdN1Q+aGJ{c&& zS>O>_%)r1c48n{Iv*t(u1=&kHeO=ifbFy+6aSK)V_AxLppYn8Z42d|rc6w}vOsL55 z`t&mC&y2@JTEyg!eDiFX^k#CC!jq%>erB=yHqUP0XcDOTw6ko}L zX;EmMrq(fKk*eygEuA616;0)>@A{TK|55PV@70 z$OfzS*(VJxQev3J?yY?O=ul(v`fp}?u9z`JK3ugibK>)DyCwImZOF4d{xK%%Ks1*} zv$oa)9anR%lXIBUqYnhLmT>VOzHfNP?ZwJNZ!5$s9M08RynIvaXw>@G^T9@r9^KH1 zVy??F&uuk)bH9Y4pQY!hP58i_H6 znl-NcuCpLV6ZWU;4C zu@9exF&OZi`Bovq_m%T+WhU2kvkz@^_LpycBvqm3bMpLw8X-Or5sL>0AKE1$(k_L=_Zc=CUq#=x1-QZf)G7nHu@fmsQ1eN_N3+nTEz`4HI4Z6uVlE zJH+X&det8JU?tO?upcM4Z=cV!JV;yF>FfL5Q$M|W_2Z!P`S=}Wzp|_1^#d%e?_H`> zV@%vA$+bFVqhw9`U;TfP|5|PD{||OiYdor8P*i??|NJcb%kzT_73*7WE?Ua5hAnR2 z=7WE=PhTlJ#ZeRznjTUb;`E(wkMZrj4e|Hilz-mK>9cZHQY**5TUPw~u}k;u73KI}xAx!0m-)GVia|x^d3p~s_9gh83jA&Ra<8rM%`>U3x69t&NzbwWY}7Ar?)FK#IZ0z|d0H0EkRO w3{9;}4Xg|ebq&m|3=9_N6z8I7$jwj5OsmAL;bP(Gi$Dzwp00i_>zopr02+f8CIA2c literal 0 HcmV?d00001 diff --git a/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png b/example/flutter_ex/macos/Runner/Assets.xcassets/AppIcon.appiconset/app_icon_512.png new file mode 100644 index 0000000000000000000000000000000000000000..e71a726136a47ed24125c7efc79d68a4a01961b4 GIT binary patch literal 14800 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 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/example/flutter_ex/macos/Runner/Configs/AppInfo.xcconfig b/example/flutter_ex/macos/Runner/Configs/AppInfo.xcconfig new file mode 100644 index 00000000..f422d827 --- /dev/null +++ b/example/flutter_ex/macos/Runner/Configs/AppInfo.xcconfig @@ -0,0 +1,14 @@ +// Application-level settings for the Runner target. +// +// This may be replaced with something auto-generated from metadata (e.g., pubspec.yaml) in the +// future. If not, the values below would default to using the project name when this becomes a +// 'flutter create' template. + +// The application's name. By default this is also the title of the Flutter window. +PRODUCT_NAME = flutter_ex + +// The application's bundle identifier +PRODUCT_BUNDLE_IDENTIFIER = com.example.flutterEx + +// The copyright displayed in application information +PRODUCT_COPYRIGHT = Copyright © 2021 com.example. All rights reserved. diff --git a/example/flutter_ex/macos/Runner/Configs/Debug.xcconfig b/example/flutter_ex/macos/Runner/Configs/Debug.xcconfig new file mode 100644 index 00000000..36b0fd94 --- /dev/null +++ b/example/flutter_ex/macos/Runner/Configs/Debug.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Debug.xcconfig" +#include "Warnings.xcconfig" diff --git a/example/flutter_ex/macos/Runner/Configs/Release.xcconfig b/example/flutter_ex/macos/Runner/Configs/Release.xcconfig new file mode 100644 index 00000000..dff4f495 --- /dev/null +++ b/example/flutter_ex/macos/Runner/Configs/Release.xcconfig @@ -0,0 +1,2 @@ +#include "../../Flutter/Flutter-Release.xcconfig" +#include "Warnings.xcconfig" diff --git a/example/flutter_ex/macos/Runner/Configs/Warnings.xcconfig b/example/flutter_ex/macos/Runner/Configs/Warnings.xcconfig new file mode 100644 index 00000000..42bcbf47 --- /dev/null +++ b/example/flutter_ex/macos/Runner/Configs/Warnings.xcconfig @@ -0,0 +1,13 @@ +WARNING_CFLAGS = -Wall -Wconditional-uninitialized -Wnullable-to-nonnull-conversion -Wmissing-method-return-type -Woverlength-strings +GCC_WARN_UNDECLARED_SELECTOR = YES +CLANG_UNDEFINED_BEHAVIOR_SANITIZER_NULLABILITY = YES +CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE +CLANG_WARN__DUPLICATE_METHOD_MATCH = YES +CLANG_WARN_PRAGMA_PACK = YES +CLANG_WARN_STRICT_PROTOTYPES = YES +CLANG_WARN_COMMA = YES +GCC_WARN_STRICT_SELECTOR_MATCH = YES +CLANG_WARN_OBJC_REPEATED_USE_OF_WEAK = YES +CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES +GCC_WARN_SHADOW = YES +CLANG_WARN_UNREACHABLE_CODE = YES diff --git a/example/flutter_ex/macos/Runner/DebugProfile.entitlements b/example/flutter_ex/macos/Runner/DebugProfile.entitlements new file mode 100644 index 00000000..3ba6c126 --- /dev/null +++ b/example/flutter_ex/macos/Runner/DebugProfile.entitlements @@ -0,0 +1,14 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.cs.allow-jit + + com.apple.security.network.client + + com.apple.security.network.server + + + diff --git a/example/flutter_ex/macos/Runner/Info.plist b/example/flutter_ex/macos/Runner/Info.plist new file mode 100644 index 00000000..4789daa6 --- /dev/null +++ b/example/flutter_ex/macos/Runner/Info.plist @@ -0,0 +1,32 @@ + + + + + CFBundleDevelopmentRegion + $(DEVELOPMENT_LANGUAGE) + CFBundleExecutable + $(EXECUTABLE_NAME) + CFBundleIconFile + + CFBundleIdentifier + $(PRODUCT_BUNDLE_IDENTIFIER) + CFBundleInfoDictionaryVersion + 6.0 + CFBundleName + $(PRODUCT_NAME) + CFBundlePackageType + APPL + CFBundleShortVersionString + $(FLUTTER_BUILD_NAME) + CFBundleVersion + $(FLUTTER_BUILD_NUMBER) + LSMinimumSystemVersion + $(MACOSX_DEPLOYMENT_TARGET) + NSHumanReadableCopyright + $(PRODUCT_COPYRIGHT) + NSMainNibFile + MainMenu + NSPrincipalClass + NSApplication + + diff --git a/example/flutter_ex/macos/Runner/MainFlutterWindow.swift b/example/flutter_ex/macos/Runner/MainFlutterWindow.swift new file mode 100644 index 00000000..2722837e --- /dev/null +++ b/example/flutter_ex/macos/Runner/MainFlutterWindow.swift @@ -0,0 +1,15 @@ +import Cocoa +import FlutterMacOS + +class MainFlutterWindow: NSWindow { + override func awakeFromNib() { + let flutterViewController = FlutterViewController.init() + let windowFrame = self.frame + self.contentViewController = flutterViewController + self.setFrame(windowFrame, display: true) + + RegisterGeneratedPlugins(registry: flutterViewController) + + super.awakeFromNib() + } +} diff --git a/example/flutter_ex/macos/Runner/Release.entitlements b/example/flutter_ex/macos/Runner/Release.entitlements new file mode 100644 index 00000000..7a2230dc --- /dev/null +++ b/example/flutter_ex/macos/Runner/Release.entitlements @@ -0,0 +1,12 @@ + + + + + com.apple.security.app-sandbox + + com.apple.security.network.client + + com.apple.security.network.server + + + diff --git a/example/flutter_ex/pubspec.yaml b/example/flutter_ex/pubspec.yaml index a16be7f1..c215fd3e 100644 --- a/example/flutter_ex/pubspec.yaml +++ b/example/flutter_ex/pubspec.yaml @@ -1,32 +1,25 @@ name: flutter_ex description: A new Flutter project. - +publish_to: none version: 1.0.0+1 environment: - sdk: ">=2.1.0 <3.0.0" + sdk: ">=2.12.0 <3.0.0" dependencies: flutter: sdk: flutter - - # The following adds the Cupertino Icons font to your application. - # Use with the CupertinoIcons class for iOS style icons. - cupertino_icons: ^0.1.2 - # Epub - epub: ^2.0.0 + epubx: + path: ../../ # To get the epub from the internet - http: ^0.12.0+2 - - image: ^2.0.0 + http: ^0.13.4 + image: ^3.0.8 dev_dependencies: flutter_test: sdk: flutter - - # The following section is specific to Flutter. flutter: # The following line ensures that the Material Icons font is diff --git a/example/flutter_ex/test/widget_test.dart b/example/flutter_ex/test/widget_test.dart deleted file mode 100644 index a9635fe3..00000000 --- a/example/flutter_ex/test/widget_test.dart +++ /dev/null @@ -1,30 +0,0 @@ -// This is a basic Flutter widget test. -// -// To perform an interaction with a widget in your test, use the WidgetTester -// utility that Flutter provides. For example, you can send tap and scroll -// gestures. You can also use WidgetTester to find child widgets in the widget -// tree, read text, and verify that the values of widget properties are correct. - -import 'package:flutter/material.dart'; -import 'package:flutter_test/flutter_test.dart'; - -import 'package:flutter_ex/main.dart'; - -void main() { - testWidgets('Counter increments smoke test', (WidgetTester tester) async { - // Build our app and trigger a frame. - await tester.pumpWidget(MyApp()); - - // Verify that our counter starts at 0. - expect(find.text('0'), findsOneWidget); - expect(find.text('1'), findsNothing); - - // Tap the '+' icon and trigger a frame. - await tester.tap(find.byIcon(Icons.add)); - await tester.pump(); - - // Verify that our counter has incremented. - expect(find.text('0'), findsNothing); - expect(find.text('1'), findsOneWidget); - }); -} diff --git a/example/flutter_ex/web/favicon.png b/example/flutter_ex/web/favicon.png new file mode 100644 index 0000000000000000000000000000000000000000..8aaa46ac1ae21512746f852a42ba87e4165dfdd1 GIT binary patch literal 917 zcmeAS@N?(olHy`uVBq!ia0vp^0wB!61|;P_|4#%`jKx9jP7LeL$-D$|I14-?iy0X7 zltGxWVyS%@P(fs7NJL45ua8x7ey(0(N`6wRUPW#JP&EUCO@$SZnVVXYs8ErclUHn2 zVXFjIVFhG^g!Ppaz)DK8ZIvQ?0~DO|i&7O#^-S~(l1AfjnEK zjFOT9D}DX)@^Za$W4-*MbbUihOG|wNBYh(yU7!lx;>x^|#0uTKVr7USFmqf|i<65o z3raHc^AtelCMM;Vme?vOfh>Xph&xL%(-1c06+^uR^q@XSM&D4+Kp$>4P^%3{)XKjo zGZknv$b36P8?Z_gF{nK@`XI}Z90TzwSQO}0J1!f2c(B=V`5aP@1P1a|PZ!4!3&Gl8 zTYqUsf!gYFyJnXpu0!n&N*SYAX-%d(5gVjrHJWqXQshj@!Zm{!01WsQrH~9=kTxW#6SvuapgMqt>$=j#%eyGrQzr zP{L-3gsMA^$I1&gsBAEL+vxi1*Igl=8#8`5?A-T5=z-sk46WA1IUT)AIZHx1rdUrf zVJrJn<74DDw`j)Ki#gt}mIT-Q`XRa2-jQXQoI%w`nb|XblvzK${ZzlV)m-XcwC(od z71_OEC5Bt9GEXosOXaPTYOia#R4ID2TiU~`zVMl08TV_C%DnU4^+HE>9(CE4D6?Fz oujB08i7adh9xk7*FX66dWH6F5TM;?E2b5PlUHx3vIVCg!0Dx9vYXATM literal 0 HcmV?d00001 diff --git a/example/flutter_ex/web/icons/Icon-192.png b/example/flutter_ex/web/icons/Icon-192.png new file mode 100644 index 0000000000000000000000000000000000000000..b749bfef07473333cf1dd31e9eed89862a5d52aa GIT binary patch literal 5292 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 literal 0 HcmV?d00001 diff --git a/example/flutter_ex/web/icons/Icon-512.png b/example/flutter_ex/web/icons/Icon-512.png new file mode 100644 index 0000000000000000000000000000000000000000..88cfd48dff1169879ba46840804b412fe02fefd6 GIT binary patch literal 8252 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 literal 0 HcmV?d00001 diff --git a/example/flutter_ex/web/icons/Icon-maskable-192.png b/example/flutter_ex/web/icons/Icon-maskable-192.png new file mode 100644 index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d GIT binary patch literal 5594 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 X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z! literal 0 HcmV?d00001 diff --git a/example/flutter_ex/web/icons/Icon-maskable-512.png b/example/flutter_ex/web/icons/Icon-maskable-512.png new file mode 100644 index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e GIT binary patch literal 20998 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 MPgg&ebxsLQ025IeI{*Lx literal 0 HcmV?d00001 diff --git a/example/flutter_ex/web/index.html b/example/flutter_ex/web/index.html new file mode 100644 index 00000000..c69f338e --- /dev/null +++ b/example/flutter_ex/web/index.html @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + flutter_ex + + + + + + + diff --git a/example/flutter_ex/web/manifest.json b/example/flutter_ex/web/manifest.json new file mode 100644 index 00000000..841e3f67 --- /dev/null +++ b/example/flutter_ex/web/manifest.json @@ -0,0 +1,35 @@ +{ + "name": "flutter_ex", + "short_name": "flutter_ex", + "start_url": ".", + "display": "standalone", + "background_color": "#0175C2", + "theme_color": "#0175C2", + "description": "A new Flutter project.", + "orientation": "portrait-primary", + "prefer_related_applications": false, + "icons": [ + { + "src": "icons/Icon-192.png", + "sizes": "192x192", + "type": "image/png" + }, + { + "src": "icons/Icon-512.png", + "sizes": "512x512", + "type": "image/png" + }, + { + "src": "icons/Icon-maskable-192.png", + "sizes": "192x192", + "type": "image/png", + "purpose": "maskable" + }, + { + "src": "icons/Icon-maskable-512.png", + "sizes": "512x512", + "type": "image/png", + "purpose": "maskable" + } + ] +} From 677cb5708650933ffd4085acb536d0492a4f4172 Mon Sep 17 00:00:00 2001 From: Serge Shkurko Date: Sat, 23 Oct 2021 07:38:51 +0300 Subject: [PATCH 04/24] Added epub v3 support --- CHANGELOG.md | 4 +- lib/src/entities/epub_content.dart | 12 +- lib/src/epub_reader.dart | 22 +- lib/src/readers/content_reader.dart | 10 +- lib/src/readers/navigation_reader.dart | 203 ++++++++---------- lib/src/readers/package_reader.dart | 15 +- lib/src/ref_entities/epub_content_ref.dart | 20 +- .../schema/navigation/epub_navigation.dart | 18 +- .../epub_navigation_doc_author.dart | 5 +- .../navigation/epub_navigation_doc_title.dart | 5 +- .../navigation/epub_navigation_head.dart | 5 +- .../navigation/epub_navigation_head_meta.dart | 3 +- .../navigation/epub_navigation_label.dart | 4 +- .../navigation/epub_navigation_list.dart | 14 +- .../navigation/epub_navigation_map.dart | 3 +- .../navigation/epub_navigation_page_list.dart | 3 +- .../epub_navigation_page_target.dart | 20 +- .../navigation/epub_navigation_point.dart | 21 +- .../navigation/epub_navigation_target.dart | 18 +- lib/src/schema/opf/epub_guide.dart | 3 +- lib/src/schema/opf/epub_guide_reference.dart | 6 +- lib/src/schema/opf/epub_manifest.dart | 3 +- lib/src/schema/opf/epub_manifest_item.dart | 6 +- lib/src/schema/opf/epub_metadata.dart | 42 ++-- .../schema/opf/epub_metadata_contributor.dart | 3 +- lib/src/schema/opf/epub_metadata_creator.dart | 3 +- lib/src/schema/opf/epub_metadata_date.dart | 3 +- .../schema/opf/epub_metadata_identifier.dart | 3 +- lib/src/schema/opf/epub_metadata_meta.dart | 3 +- lib/src/schema/opf/epub_package.dart | 3 +- lib/src/schema/opf/epub_spine.dart | 12 +- lib/src/schema/opf/epub_spine_item_ref.dart | 6 +- lib/src/utils/enum_from_string.dart | 3 +- lib/src/writers/epub_guide_writer.dart | 17 +- lib/src/writers/epub_manifest_writer.dart | 17 +- lib/src/writers/epub_metadata_writer.dart | 166 +++++++------- lib/src/writers/epub_package_writer.dart | 2 +- lib/src/writers/epub_spine_writer.dart | 16 +- 38 files changed, 372 insertions(+), 350 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 28c82733..fb94174a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,7 +1,9 @@ ## 3.0.0 ### Changed - `metadata` file now saves as `mimetype` [pull#1](https://github.com/rbcprolabs/epubx.dart/pull/1) - +### Added +- Epub v3 support [dart-epub | pull#76](https://github.com/orthros/dart-epub/pull/76) +- Doc comment [dart-epub | pull#80](https://github.com/orthros/dart-epub/pull/80) ## 3.0.0-dev.3 ### Changed diff --git a/lib/src/entities/epub_content.dart b/lib/src/entities/epub_content.dart index 8895a2b9..e30b22de 100644 --- a/lib/src/entities/epub_content.dart +++ b/lib/src/entities/epub_content.dart @@ -6,18 +6,18 @@ import 'epub_content_file.dart'; import 'epub_text_content_file.dart'; class EpubContent { - Map? Html; - Map? Css; - Map? Images; - Map? Fonts; - Map? AllFiles; + Map? Html; + Map? Css; + Map? Images; + Map? Fonts; + Map? AllFiles; EpubContent() { Html = {}; Css = {}; Images = {}; Fonts = {}; - AllFiles = {}; + AllFiles = {}; } @override diff --git a/lib/src/epub_reader.dart b/lib/src/epub_reader.dart index eec1f55e..0835fb31 100644 --- a/lib/src/epub_reader.dart +++ b/lib/src/epub_reader.dart @@ -101,20 +101,20 @@ class EpubReader { result.Css = await readTextContentFiles(contentRef.Css!); result.Images = await readByteContentFiles(contentRef.Images!); result.Fonts = await readByteContentFiles(contentRef.Fonts!); - result.AllFiles = {}; + result.AllFiles = {}; result.Html!.forEach((String? key, EpubTextContentFile value) { - result.AllFiles![key] = value; + result.AllFiles![key!] = value; }); result.Css!.forEach((String? key, EpubTextContentFile value) { - result.AllFiles![key] = value; + result.AllFiles![key!] = value; }); result.Images!.forEach((String? key, EpubByteContentFile value) { - result.AllFiles![key] = value; + result.AllFiles![key!] = value; }); result.Fonts!.forEach((String? key, EpubByteContentFile value) { - result.AllFiles![key] = value; + result.AllFiles![key!] = value; }); await Future.forEach(contentRef.AllFiles!.keys, (dynamic key) async { @@ -127,9 +127,9 @@ class EpubReader { return result; } - static Future> readTextContentFiles( - Map textContentFileRefs) async { - var result = {}; + static Future> readTextContentFiles( + Map textContentFileRefs) async { + var result = {}; await Future.forEach(textContentFileRefs.keys, (dynamic key) async { EpubContentFileRef value = textContentFileRefs[key]!; @@ -143,9 +143,9 @@ class EpubReader { return result; } - static Future> readByteContentFiles( - Map byteContentFileRefs) async { - var result = {}; + static Future> readByteContentFiles( + Map byteContentFileRefs) async { + var result = {}; await Future.forEach(byteContentFileRefs.keys, (dynamic key) async { result[key] = await readByteContentFile(byteContentFileRefs[key]!); }); diff --git a/lib/src/readers/content_reader.dart b/lib/src/readers/content_reader.dart index 2aae9571..4062eaf2 100644 --- a/lib/src/readers/content_reader.dart +++ b/lib/src/readers/content_reader.dart @@ -9,11 +9,11 @@ import '../schema/opf/epub_manifest_item.dart'; class ContentReader { static EpubContentRef parseContentMap(EpubBookRef bookRef) { var result = EpubContentRef(); - result.Html = {}; - result.Css = {}; - result.Images = {}; - result.Fonts = {}; - result.AllFiles = {}; + result.Html = {}; + result.Css = {}; + result.Images = {}; + result.Fonts = {}; + result.AllFiles = {}; bookRef.Schema!.Package!.Manifest!.Items! .forEach((EpubManifestItem manifestItem) { diff --git a/lib/src/readers/navigation_reader.dart b/lib/src/readers/navigation_reader.dart index e2df9f4d..943a3f7f 100644 --- a/lib/src/readers/navigation_reader.dart +++ b/lib/src/readers/navigation_reader.dart @@ -31,11 +31,11 @@ class NavigationReader { static String? _tocFileEntryPath; static Future readNavigation(Archive epubArchive, String contentDirectoryPath, EpubPackage package) async { - EpubNavigation result = EpubNavigation(); + var result = EpubNavigation(); if (package.Version == EpubVersion.Epub2) { - String tocId = package.Spine!.TableOfContents!; + var tocId = package.Spine!.TableOfContents; if (tocId == null || tocId.isEmpty) { - throw Exception("EPUB parsing error: TOC ID is empty."); + throw Exception('EPUB parsing error: TOC ID is empty.'); } var tocManifestItem = @@ -46,141 +46,134 @@ class NavigationReader { ); if (tocManifestItem == null) { throw Exception( - "EPUB parsing error: TOC item ${tocId} not found in EPUB manifest."); + 'EPUB parsing error: TOC item $tocId not found in EPUB manifest.'); } _tocFileEntryPath = ZipPathUtils.combine(contentDirectoryPath, tocManifestItem.Href); - ArchiveFile? tocFileEntry = epubArchive.files - .cast() - .firstWhere( - (ArchiveFile? file) => - file!.name.toLowerCase() == _tocFileEntryPath!.toLowerCase(), - orElse: () => null); + var tocFileEntry = epubArchive.files.cast().firstWhere( + (ArchiveFile? file) => + file!.name.toLowerCase() == _tocFileEntryPath!.toLowerCase(), + orElse: () => null); if (tocFileEntry == null) { throw Exception( - "EPUB parsing error: TOC file ${_tocFileEntryPath} not found in archive."); + 'EPUB parsing error: TOC file $_tocFileEntryPath not found in archive.'); } - xml.XmlDocument containerDocument = - xml.parse(convert.utf8.decode(tocFileEntry.content)); + var containerDocument = + xml.XmlDocument.parse(convert.utf8.decode(tocFileEntry.content)); - String ncxNamespace = "http://www.daisy.org/z3986/2005/ncx/"; - xml.XmlElement? ncxNode = containerDocument - .findAllElements("ncx", namespace: ncxNamespace) + var ncxNamespace = 'http://www.daisy.org/z3986/2005/ncx/'; + var ncxNode = containerDocument + .findAllElements('ncx', namespace: ncxNamespace) .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (ncxNode == null) { throw Exception( - "EPUB parsing error: TOC file does not contain ncx element."); + 'EPUB parsing error: TOC file does not contain ncx element.'); } - xml.XmlElement? headNode = ncxNode - .findAllElements("head", namespace: ncxNamespace) + var headNode = ncxNode + .findAllElements('head', namespace: ncxNamespace) .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (headNode == null) { throw Exception( - "EPUB parsing error: TOC file does not contain head element."); + 'EPUB parsing error: TOC file does not contain head element.'); } - EpubNavigationHead navigationHead = readNavigationHead(headNode); + var navigationHead = readNavigationHead(headNode); result.Head = navigationHead; - xml.XmlElement? docTitleNode = ncxNode - .findElements("docTitle", namespace: ncxNamespace) + var docTitleNode = ncxNode + .findElements('docTitle', namespace: ncxNamespace) .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (docTitleNode == null) { throw Exception( - "EPUB parsing error: TOC file does not contain docTitle element."); + 'EPUB parsing error: TOC file does not contain docTitle element.'); } - EpubNavigationDocTitle navigationDocTitle = - readNavigationDocTitle(docTitleNode); + var navigationDocTitle = readNavigationDocTitle(docTitleNode); result.DocTitle = navigationDocTitle; result.DocAuthors = []; ncxNode - .findElements("docAuthor", namespace: ncxNamespace) + .findElements('docAuthor', namespace: ncxNamespace) .forEach((xml.XmlElement docAuthorNode) { - EpubNavigationDocAuthor navigationDocAuthor = - readNavigationDocAuthor(docAuthorNode); + var navigationDocAuthor = readNavigationDocAuthor(docAuthorNode); result.DocAuthors!.add(navigationDocAuthor); }); - xml.XmlElement? navMapNode = ncxNode - .findElements("navMap", namespace: ncxNamespace) + var navMapNode = ncxNode + .findElements('navMap', namespace: ncxNamespace) .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (navMapNode == null) { throw Exception( - "EPUB parsing error: TOC file does not contain navMap element."); + 'EPUB parsing error: TOC file does not contain navMap element.'); } - EpubNavigationMap navMap = readNavigationMap(navMapNode); + var navMap = readNavigationMap(navMapNode); result.NavMap = navMap; - xml.XmlElement? pageListNode = ncxNode - .findElements("pageList", namespace: ncxNamespace) + var pageListNode = ncxNode + .findElements('pageList', namespace: ncxNamespace) .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (pageListNode != null) { - EpubNavigationPageList pageList = readNavigationPageList(pageListNode); + var pageList = readNavigationPageList(pageListNode); result.PageList = pageList; } result.NavLists = []; ncxNode - .findElements("navList", namespace: ncxNamespace) + .findElements('navList', namespace: ncxNamespace) .forEach((xml.XmlElement navigationListNode) { - EpubNavigationList navigationList = - readNavigationList(navigationListNode); + var navigationList = readNavigationList(navigationListNode); result.NavLists!.add(navigationList); }); } else { //Version 3 - EpubManifestItem? tocManifestItem = package.Manifest!.Items! + var tocManifestItem = package.Manifest!.Items! .cast() - .firstWhere((element) => element!.Properties == "nav", + .firstWhere((element) => element!.Properties == 'nav', orElse: () => null); if (tocManifestItem == null) { throw Exception( - "EPUB parsing error: TOC item, not found in EPUB manifest."); + 'EPUB parsing error: TOC item, not found in EPUB manifest.'); } _tocFileEntryPath = ZipPathUtils.combine(contentDirectoryPath, tocManifestItem.Href); - ArchiveFile? tocFileEntry = epubArchive.files - .cast() - .firstWhere( - (ArchiveFile? file) => - file!.name.toLowerCase() == _tocFileEntryPath!.toLowerCase(), - orElse: () => null); + var tocFileEntry = epubArchive.files.cast().firstWhere( + (ArchiveFile? file) => + file!.name.toLowerCase() == _tocFileEntryPath!.toLowerCase(), + orElse: () => null); if (tocFileEntry == null) { throw Exception( - "EPUB parsing error: TOC file ${_tocFileEntryPath} not found in archive."); + 'EPUB parsing error: TOC file $_tocFileEntryPath not found in archive.'); } //Get relative toc file path - _tocFileEntryPath = ((_tocFileEntryPath!.split("/")..removeLast()) + _tocFileEntryPath = ((_tocFileEntryPath!.split('/')..removeLast()) ..removeAt(0)) - .join("/") + + .join('/') + '/'; - xml.XmlDocument containerDocument = - xml.parse(convert.utf8.decode(tocFileEntry.content)); + var containerDocument = + xml.XmlDocument.parse(convert.utf8.decode(tocFileEntry.content)); - xml.XmlElement? headNode = containerDocument - .findAllElements("head") + var headNode = containerDocument + .findAllElements('head') .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (headNode == null) { throw Exception( - "EPUB parsing error: TOC file does not contain head element."); + 'EPUB parsing error: TOC file does not contain head element.'); } result.DocTitle = EpubNavigationDocTitle(); @@ -189,18 +182,18 @@ class NavigationReader { result.DocAuthors = []; - xml.XmlElement? navNode = containerDocument - .findAllElements("nav") + var navNode = containerDocument + .findAllElements('nav') .cast() .firstWhere((xml.XmlElement? elem) => elem != null, orElse: () => null); if (navNode == null) { throw Exception( - "EPUB parsing error: TOC file does not contain head element."); + 'EPUB parsing error: TOC file does not contain head element.'); } - xml.XmlElement navMapNode = navNode.findElements("ol").single; + var navMapNode = navNode.findElements('ol').single; - EpubNavigationMap navMap = readNavigationMapV3(navMapNode); + var navMap = readNavigationMapV3(navMapNode); result.NavMap = navMap; //TODO : Implement pagesLists @@ -243,15 +236,15 @@ class NavigationReader { static EpubNavigationContent readNavigationContentV3( xml.XmlElement navigationContentNode) { - EpubNavigationContent result = EpubNavigationContent(); + var result = EpubNavigationContent(); navigationContentNode.attributes .forEach((xml.XmlAttribute navigationContentNodeAttribute) { - String attributeValue = navigationContentNodeAttribute.value; + var attributeValue = navigationContentNodeAttribute.value; switch (navigationContentNodeAttribute.name.local.toLowerCase()) { - case "id": + case 'id': result.Id = attributeValue; break; - case "href": + case 'href': if (_tocFileEntryPath!.length < 2 || attributeValue.contains(_tocFileEntryPath!)) { result.Source = attributeValue; @@ -264,7 +257,7 @@ class NavigationReader { }); if (result.Source == null || result.Source!.isEmpty) { throw Exception( - "Incorrect EPUB navigation content: content source is missing."); + 'Incorrect EPUB navigation content: content source is missing.'); } return result; } @@ -355,7 +348,7 @@ class NavigationReader { static EpubNavigationLabel readNavigationLabelV3( xml.XmlElement navigationLabelNode) { - EpubNavigationLabel result = EpubNavigationLabel(); + var result = EpubNavigationLabel(); result.Text = navigationLabelNode.text.trim(); return result; } @@ -379,14 +372,12 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationListChildNode) { switch (navigationListChildNode.name.local.toLowerCase()) { - case "navlabel": - EpubNavigationLabel navigationLabel = - readNavigationLabel(navigationListChildNode); + case 'navlabel': + var navigationLabel = readNavigationLabel(navigationListChildNode); result.NavigationLabels!.add(navigationLabel); break; - case "navtarget": - EpubNavigationTarget navigationTarget = - readNavigationTarget(navigationListChildNode); + case 'navtarget': + var navigationTarget = readNavigationTarget(navigationListChildNode); result.NavigationTargets!.add(navigationTarget); break; } @@ -404,9 +395,8 @@ class NavigationReader { navigationMapNode.children .whereType() .forEach((xml.XmlElement navigationPointNode) { - if (navigationPointNode.name.local.toLowerCase() == "navpoint") { - EpubNavigationPoint navigationPoint = - readNavigationPoint(navigationPointNode); + if (navigationPointNode.name.local.toLowerCase() == 'navpoint') { + var navigationPoint = readNavigationPoint(navigationPointNode); result.Points!.add(navigationPoint); } }); @@ -415,14 +405,13 @@ class NavigationReader { static EpubNavigationMap readNavigationMapV3( xml.XmlElement navigationMapNode) { - EpubNavigationMap result = EpubNavigationMap(); + var result = EpubNavigationMap(); result.Points = []; navigationMapNode.children .whereType() .forEach((xml.XmlElement navigationPointNode) { - if (navigationPointNode.name.local.toLowerCase() == "li") { - EpubNavigationPoint navigationPoint = - readNavigationPointV3(navigationPointNode); + if (navigationPointNode.name.local.toLowerCase() == 'li') { + var navigationPoint = readNavigationPointV3(navigationPointNode); result.Points!.add(navigationPoint); } }); @@ -436,9 +425,8 @@ class NavigationReader { navigationPageListNode.children .whereType() .forEach((xml.XmlElement pageTargetNode) { - if (pageTargetNode.name.local == "pageTarget") { - EpubNavigationPageTarget pageTarget = - readNavigationPageTarget(pageTargetNode); + if (pageTargetNode.name.local == 'pageTarget') { + var pageTarget = readNavigationPageTarget(pageTargetNode); result.Targets!.add(pageTarget); } }); @@ -483,14 +471,13 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationPageTargetChildNode) { switch (navigationPageTargetChildNode.name.local.toLowerCase()) { - case "navlabel": - EpubNavigationLabel navigationLabel = + case 'navlabel': + var navigationLabel = readNavigationLabel(navigationPageTargetChildNode); result.NavigationLabels!.add(navigationLabel); break; - case "content": - EpubNavigationContent content = - readNavigationContent(navigationPageTargetChildNode); + case 'content': + var content = readNavigationContent(navigationPageTargetChildNode); result.Content = content; break; } @@ -531,18 +518,16 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationPointChildNode) { switch (navigationPointChildNode.name.local.toLowerCase()) { - case "navlabel": - EpubNavigationLabel navigationLabel = - readNavigationLabel(navigationPointChildNode); + case 'navlabel': + var navigationLabel = readNavigationLabel(navigationPointChildNode); result.NavigationLabels!.add(navigationLabel); break; - case "content": - EpubNavigationContent content = - readNavigationContent(navigationPointChildNode); + case 'content': + var content = readNavigationContent(navigationPointChildNode); result.Content = content; break; - case "navpoint": - EpubNavigationPoint childNavigationPoint = + case 'navpoint': + var childNavigationPoint = readNavigationPoint(navigationPointChildNode); result.ChildNavigationPoints!.add(childNavigationPoint); break; @@ -563,7 +548,7 @@ class NavigationReader { static EpubNavigationPoint readNavigationPointV3( xml.XmlElement navigationPointNode) { - EpubNavigationPoint result = EpubNavigationPoint(); + var result = EpubNavigationPoint(); result.NavigationLabels = []; result.ChildNavigationPoints = []; @@ -571,15 +556,13 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationPointChildNode) { switch (navigationPointChildNode.name.local.toLowerCase()) { - case "a": - EpubNavigationLabel navigationLabel = - readNavigationLabelV3(navigationPointChildNode); + case 'a': + var navigationLabel = readNavigationLabelV3(navigationPointChildNode); result.NavigationLabels!.add(navigationLabel); - EpubNavigationContent content = - readNavigationContentV3(navigationPointChildNode); + var content = readNavigationContentV3(navigationPointChildNode); result.Content = content; break; - case "ol": + case 'ol': readNavigationMapV3(navigationPointChildNode) .Points! .forEach((point) { @@ -591,11 +574,11 @@ class NavigationReader { if (result.NavigationLabels!.isEmpty) { throw Exception( - "EPUB parsing error: navigation point ${result.Id} should contain at least one navigation label."); + 'EPUB parsing error: navigation point ${result.Id} should contain at least one navigation label.'); } if (result.Content == null) { throw Exception( - "EPUB parsing error: navigation point ${result.Id} should contain content."); + 'EPUB parsing error: navigation point ${result.Id} should contain content.'); } return result; @@ -631,14 +614,12 @@ class NavigationReader { .whereType() .forEach((xml.XmlElement navigationTargetChildNode) { switch (navigationTargetChildNode.name.local.toLowerCase()) { - case "navlabel": - EpubNavigationLabel navigationLabel = - readNavigationLabel(navigationTargetChildNode); + case 'navlabel': + var navigationLabel = readNavigationLabel(navigationTargetChildNode); result.NavigationLabels!.add(navigationLabel); break; - case "content": - EpubNavigationContent content = - readNavigationContent(navigationTargetChildNode); + case 'content': + var content = readNavigationContent(navigationTargetChildNode); result.Content = content; break; } diff --git a/lib/src/readers/package_reader.dart b/lib/src/readers/package_reader.dart index 62e1f491..59153a59 100644 --- a/lib/src/readers/package_reader.dart +++ b/lib/src/readers/package_reader.dart @@ -77,10 +77,10 @@ class PackageReader { case 'media-type': manifestItem.MediaType = attributeValue; break; - case "media-overlay": + case 'media-overlay': manifestItem.MediaOverlay = attributeValue; break; - case "required-namespace": + case 'required-namespace': manifestItem.RequiredNamespace = attributeValue; break; case 'required-modules': @@ -92,7 +92,7 @@ class PackageReader { case 'fallback-style': manifestItem.FallbackStyle = attributeValue; break; - case "properties": + case 'properties': manifestItem.Properties = attributeValue; break; } @@ -288,11 +288,11 @@ class PackageReader { static EpubMetadataMeta readMetadataMetaVersion3( XmlElement metadataMetaNode) { - EpubMetadataMeta result = EpubMetadataMeta(); + var result = EpubMetadataMeta(); result.Attributes = {}; metadataMetaNode.attributes .forEach((XmlAttribute metadataMetaNodeAttribute) { - String attributeValue = metadataMetaNodeAttribute.value; + var attributeValue = metadataMetaNodeAttribute.value; result.Attributes![metadataMetaNodeAttribute.name.local.toLowerCase()] = attributeValue; switch (metadataMetaNodeAttribute.name.local.toLowerCase()) { @@ -379,10 +379,9 @@ class PackageReader { result.Items = []; var tocAttribute = spineNode.getAttribute('toc'); result.TableOfContents = tocAttribute; - String? pageProgression = - spineNode.getAttribute("page-progression-direction"); + var pageProgression = spineNode.getAttribute('page-progression-direction'); result.ltr = - ((pageProgression == null) || pageProgression.toLowerCase() == "ltr"); + ((pageProgression == null) || pageProgression.toLowerCase() == 'ltr'); spineNode.children .whereType() .forEach((XmlElement spineItemNode) { diff --git a/lib/src/ref_entities/epub_content_ref.dart b/lib/src/ref_entities/epub_content_ref.dart index 93750cd0..287a6ed1 100644 --- a/lib/src/ref_entities/epub_content_ref.dart +++ b/lib/src/ref_entities/epub_content_ref.dart @@ -6,18 +6,18 @@ import 'epub_content_file_ref.dart'; import 'epub_text_content_file_ref.dart'; class EpubContentRef { - Map? Html; - Map? Css; - Map? Images; - Map? Fonts; - Map? AllFiles; + Map? Html; + Map? Css; + Map? Images; + Map? Fonts; + Map? AllFiles; EpubContentRef() { - Html = {}; - Css = {}; - Images = {}; - Fonts = {}; - AllFiles = {}; + Html = {}; + Css = {}; + Images = {}; + Fonts = {}; + AllFiles = {}; } @override diff --git a/lib/src/schema/navigation/epub_navigation.dart b/lib/src/schema/navigation/epub_navigation.dart index eb73ae0e..f6fc5e3c 100644 --- a/lib/src/schema/navigation/epub_navigation.dart +++ b/lib/src/schema/navigation/epub_navigation.dart @@ -18,18 +18,20 @@ class EpubNavigation { @override int get hashCode { - var objects = [] - ..add(Head.hashCode) - ..add(DocTitle.hashCode) - ..add(NavMap.hashCode) - ..add(PageList.hashCode) - ..addAll(DocAuthors?.map((author) => author.hashCode) ?? [0]) - ..addAll(NavLists?.map((navList) => navList.hashCode) ?? [0]); + var objects = [ + Head.hashCode, + DocTitle.hashCode, + NavMap.hashCode, + PageList.hashCode, + ...DocAuthors?.map((author) => author.hashCode) ?? [0], + ...NavLists?.map((navList) => navList.hashCode) ?? [0] + ]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigation; + var otherAs = other as EpubNavigation?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/navigation/epub_navigation_doc_author.dart b/lib/src/schema/navigation/epub_navigation_doc_author.dart index 2e6e0e18..b5275fe8 100644 --- a/lib/src/schema/navigation/epub_navigation_doc_author.dart +++ b/lib/src/schema/navigation/epub_navigation_doc_author.dart @@ -10,12 +10,13 @@ class EpubNavigationDocAuthor { @override int get hashCode { - var objects = []..addAll(Authors!.map((author) => author.hashCode)); + var objects = [...Authors!.map((author) => author.hashCode)]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationDocAuthor; + var otherAs = other as EpubNavigationDocAuthor?; if (otherAs == null) return false; return collections.listsEqual(Authors, otherAs.Authors); diff --git a/lib/src/schema/navigation/epub_navigation_doc_title.dart b/lib/src/schema/navigation/epub_navigation_doc_title.dart index 02585b5c..3e48cfc3 100644 --- a/lib/src/schema/navigation/epub_navigation_doc_title.dart +++ b/lib/src/schema/navigation/epub_navigation_doc_title.dart @@ -10,12 +10,13 @@ class EpubNavigationDocTitle { @override int get hashCode { - var objects = []..addAll(Titles!.map((title) => title.hashCode)); + var objects = [...Titles!.map((title) => title.hashCode)]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationDocTitle; + var otherAs = other as EpubNavigationDocTitle?; if (otherAs == null) return false; return collections.listsEqual(Titles, otherAs.Titles); diff --git a/lib/src/schema/navigation/epub_navigation_head.dart b/lib/src/schema/navigation/epub_navigation_head.dart index f7475bef..4b2e2e09 100644 --- a/lib/src/schema/navigation/epub_navigation_head.dart +++ b/lib/src/schema/navigation/epub_navigation_head.dart @@ -12,12 +12,13 @@ class EpubNavigationHead { @override int get hashCode { - var objects = []..addAll(Metadata!.map((meta) => meta.hashCode)); + var objects = [...Metadata!.map((meta) => meta.hashCode)]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationHead; + var otherAs = other as EpubNavigationHead?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/navigation/epub_navigation_head_meta.dart b/lib/src/schema/navigation/epub_navigation_head_meta.dart index 078d22b1..a9e3bb27 100644 --- a/lib/src/schema/navigation/epub_navigation_head_meta.dart +++ b/lib/src/schema/navigation/epub_navigation_head_meta.dart @@ -8,8 +8,9 @@ class EpubNavigationHeadMeta { @override int get hashCode => hash3(Name.hashCode, Content.hashCode, Scheme.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubNavigationHeadMeta; + var otherAs = other as EpubNavigationHeadMeta?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/navigation/epub_navigation_label.dart b/lib/src/schema/navigation/epub_navigation_label.dart index 5f3c94fd..910a1d53 100644 --- a/lib/src/schema/navigation/epub_navigation_label.dart +++ b/lib/src/schema/navigation/epub_navigation_label.dart @@ -4,12 +4,14 @@ class EpubNavigationLabel { @override int get hashCode => Text.hashCode; + @override bool operator ==(other) { - var otherAs = other as EpubNavigationLabel; + var otherAs = other as EpubNavigationLabel?; if (otherAs == null) return false; return Text == otherAs.Text; } + @override String toString() { return Text!; } diff --git a/lib/src/schema/navigation/epub_navigation_list.dart b/lib/src/schema/navigation/epub_navigation_list.dart index c3b13851..60c55048 100644 --- a/lib/src/schema/navigation/epub_navigation_list.dart +++ b/lib/src/schema/navigation/epub_navigation_list.dart @@ -12,16 +12,18 @@ class EpubNavigationList { @override int get hashCode { - var objects = [] - ..add(Id.hashCode) - ..add(Class.hashCode) - ..addAll(NavigationLabels?.map((label) => label.hashCode) ?? [0]) - ..addAll(NavigationTargets?.map((target) => target.hashCode) ?? [0]); + var objects = [ + Id.hashCode, + Class.hashCode, + ...NavigationLabels?.map((label) => label.hashCode) ?? [0], + ...NavigationTargets?.map((target) => target.hashCode) ?? [0] + ]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationList; + var otherAs = other as EpubNavigationList?; if (otherAs == null) return false; if (!(Id == otherAs.Id && Class == otherAs.Class)) { diff --git a/lib/src/schema/navigation/epub_navigation_map.dart b/lib/src/schema/navigation/epub_navigation_map.dart index baaba726..24208aff 100644 --- a/lib/src/schema/navigation/epub_navigation_map.dart +++ b/lib/src/schema/navigation/epub_navigation_map.dart @@ -11,8 +11,9 @@ class EpubNavigationMap { return hashObjects(Points?.map((point) => point.hashCode) ?? [0]); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationMap; + var otherAs = other as EpubNavigationMap?; if (otherAs == null) return false; return collections.listsEqual(Points, otherAs.Points); diff --git a/lib/src/schema/navigation/epub_navigation_page_list.dart b/lib/src/schema/navigation/epub_navigation_page_list.dart index 72fce9ca..f0ae694f 100644 --- a/lib/src/schema/navigation/epub_navigation_page_list.dart +++ b/lib/src/schema/navigation/epub_navigation_page_list.dart @@ -11,8 +11,9 @@ class EpubNavigationPageList { return hashObjects(Targets?.map((target) => target.hashCode) ?? [0]); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationPageList; + var otherAs = other as EpubNavigationPageList?; if (otherAs == null) return false; return collections.listsEqual(Targets, otherAs.Targets); diff --git a/lib/src/schema/navigation/epub_navigation_page_target.dart b/lib/src/schema/navigation/epub_navigation_page_target.dart index 5a5ba2a2..76ebd08f 100644 --- a/lib/src/schema/navigation/epub_navigation_page_target.dart +++ b/lib/src/schema/navigation/epub_navigation_page_target.dart @@ -16,19 +16,21 @@ class EpubNavigationPageTarget { @override int get hashCode { - var objects = [] - ..add(Id.hashCode) - ..add(Value.hashCode) - ..add(Type.hashCode) - ..add(Class.hashCode) - ..add(PlayOrder.hashCode) - ..add(Content.hashCode) - ..addAll(NavigationLabels?.map((label) => label.hashCode) ?? [0]); + var objects = [ + Id.hashCode, + Value.hashCode, + Type.hashCode, + Class.hashCode, + PlayOrder.hashCode, + Content.hashCode, + ...NavigationLabels?.map((label) => label.hashCode) ?? [0] + ]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationPageTarget; + var otherAs = other as EpubNavigationPageTarget?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/navigation/epub_navigation_point.dart b/lib/src/schema/navigation/epub_navigation_point.dart index aaced9cc..fc12c652 100644 --- a/lib/src/schema/navigation/epub_navigation_point.dart +++ b/lib/src/schema/navigation/epub_navigation_point.dart @@ -14,18 +14,20 @@ class EpubNavigationPoint { @override int get hashCode { - var objects = [] - ..add(Id.hashCode) - ..add(Class.hashCode) - ..add(PlayOrder.hashCode) - ..add(Content.hashCode) - ..addAll(NavigationLabels!.map((label) => label.hashCode)) - ..addAll(ChildNavigationPoints!.map((point) => point.hashCode)); + var objects = [ + Id.hashCode, + Class.hashCode, + PlayOrder.hashCode, + Content.hashCode, + ...NavigationLabels!.map((label) => label.hashCode), + ...ChildNavigationPoints!.map((point) => point.hashCode) + ]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationPoint; + var otherAs = other as EpubNavigationPoint?; if (otherAs == null) { return false; } @@ -43,7 +45,8 @@ class EpubNavigationPoint { Content == otherAs.Content; } + @override String toString() { - return 'Id: ${Id}, Content.Source: ${Content!.Source}'; + return 'Id: $Id, Content.Source: ${Content!.Source}'; } } diff --git a/lib/src/schema/navigation/epub_navigation_target.dart b/lib/src/schema/navigation/epub_navigation_target.dart index 23863ba6..8ef2b7a1 100644 --- a/lib/src/schema/navigation/epub_navigation_target.dart +++ b/lib/src/schema/navigation/epub_navigation_target.dart @@ -14,18 +14,20 @@ class EpubNavigationTarget { @override int get hashCode { - var objects = [] - ..add(Id.hashCode) - ..add(Class.hashCode) - ..add(Value.hashCode) - ..add(PlayOrder.hashCode) - ..add(Content.hashCode) - ..addAll(NavigationLabels!.map((label) => label.hashCode)); + var objects = [ + Id.hashCode, + Class.hashCode, + Value.hashCode, + PlayOrder.hashCode, + Content.hashCode, + ...NavigationLabels!.map((label) => label.hashCode) + ]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubNavigationTarget; + var otherAs = other as EpubNavigationTarget?; if (otherAs == null) return false; if (!(Id == otherAs.Id && diff --git a/lib/src/schema/opf/epub_guide.dart b/lib/src/schema/opf/epub_guide.dart index 71e8f45f..f715bc47 100644 --- a/lib/src/schema/opf/epub_guide.dart +++ b/lib/src/schema/opf/epub_guide.dart @@ -17,8 +17,9 @@ class EpubGuide { return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubGuide; + var otherAs = other as EpubGuide?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/opf/epub_guide_reference.dart b/lib/src/schema/opf/epub_guide_reference.dart index 877f8f60..bb56700f 100644 --- a/lib/src/schema/opf/epub_guide_reference.dart +++ b/lib/src/schema/opf/epub_guide_reference.dart @@ -8,8 +8,9 @@ class EpubGuideReference { @override int get hashCode => hash3(Type.hashCode, Title.hashCode, Href.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubGuideReference; + var otherAs = other as EpubGuideReference?; if (otherAs == null) { return false; } @@ -19,7 +20,8 @@ class EpubGuideReference { Href == otherAs.Href; } + @override String toString() { - return 'Type: ${Type}, Href: ${Href}'; + return 'Type: $Type, Href: $Href'; } } diff --git a/lib/src/schema/opf/epub_manifest.dart b/lib/src/schema/opf/epub_manifest.dart index ad690bfd..1c45f222 100644 --- a/lib/src/schema/opf/epub_manifest.dart +++ b/lib/src/schema/opf/epub_manifest.dart @@ -15,8 +15,9 @@ class EpubManifest { return hashObjects(Items!.map((item) => item.hashCode)); } + @override bool operator ==(other) { - var otherAs = other as EpubManifest; + var otherAs = other as EpubManifest?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/opf/epub_manifest_item.dart b/lib/src/schema/opf/epub_manifest_item.dart index 157261dc..6af69ee0 100644 --- a/lib/src/schema/opf/epub_manifest_item.dart +++ b/lib/src/schema/opf/epub_manifest_item.dart @@ -24,8 +24,9 @@ class EpubManifestItem { Properties.hashCode ]); + @override bool operator ==(other) { - var otherAs = other as EpubManifestItem; + var otherAs = other as EpubManifestItem?; if (otherAs == null) { return false; } @@ -41,7 +42,8 @@ class EpubManifestItem { Properties == otherAs.Properties; } + @override String toString() { - return "Id: ${Id}, Href = ${Href}, MediaType = ${MediaType}, Properties = ${Properties}, MediaOverlay = ${MediaOverlay}"; + return 'Id: $Id, Href = $Href, MediaType = $MediaType, Properties = $Properties, MediaOverlay = $MediaOverlay'; } } diff --git a/lib/src/schema/opf/epub_metadata.dart b/lib/src/schema/opf/epub_metadata.dart index 027bca7a..88b99f64 100644 --- a/lib/src/schema/opf/epub_metadata.dart +++ b/lib/src/schema/opf/epub_metadata.dart @@ -27,29 +27,31 @@ class EpubMetadata { @override int get hashCode { - var objects = [] - ..addAll(Titles!.map((title) => title.hashCode)) - ..addAll(Creators!.map((creator) => creator.hashCode)) - ..addAll(Subjects!.map((subject) => subject.hashCode)) - ..addAll(Publishers!.map((publisher) => publisher.hashCode)) - ..addAll(Contributors!.map((contributor) => contributor.hashCode)) - ..addAll(Dates!.map((date) => date.hashCode)) - ..addAll(Types!.map((type) => type.hashCode)) - ..addAll(Formats!.map((format) => format.hashCode)) - ..addAll(Identifiers!.map((identifier) => identifier.hashCode)) - ..addAll(Sources!.map((source) => source.hashCode)) - ..addAll(Languages!.map((language) => language.hashCode)) - ..addAll(Relations!.map((relation) => relation.hashCode)) - ..addAll(Coverages!.map((coverage) => coverage.hashCode)) - ..addAll(Rights!.map((right) => right.hashCode)) - ..addAll(MetaItems!.map((metaItem) => metaItem.hashCode)) - ..add(Description.hashCode); + var objects = [ + ...Titles!.map((title) => title.hashCode), + ...Creators!.map((creator) => creator.hashCode), + ...Subjects!.map((subject) => subject.hashCode), + ...Publishers!.map((publisher) => publisher.hashCode), + ...Contributors!.map((contributor) => contributor.hashCode), + ...Dates!.map((date) => date.hashCode), + ...Types!.map((type) => type.hashCode), + ...Formats!.map((format) => format.hashCode), + ...Identifiers!.map((identifier) => identifier.hashCode), + ...Sources!.map((source) => source.hashCode), + ...Languages!.map((language) => language.hashCode), + ...Relations!.map((relation) => relation.hashCode), + ...Coverages!.map((coverage) => coverage.hashCode), + ...Rights!.map((right) => right.hashCode), + ...MetaItems!.map((metaItem) => metaItem.hashCode), + Description.hashCode + ]; return hashObjects(objects); } + @override bool operator ==(other) { - var otherAs = other as EpubMetadata; + var otherAs = other as EpubMetadata?; if (otherAs == null) return false; if (Description != otherAs.Description) return false; @@ -66,8 +68,8 @@ class EpubMetadata { !collections.listsEqual(Languages, otherAs.Languages) || !collections.listsEqual(Relations, otherAs.Relations) || !collections.listsEqual(Coverages, otherAs.Coverages) || - !collections.listsEqual(Rights, other.Rights) || - !collections.listsEqual(MetaItems, other.MetaItems)) { + !collections.listsEqual(Rights, otherAs.Rights) || + !collections.listsEqual(MetaItems, otherAs.MetaItems)) { return false; } diff --git a/lib/src/schema/opf/epub_metadata_contributor.dart b/lib/src/schema/opf/epub_metadata_contributor.dart index ce1bc43f..c10796cc 100644 --- a/lib/src/schema/opf/epub_metadata_contributor.dart +++ b/lib/src/schema/opf/epub_metadata_contributor.dart @@ -9,8 +9,9 @@ class EpubMetadataContributor { int get hashCode => hash3(Contributor.hashCode, FileAs.hashCode, Role.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubMetadataContributor; + var otherAs = other as EpubMetadataContributor?; if (otherAs == null) return false; return Contributor == otherAs.Contributor && diff --git a/lib/src/schema/opf/epub_metadata_creator.dart b/lib/src/schema/opf/epub_metadata_creator.dart index e3a4fcb9..d81e1ea9 100644 --- a/lib/src/schema/opf/epub_metadata_creator.dart +++ b/lib/src/schema/opf/epub_metadata_creator.dart @@ -8,8 +8,9 @@ class EpubMetadataCreator { @override int get hashCode => hash3(Creator.hashCode, FileAs.hashCode, Role.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubMetadataCreator; + var otherAs = other as EpubMetadataCreator?; if (otherAs == null) return false; return Creator == otherAs.Creator && FileAs == otherAs.FileAs && diff --git a/lib/src/schema/opf/epub_metadata_date.dart b/lib/src/schema/opf/epub_metadata_date.dart index 5414d7c7..37983e21 100644 --- a/lib/src/schema/opf/epub_metadata_date.dart +++ b/lib/src/schema/opf/epub_metadata_date.dart @@ -7,8 +7,9 @@ class EpubMetadataDate { @override int get hashCode => hash2(Date.hashCode, Event.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubMetadataDate; + var otherAs = other as EpubMetadataDate?; if (otherAs == null) return false; return Date == otherAs.Date && Event == otherAs.Event; } diff --git a/lib/src/schema/opf/epub_metadata_identifier.dart b/lib/src/schema/opf/epub_metadata_identifier.dart index 03f6a7e9..52a91e76 100644 --- a/lib/src/schema/opf/epub_metadata_identifier.dart +++ b/lib/src/schema/opf/epub_metadata_identifier.dart @@ -8,8 +8,9 @@ class EpubMetadataIdentifier { @override int get hashCode => hash3(Id.hashCode, Scheme.hashCode, Identifier.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubMetadataIdentifier; + var otherAs = other as EpubMetadataIdentifier?; if (otherAs == null) return false; return Id == otherAs.Id && Scheme == otherAs.Scheme && diff --git a/lib/src/schema/opf/epub_metadata_meta.dart b/lib/src/schema/opf/epub_metadata_meta.dart index 38d38c34..7b32b836 100644 --- a/lib/src/schema/opf/epub_metadata_meta.dart +++ b/lib/src/schema/opf/epub_metadata_meta.dart @@ -19,8 +19,9 @@ class EpubMetadataMeta { Scheme.hashCode ]); + @override bool operator ==(other) { - var otherAs = other as EpubMetadataMeta; + var otherAs = other as EpubMetadataMeta?; if (otherAs == null) return false; return Name == otherAs.Name && Content == otherAs.Content && diff --git a/lib/src/schema/opf/epub_package.dart b/lib/src/schema/opf/epub_package.dart index 50609ecb..992839bf 100644 --- a/lib/src/schema/opf/epub_package.dart +++ b/lib/src/schema/opf/epub_package.dart @@ -22,8 +22,9 @@ class EpubPackage { Guide.hashCode ]); + @override bool operator ==(other) { - var otherAs = other as EpubPackage; + var otherAs = other as EpubPackage?; if (otherAs == null) { return false; } diff --git a/lib/src/schema/opf/epub_spine.dart b/lib/src/schema/opf/epub_spine.dart index 167fdbd2..777a4cef 100644 --- a/lib/src/schema/opf/epub_spine.dart +++ b/lib/src/schema/opf/epub_spine.dart @@ -10,15 +10,17 @@ class EpubSpine { @override int get hashCode { - var objs = [] - ..add(TableOfContents.hashCode) - ..add(ltr.hashCode) - ..addAll(Items!.map((item) => item.hashCode)); + var objs = [ + TableOfContents.hashCode, + ltr.hashCode, + ...Items!.map((item) => item.hashCode) + ]; return hashObjects(objs); } + @override bool operator ==(other) { - var otherAs = other as EpubSpine; + var otherAs = other as EpubSpine?; if (otherAs == null) return false; if (!collections.listsEqual(Items, otherAs.Items)) { diff --git a/lib/src/schema/opf/epub_spine_item_ref.dart b/lib/src/schema/opf/epub_spine_item_ref.dart index 0cf99be4..2e7a9cea 100644 --- a/lib/src/schema/opf/epub_spine_item_ref.dart +++ b/lib/src/schema/opf/epub_spine_item_ref.dart @@ -7,8 +7,9 @@ class EpubSpineItemRef { @override int get hashCode => hash2(IdRef.hashCode, IsLinear.hashCode); + @override bool operator ==(other) { - var otherAs = other as EpubSpineItemRef; + var otherAs = other as EpubSpineItemRef?; if (otherAs == null) { return false; } @@ -16,7 +17,8 @@ class EpubSpineItemRef { return IdRef == otherAs.IdRef && IsLinear == otherAs.IsLinear; } + @override String toString() { - return 'IdRef: ${IdRef}'; + return 'IdRef: $IdRef'; } } diff --git a/lib/src/utils/enum_from_string.dart b/lib/src/utils/enum_from_string.dart index 44be829f..02e1f510 100644 --- a/lib/src/utils/enum_from_string.dart +++ b/lib/src/utils/enum_from_string.dart @@ -6,8 +6,7 @@ class EnumFromString { T? get(String value) { value = '$T.$value'; try { - var x = this - .enumValues + var x = enumValues .firstWhere((f) => f.toString().toUpperCase() == value.toUpperCase()); return x; } catch (e) { diff --git a/lib/src/writers/epub_guide_writer.dart b/lib/src/writers/epub_guide_writer.dart index 838dcff4..8dec0fbb 100644 --- a/lib/src/writers/epub_guide_writer.dart +++ b/lib/src/writers/epub_guide_writer.dart @@ -3,14 +3,13 @@ import 'package:xml/src/xml/builder.dart' show XmlBuilder; class EpubGuideWriter { static void writeGuide(XmlBuilder builder, EpubGuide? guide) { - builder - ..element('guide', nest: () { - guide!.Items!.forEach((guideItem) => builder.element('reference', - attributes: { - 'type': guideItem.Type!, - 'title': guideItem.Title!, - 'href': guideItem.Href! - })); - }); + builder.element('guide', nest: () { + guide!.Items!.forEach((guideItem) => builder.element('reference', + attributes: { + 'type': guideItem.Type!, + 'title': guideItem.Title!, + 'href': guideItem.Href! + })); + }); } } diff --git a/lib/src/writers/epub_manifest_writer.dart b/lib/src/writers/epub_manifest_writer.dart index 4d6d2ccc..deee2dee 100644 --- a/lib/src/writers/epub_manifest_writer.dart +++ b/lib/src/writers/epub_manifest_writer.dart @@ -3,16 +3,15 @@ import 'package:xml/src/xml/builder.dart' show XmlBuilder; class EpubManifestWriter { static void writeManifest(XmlBuilder builder, EpubManifest? manifest) { - builder - ..element('manifest', nest: () { - manifest!.Items!.forEach((item) { - builder.element('item', nest: () { - builder - ..attribute('id', item.Id!) - ..attribute('href', item.Href!) - ..attribute('media-type', item.MediaType!); - }); + builder.element('manifest', nest: () { + manifest!.Items!.forEach((item) { + builder.element('item', nest: () { + builder + ..attribute('id', item.Id!) + ..attribute('href', item.Href!) + ..attribute('media-type', item.MediaType!); }); }); + }); } } diff --git a/lib/src/writers/epub_metadata_writer.dart b/lib/src/writers/epub_metadata_writer.dart index 078a6ca8..5fb3e51d 100644 --- a/lib/src/writers/epub_metadata_writer.dart +++ b/lib/src/writers/epub_metadata_writer.dart @@ -8,92 +8,98 @@ class EpubMetadataWriter { static void writeMetadata( XmlBuilder builder, EpubMetadata? meta, EpubVersion? version) { - builder - ..element('metadata', - namespaces: {_opf_namespace: 'opf', _dc_namespace: 'dc'}, nest: () { - meta! - ..Titles!.forEach((item) => - builder.element('title', nest: item, namespace: _dc_namespace)) - ..Creators!.forEach((item) => - builder.element('creator', namespace: _dc_namespace, nest: () { - if (item.Role != null) { - builder.attribute('role', item.Role!, - namespace: _opf_namespace); + builder.element('metadata', + namespaces: {_opf_namespace: 'opf', _dc_namespace: 'dc'}, nest: () { + meta! + ..Titles!.forEach((item) => + builder.element('title', nest: item, namespace: _dc_namespace)) + ..Creators!.forEach((item) => + builder.element('creator', namespace: _dc_namespace, nest: () { + if (item.Role != null) { + builder.attribute('role', item.Role!, + namespace: _opf_namespace); + } + if (item.FileAs != null) { + builder.attribute('file-as', item.FileAs!, + namespace: _opf_namespace); + } + builder.text(item.Creator!); + })) + ..Subjects!.forEach((item) => + builder.element('subject', namespace: _dc_namespace, nest: item)) + ..Publishers!.forEach((item) => + builder.element('publisher', namespace: _dc_namespace, nest: item)) + ..Contributors!.forEach((item) => + builder.element('contributor', namespace: _dc_namespace, nest: () { + if (item.Role != null) { + builder.attribute('role', item.Role!, + namespace: _opf_namespace); + } + if (item.FileAs != null) { + builder.attribute('file-as', item.FileAs!, + namespace: _opf_namespace); + } + builder.text(item.Contributor!); + })) + ..Dates!.forEach((date) => + builder.element('date', namespace: _dc_namespace, nest: () { + if (date.Event != null) { + builder.attribute('event', date.Event!, + namespace: _opf_namespace); + } + builder.text(date.Date!); + })) + ..Types!.forEach((type) => + builder.element('type', namespace: _dc_namespace, nest: type)) + ..Formats!.forEach((format) => + builder.element('format', namespace: _dc_namespace, nest: format)) + ..Identifiers!.forEach((id) => + builder.element('identifier', namespace: _dc_namespace, nest: () { + if (id.Id != null) builder.attribute('id', id.Id!); + if (id.Scheme != null) { + builder.attribute('scheme', id.Scheme!, + namespace: _opf_namespace); + } + builder.text(id.Identifier!); + })) + ..Sources!.forEach((item) => + builder.element('source', namespace: _dc_namespace, nest: item)) + ..Languages!.forEach((item) => + builder.element('language', namespace: _dc_namespace, nest: item)) + ..Relations!.forEach((item) => + builder.element('relation', namespace: _dc_namespace, nest: item)) + ..Coverages!.forEach((item) => + builder.element('coverage', namespace: _dc_namespace, nest: item)) + ..Rights!.forEach((item) => + builder.element('rights', namespace: _dc_namespace, nest: item)) + ..MetaItems!.forEach((metaitem) => builder.element('meta', nest: () { + if (version == EpubVersion.Epub2) { + if (metaitem.Name != null) { + builder.attribute('name', metaitem.Name!); } - if (item.FileAs != null) { - builder.attribute('file-as', item.FileAs!, - namespace: _opf_namespace); + if (metaitem.Content != null) { + builder.attribute('content', metaitem.Content!); } - builder.text(item.Creator!); - })) - ..Subjects!.forEach((item) => - builder.element('subject', namespace: _dc_namespace, nest: item)) - ..Publishers!.forEach((item) => builder.element('publisher', - namespace: _dc_namespace, nest: item)) - ..Contributors!.forEach((item) => builder - .element('contributor', namespace: _dc_namespace, nest: () { - if (item.Role != null) { - builder.attribute('role', item.Role!, - namespace: _opf_namespace); + } else if (version == EpubVersion.Epub3) { + if (metaitem.Id != null) { + builder.attribute('id', metaitem.Id!); } - if (item.FileAs != null) { - builder.attribute('file-as', item.FileAs!, - namespace: _opf_namespace); + if (metaitem.Refines != null) { + builder.attribute('refines', metaitem.Refines!); } - builder.text(item.Contributor!); - })) - ..Dates!.forEach((date) => - builder.element('date', namespace: _dc_namespace, nest: () { - if (date.Event != null) { - builder.attribute('event', date.Event!, - namespace: _opf_namespace); + if (metaitem.Property != null) { + builder.attribute('property', metaitem.Property!); } - builder.text(date.Date!); - })) - ..Types!.forEach((type) => - builder.element('type', namespace: _dc_namespace, nest: type)) - ..Formats! - .forEach((format) => builder.element('format', namespace: _dc_namespace, nest: format)) - ..Identifiers!.forEach((id) => builder.element('identifier', namespace: _dc_namespace, nest: () { - if (id.Id != null) builder.attribute('id', id.Id!); - if (id.Scheme != null) { - builder.attribute('scheme', id.Scheme!, - namespace: _opf_namespace); + if (metaitem.Scheme != null) { + builder.attribute('scheme', metaitem.Scheme!); } - builder.text(id.Identifier!); - })) - ..Sources!.forEach((item) => builder.element('source', namespace: _dc_namespace, nest: item)) - ..Languages!.forEach((item) => builder.element('language', namespace: _dc_namespace, nest: item)) - ..Relations!.forEach((item) => builder.element('relation', namespace: _dc_namespace, nest: item)) - ..Coverages!.forEach((item) => builder.element('coverage', namespace: _dc_namespace, nest: item)) - ..Rights!.forEach((item) => builder.element('rights', namespace: _dc_namespace, nest: item)) - ..MetaItems!.forEach((metaitem) => builder.element('meta', nest: () { - if (version == EpubVersion.Epub2) { - if (metaitem.Name != null) { - builder.attribute('name', metaitem.Name!); - } - if (metaitem.Content != null) { - builder.attribute('content', metaitem.Content!); - } - } else if (version == EpubVersion.Epub3) { - if (metaitem.Id != null) - builder.attribute('id', metaitem.Id!); - if (metaitem.Refines != null) { - builder.attribute('refines', metaitem.Refines!); - } - if (metaitem.Property != null) { - builder.attribute('property', metaitem.Property!); - } - if (metaitem.Scheme != null) { - builder.attribute('scheme', metaitem.Scheme!); - } - } - })); + } + })); - if (meta.Description != null) { - builder.element('description', - namespace: _dc_namespace, nest: meta.Description); - } - }); + if (meta.Description != null) { + builder.element('description', + namespace: _dc_namespace, nest: meta.Description); + } + }); } } diff --git a/lib/src/writers/epub_package_writer.dart b/lib/src/writers/epub_package_writer.dart index 70dbdb48..97fb4278 100644 --- a/lib/src/writers/epub_package_writer.dart +++ b/lib/src/writers/epub_package_writer.dart @@ -26,6 +26,6 @@ class EpubPackageWriter { EpubGuideWriter.writeGuide(builder, package.Guide); }); - return builder.build().toXmlString(pretty: false); + return builder.buildDocument().toXmlString(pretty: false); } } diff --git a/lib/src/writers/epub_spine_writer.dart b/lib/src/writers/epub_spine_writer.dart index 3d23636f..1987f1db 100644 --- a/lib/src/writers/epub_spine_writer.dart +++ b/lib/src/writers/epub_spine_writer.dart @@ -3,13 +3,13 @@ import 'package:xml/src/xml/builder.dart' show XmlBuilder; class EpubSpineWriter { static void writeSpine(XmlBuilder builder, EpubSpine spine) { - builder - ..element('spine', attributes: {'toc': spine.TableOfContents!}, nest: () { - spine.Items!.forEach((spineitem) => builder.element('itemref', - attributes: { - 'idref': spineitem.IdRef!, - 'linear': spineitem.IsLinear! ? 'no' : 'yes' - })); - }); + builder.element('spine', attributes: {'toc': spine.TableOfContents!}, + nest: () { + spine.Items!.forEach((spineitem) => builder.element('itemref', + attributes: { + 'idref': spineitem.IdRef!, + 'linear': spineitem.IsLinear! ? 'no' : 'yes' + })); + }); } } From e1dfe2cce5bed8fa1036a4a5ce325998b8fcc2ff Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Thu, 18 Apr 2024 14:02:47 +0200 Subject: [PATCH 05/24] Support split epub chapters --- lib/src/entities/epub_chapter.dart | 3 +++ lib/src/readers/chapter_reader.dart | 12 +++++++++++ lib/src/ref_entities/epub_chapter_ref.dart | 25 ++++++++++++++++++++++ 3 files changed, 40 insertions(+) diff --git a/lib/src/entities/epub_chapter.dart b/lib/src/entities/epub_chapter.dart index 1acfc37c..7a7d6b6c 100644 --- a/lib/src/entities/epub_chapter.dart +++ b/lib/src/entities/epub_chapter.dart @@ -7,12 +7,14 @@ class EpubChapter { String? Anchor; String? HtmlContent; List? SubChapters; + List OtherContentFileNames = []; @override int get hashCode { var objects = [ Title.hashCode, ContentFileName.hashCode, + OtherContentFileNames.hashCode, Anchor.hashCode, HtmlContent.hashCode, ...SubChapters?.map((subChapter) => subChapter.hashCode) ?? [0], @@ -27,6 +29,7 @@ class EpubChapter { } return Title == other.Title && ContentFileName == other.ContentFileName && + OtherContentFileNames == other.OtherContentFileNames && Anchor == other.Anchor && HtmlContent == other.HtmlContent && collections.listsEqual(SubChapters, other.SubChapters); diff --git a/lib/src/readers/chapter_reader.dart b/lib/src/readers/chapter_reader.dart index fe27b504..7c92e72b 100644 --- a/lib/src/readers/chapter_reader.dart +++ b/lib/src/readers/chapter_reader.dart @@ -45,6 +45,18 @@ class ChapterReader { chapterRef.Title = navigationPoint.NavigationLabels!.first.Text; chapterRef.SubChapters = getChaptersImpl(bookRef, navigationPoint.ChildNavigationPoints!); + if(chapterRef.ContentFileName!.contains('_split_')) { + var fileNamePart = chapterRef.ContentFileName!.split('_split_')[0]; + for (var fileName in bookRef.Content!.Html!.keys) { + if(fileName.contains(fileNamePart)) { + if (fileName == contentFileName) { + continue; + } + chapterRef.otherTextContentFileRefs.add(bookRef.Content!.Html![fileName]!); + chapterRef.OtherContentFileNames.add(fileName); + } + } + } result.add(chapterRef); }; diff --git a/lib/src/ref_entities/epub_chapter_ref.dart b/lib/src/ref_entities/epub_chapter_ref.dart index 4a0c8797..5d7dd8b2 100644 --- a/lib/src/ref_entities/epub_chapter_ref.dart +++ b/lib/src/ref_entities/epub_chapter_ref.dart @@ -6,12 +6,17 @@ import 'package:quiver/core.dart'; import 'epub_text_content_file_ref.dart'; class EpubChapterRef { + // Referece to Text content reader. EpubTextContentFileRef? epubTextContentFileRef; + // If the chapter is split into multiple files, this list contains the references to content readers of the other files. + List otherTextContentFileRefs = []; String? Title; String? ContentFileName; String? Anchor; List? SubChapters; + // If the chapter is split into multiple files, this list contains the names of the other files. + List OtherContentFileNames = []; EpubChapterRef(EpubTextContentFileRef? epubTextContentFileRef) { this.epubTextContentFileRef = epubTextContentFileRef; @@ -24,6 +29,10 @@ class EpubChapterRef { ContentFileName.hashCode, Anchor.hashCode, epubTextContentFileRef.hashCode, + OtherContentFileNames.hashCode, + Anchor.hashCode, + epubTextContentFileRef.hashCode, + otherTextContentFileRefs.hashCode, ...SubChapters?.map((subChapter) => subChapter.hashCode) ?? [0], ]; return hashObjects(objects); @@ -38,11 +47,27 @@ class EpubChapterRef { ContentFileName == other.ContentFileName && Anchor == other.Anchor && epubTextContentFileRef == other.epubTextContentFileRef && + OtherContentFileNames == other.OtherContentFileNames && + Anchor == other.Anchor && + epubTextContentFileRef == other.epubTextContentFileRef && + otherTextContentFileRefs == other.otherTextContentFileRefs && collections.listsEqual(SubChapters, other.SubChapters); } Future readHtmlContent() async { return epubTextContentFileRef!.readContentAsText(); + var contentFuture = epubTextContentFileRef!.readContentAsText(); + if (OtherContentFileNames.isNotEmpty) { + var allContentFutures = >[contentFuture]; + for (var otherContentFileRef in otherTextContentFileRefs) { + allContentFutures.add(otherContentFileRef.readContentAsText()); + } + return Future.wait(allContentFutures).then((List contents) { + return contents.join(''); + }); + } else { + return contentFuture; + } } @override From 0df2de87cbc6812f225e0d06b319f45f9659e2c1 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Thu, 18 Apr 2024 14:08:32 +0200 Subject: [PATCH 06/24] Fix merge issues --- lib/src/ref_entities/epub_chapter_ref.dart | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/lib/src/ref_entities/epub_chapter_ref.dart b/lib/src/ref_entities/epub_chapter_ref.dart index 5d7dd8b2..281b1473 100644 --- a/lib/src/ref_entities/epub_chapter_ref.dart +++ b/lib/src/ref_entities/epub_chapter_ref.dart @@ -27,8 +27,6 @@ class EpubChapterRef { var objects = [ Title.hashCode, ContentFileName.hashCode, - Anchor.hashCode, - epubTextContentFileRef.hashCode, OtherContentFileNames.hashCode, Anchor.hashCode, epubTextContentFileRef.hashCode, @@ -45,8 +43,6 @@ class EpubChapterRef { } return Title == other.Title && ContentFileName == other.ContentFileName && - Anchor == other.Anchor && - epubTextContentFileRef == other.epubTextContentFileRef && OtherContentFileNames == other.OtherContentFileNames && Anchor == other.Anchor && epubTextContentFileRef == other.epubTextContentFileRef && @@ -55,7 +51,6 @@ class EpubChapterRef { } Future readHtmlContent() async { - return epubTextContentFileRef!.readContentAsText(); var contentFuture = epubTextContentFileRef!.readContentAsText(); if (OtherContentFileNames.isNotEmpty) { var allContentFutures = >[contentFuture]; @@ -74,4 +69,4 @@ class EpubChapterRef { String toString() { return 'Title: $Title, Subchapter count: ${SubChapters!.length}'; } -} +} \ No newline at end of file From 4b13a5711734d47045a656bd0822b39492e65f1b Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Thu, 18 Apr 2024 14:10:42 +0200 Subject: [PATCH 07/24] Formatting fix --- lib/src/ref_entities/epub_chapter_ref.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/ref_entities/epub_chapter_ref.dart b/lib/src/ref_entities/epub_chapter_ref.dart index 281b1473..5e68e8af 100644 --- a/lib/src/ref_entities/epub_chapter_ref.dart +++ b/lib/src/ref_entities/epub_chapter_ref.dart @@ -69,4 +69,4 @@ class EpubChapterRef { String toString() { return 'Title: $Title, Subchapter count: ${SubChapters!.length}'; } -} \ No newline at end of file +} From 9279e1784ff9538bd872cde6d36bef4d49a7be06 Mon Sep 17 00:00:00 2001 From: jasmeet0817 Date: Sat, 9 Nov 2024 11:59:46 +0100 Subject: [PATCH 08/24] Fix a bug in split epub chapters --- lib/src/readers/chapter_reader.dart | 43 ++++++++++++++++++++--------- 1 file changed, 30 insertions(+), 13 deletions(-) diff --git a/lib/src/readers/chapter_reader.dart b/lib/src/readers/chapter_reader.dart index 7c92e72b..d7e6199a 100644 --- a/lib/src/readers/chapter_reader.dart +++ b/lib/src/readers/chapter_reader.dart @@ -8,18 +8,21 @@ class ChapterReader { if (bookRef.Schema!.Navigation == null) { return []; } - return getChaptersImpl( - bookRef, bookRef.Schema!.Navigation!.NavMap!.Points!); + var navigationPoints = bookRef.Schema!.Navigation!.NavMap!.Points!; + var unmappedChapters = getUnmappedChapters(bookRef, navigationPoints); + return getChaptersImpl(bookRef, navigationPoints, unmappedChapters); } static List getChaptersImpl( - EpubBookRef bookRef, List navigationPoints) { + EpubBookRef bookRef, + List navigationPoints, + List unmappedChapters, + ) { var result = []; - // navigationPoints.forEach((EpubNavigationPoint navigationPoint) { - for (var navigationPoint in navigationPoints){ + for (var navigationPoint in navigationPoints) { String? contentFileName; String? anchor; - if (navigationPoint.Content?.Source ==null) continue; + if (navigationPoint.Content?.Source == null) continue; var contentSourceAnchorCharIndex = navigationPoint.Content!.Source!.indexOf('#'); if (contentSourceAnchorCharIndex == -1) { @@ -43,23 +46,37 @@ class ChapterReader { chapterRef.ContentFileName = contentFileName; chapterRef.Anchor = anchor; chapterRef.Title = navigationPoint.NavigationLabels!.first.Text; - chapterRef.SubChapters = - getChaptersImpl(bookRef, navigationPoint.ChildNavigationPoints!); - if(chapterRef.ContentFileName!.contains('_split_')) { + chapterRef.SubChapters = getChaptersImpl( + bookRef, navigationPoint.ChildNavigationPoints!, unmappedChapters); + if (chapterRef.ContentFileName!.contains('_split_')) { var fileNamePart = chapterRef.ContentFileName!.split('_split_')[0]; - for (var fileName in bookRef.Content!.Html!.keys) { - if(fileName.contains(fileNamePart)) { + for (var fileName in unmappedChapters) { + if (fileName.contains(fileNamePart)) { if (fileName == contentFileName) { continue; } - chapterRef.otherTextContentFileRefs.add(bookRef.Content!.Html![fileName]!); + chapterRef.otherTextContentFileRefs + .add(bookRef.Content!.Html![fileName]!); chapterRef.OtherContentFileNames.add(fileName); } } } result.add(chapterRef); - }; + } + ; return result; } + + /// Sometimes chapters are split into multiple files, + /// but the split files are not listed in the navigation. + /// We need to find these files and add them to the chapter as [OtherContentFileNames]. + static List getUnmappedChapters( + EpubBookRef bookRef, List navigationPoints) { + var navigationFileNames = Set.from( + navigationPoints.map((point) => point.Content!.Source!)); + var allFileNames = Set.from(bookRef.Content!.Html!.keys); + + return allFileNames.difference(navigationFileNames).toList(); + } } From c3b997cb45ecabf2fb506047f2a0a0afefe5c510 Mon Sep 17 00:00:00 2001 From: jasmeet0817 Date: Sun, 10 Nov 2024 09:59:58 +0100 Subject: [PATCH 09/24] Check if the book has chapters split into files before merging splits --- lib/src/readers/chapter_reader.dart | 88 ++++++++++++++++++++++------- 1 file changed, 69 insertions(+), 19 deletions(-) diff --git a/lib/src/readers/chapter_reader.dart b/lib/src/readers/chapter_reader.dart index d7e6199a..24ee4e55 100644 --- a/lib/src/readers/chapter_reader.dart +++ b/lib/src/readers/chapter_reader.dart @@ -9,14 +9,19 @@ class ChapterReader { return []; } var navigationPoints = bookRef.Schema!.Navigation!.NavMap!.Points!; - var unmappedChapters = getUnmappedChapters(bookRef, navigationPoints); - return getChaptersImpl(bookRef, navigationPoints, unmappedChapters); + var navigationFileNames = getAllNavigationFileNames(navigationPoints); + var unmappedChapters = getUnmappedChapters(bookRef, navigationFileNames); + var hasChapterSplittingIntoFiles = + hasChapterSplittingInFiles(navigationFileNames); + return getChaptersImpl(bookRef, navigationPoints, unmappedChapters, + hasChapterSplittingIntoFiles); } static List getChaptersImpl( EpubBookRef bookRef, List navigationPoints, List unmappedChapters, + bool hasChapterSplittingIntoFiles, ) { var result = []; for (var navigationPoint in navigationPoints) { @@ -47,19 +52,12 @@ class ChapterReader { chapterRef.Anchor = anchor; chapterRef.Title = navigationPoint.NavigationLabels!.first.Text; chapterRef.SubChapters = getChaptersImpl( - bookRef, navigationPoint.ChildNavigationPoints!, unmappedChapters); - if (chapterRef.ContentFileName!.contains('_split_')) { - var fileNamePart = chapterRef.ContentFileName!.split('_split_')[0]; - for (var fileName in unmappedChapters) { - if (fileName.contains(fileNamePart)) { - if (fileName == contentFileName) { - continue; - } - chapterRef.otherTextContentFileRefs - .add(bookRef.Content!.Html![fileName]!); - chapterRef.OtherContentFileNames.add(fileName); - } - } + bookRef, + navigationPoint.ChildNavigationPoints!, + unmappedChapters, + hasChapterSplittingIntoFiles); + if (hasChapterSplittingIntoFiles) { + addSplitChaptersToRef(bookRef, chapterRef, unmappedChapters); } result.add(chapterRef); @@ -68,15 +66,67 @@ class ChapterReader { return result; } + static List getAllNavigationFileNames( + List points) { + var result = []; + for (var point in points) { + if (point.Content?.Source != null) { + result.add(point.Content!.Source!); + } + result + .addAll(getAllNavigationFileNames(point.ChildNavigationPoints ?? [])); + } + return result; + } + /// Sometimes chapters are split into multiple files, /// but the split files are not listed in the navigation. /// We need to find these files and add them to the chapter as [OtherContentFileNames]. static List getUnmappedChapters( - EpubBookRef bookRef, List navigationPoints) { - var navigationFileNames = Set.from( - navigationPoints.map((point) => point.Content!.Source!)); + EpubBookRef bookRef, List navigationFileNames) { var allFileNames = Set.from(bookRef.Content!.Html!.keys); + return allFileNames.difference(navigationFileNames.toSet()).toList(); + } + + /// This checks if the chapters are split into multiple files by + /// 1. Checking if the file names contain "_split_". + /// 2. Two chapters listed in the navigation file should not have the same file name part before "_split_". + static bool hasChapterSplittingInFiles(List navigationFileNames) { + var uniqueFileNameParts = {}; + for (var fileName in navigationFileNames) { + if (fileName.contains('_split_')) { + var baseName = fileName.split('_split_')[0]; + if (uniqueFileNameParts.contains(baseName)) { + return false; + } + uniqueFileNameParts.add(baseName); + } + } + return uniqueFileNameParts.isNotEmpty; + } + + static void addSplitChaptersToRef( + EpubBookRef bookRef, + EpubChapterRef chapterRef, + List unmappedChapters, + ) { + if (!chapterRef.ContentFileName!.contains('_split_')) { + return; + } + + var baseName = chapterRef.ContentFileName!.split('_split_')[0]; + var addedChapters = []; // List to store items for removal - return allFileNames.difference(navigationFileNames).toList(); + for (var fileName in unmappedChapters) { + if (fileName.contains(baseName) && + fileName != chapterRef.ContentFileName) { + chapterRef.otherTextContentFileRefs + .add(bookRef.Content!.Html![fileName]!); + chapterRef.OtherContentFileNames.add(fileName); + addedChapters.add(fileName); // Add to removal list + } + } + unmappedChapters + .removeWhere((fileName) => addedChapters.contains(fileName)); } } From 3b0b9961986235b44168d4f75e6e4123a575840f Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Wed, 27 Nov 2024 16:08:26 +0100 Subject: [PATCH 10/24] Decode file name exception should not cause exception --- lib/src/readers/chapter_reader.dart | 4 +++- lib/src/readers/content_reader.dart | 6 ++++-- lib/src/utils/file_name_decoder.dart | 7 +++++++ 3 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 lib/src/utils/file_name_decoder.dart diff --git a/lib/src/readers/chapter_reader.dart b/lib/src/readers/chapter_reader.dart index 24ee4e55..6a9fa77a 100644 --- a/lib/src/readers/chapter_reader.dart +++ b/lib/src/readers/chapter_reader.dart @@ -1,3 +1,5 @@ +import 'package:epubx/src/utils/file_name_decoder.dart'; + import '../ref_entities/epub_book_ref.dart'; import '../ref_entities/epub_chapter_ref.dart'; import '../ref_entities/epub_text_content_file_ref.dart'; @@ -39,7 +41,7 @@ class ChapterReader { anchor = navigationPoint.Content!.Source! .substring(contentSourceAnchorCharIndex + 1); } - contentFileName = Uri.decodeFull(contentFileName!); + contentFileName = decodeFileName(contentFileName!); EpubTextContentFileRef? htmlContentFileRef; if (!bookRef.Content!.Html!.containsKey(contentFileName)) { throw Exception( diff --git a/lib/src/readers/content_reader.dart b/lib/src/readers/content_reader.dart index 78d0e7cf..53ef235b 100644 --- a/lib/src/readers/content_reader.dart +++ b/lib/src/readers/content_reader.dart @@ -1,3 +1,5 @@ +import 'package:epubx/src/utils/file_name_decoder.dart'; + import '../entities/epub_content_type.dart'; import '../ref_entities/epub_book_ref.dart'; import '../ref_entities/epub_byte_content_file_ref.dart'; @@ -30,7 +32,7 @@ class ContentReader { case EpubContentType.DTBOOK_NCX: var epubTextContentFile = EpubTextContentFileRef(bookRef); { - epubTextContentFile.FileName = Uri.decodeFull(fileName!); + epubTextContentFile.FileName = decodeFileName(fileName!); epubTextContentFile.ContentMimeType = contentMimeType; epubTextContentFile.ContentType = contentType; } @@ -62,7 +64,7 @@ class ContentReader { default: var epubByteContentFile = EpubByteContentFileRef(bookRef); { - epubByteContentFile.FileName = Uri.decodeFull(fileName!); + epubByteContentFile.FileName = decodeFileName(fileName!); epubByteContentFile.ContentMimeType = contentMimeType; epubByteContentFile.ContentType = contentType; } diff --git a/lib/src/utils/file_name_decoder.dart b/lib/src/utils/file_name_decoder.dart new file mode 100644 index 00000000..aec27b8f --- /dev/null +++ b/lib/src/utils/file_name_decoder.dart @@ -0,0 +1,7 @@ +String decodeFileName(String incomingFileName) { + try { + return Uri.decodeFull(incomingFileName); + } catch (e) { + return incomingFileName; + } +} From b5e78bd86dc41044e812112bcfe97633390d26b0 Mon Sep 17 00:00:00 2001 From: jasmeet0817 Date: Sun, 7 Jul 2024 22:46:30 +0200 Subject: [PATCH 11/24] Deterministic hash in epubx --- lib/src/ref_entities/epub_book_ref.dart | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/lib/src/ref_entities/epub_book_ref.dart b/lib/src/ref_entities/epub_book_ref.dart index 7ddd4b1a..274fc549 100644 --- a/lib/src/ref_entities/epub_book_ref.dart +++ b/lib/src/ref_entities/epub_book_ref.dart @@ -35,6 +35,14 @@ class EpubBookRef { return hashObjects(objects); } + int get deterministicHash { + var objects = [ + Title.hashCode, + Author.hashCode, + ]; + return hashObjects(objects); + } + @override bool operator ==(other) { if (!(other is EpubBookRef)) { From f62b4ce1cf2ccf5ae1aa353b57323615c846f9e3 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Thu, 28 Nov 2024 17:14:19 +0100 Subject: [PATCH 12/24] Epub v3 fixes --- .../flutter_ex/ios/Runner.xcodeproj/project.pbxproj | 12 ------------ lib/src/readers/book_cover_reader.dart | 13 +++++++++---- lib/src/readers/navigation_reader.dart | 12 ++++++++---- lib/src/readers/package_reader.dart | 8 +++++++- pubspec.yaml | 1 + 5 files changed, 25 insertions(+), 21 deletions(-) diff --git a/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj b/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj index 39715e88..1978b7aa 100644 --- a/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj +++ b/example/flutter_ex/ios/Runner.xcodeproj/project.pbxproj @@ -275,11 +275,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; -<<<<<<< HEAD - IPHONEOS_DEPLOYMENT_TARGET = 9.0; -======= IPHONEOS_DEPLOYMENT_TARGET = 11.0; ->>>>>>> new MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; @@ -353,11 +349,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; -<<<<<<< HEAD - IPHONEOS_DEPLOYMENT_TARGET = 9.0; -======= IPHONEOS_DEPLOYMENT_TARGET = 11.0; ->>>>>>> new MTL_ENABLE_DEBUG_INFO = YES; ONLY_ACTIVE_ARCH = YES; SDKROOT = iphoneos; @@ -406,11 +398,7 @@ GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; GCC_WARN_UNUSED_FUNCTION = YES; GCC_WARN_UNUSED_VARIABLE = YES; -<<<<<<< HEAD - IPHONEOS_DEPLOYMENT_TARGET = 9.0; -======= IPHONEOS_DEPLOYMENT_TARGET = 11.0; ->>>>>>> new MTL_ENABLE_DEBUG_INFO = NO; SDKROOT = iphoneos; SUPPORTED_PLATFORMS = iphoneos; diff --git a/lib/src/readers/book_cover_reader.dart b/lib/src/readers/book_cover_reader.dart index 1eba1547..c4b5158b 100644 --- a/lib/src/readers/book_cover_reader.dart +++ b/lib/src/readers/book_cover_reader.dart @@ -3,6 +3,7 @@ import 'dart:typed_data'; import 'package:collection/collection.dart' show IterableExtension; import 'package:image/image.dart' as images; +import 'package:logger/logger.dart'; import '../ref_entities/epub_book_ref.dart'; import '../ref_entities/epub_byte_content_file_ref.dart'; @@ -10,6 +11,8 @@ import '../schema/opf/epub_manifest_item.dart'; import '../schema/opf/epub_metadata_meta.dart'; class BookCoverReader { + static final logger = Logger(); + static Future readBookCover(EpubBookRef bookRef) async { var metaItems = bookRef.Schema!.Package!.Metadata!.MetaItems; if (metaItems == null || metaItems.isEmpty) return null; @@ -19,8 +22,8 @@ class BookCoverReader { metaItem.Name != null && metaItem.Name!.toLowerCase() == 'cover'); if (coverMetaItem == null) return null; if (coverMetaItem.Content == null || coverMetaItem.Content!.isEmpty) { - throw Exception( - 'Incorrect EPUB metadata: cover item content is missing.'); + logger.e('Incorrect EPUB metadata: cover item content is missing.'); + return null; } var coverManifestItem = bookRef.Schema!.Package!.Manifest!.Items! @@ -28,14 +31,16 @@ class BookCoverReader { manifestItem.Id!.toLowerCase() == coverMetaItem.Content!.toLowerCase()); if (coverManifestItem == null) { - throw Exception( + logger.e( 'Incorrect EPUB manifest: item with ID = \"${coverMetaItem.Content}\" is missing.'); + return null; } EpubByteContentFileRef? coverImageContentFileRef; if (!bookRef.Content!.Images!.containsKey(coverManifestItem.Href)) { - throw Exception( + logger.e( 'Incorrect EPUB manifest: item with href = \"${coverManifestItem.Href}\" is missing.'); + return null; } coverImageContentFileRef = bookRef.Content!.Images![coverManifestItem.Href]; diff --git a/lib/src/readers/navigation_reader.dart b/lib/src/readers/navigation_reader.dart index a7fc47e9..becfeabe 100644 --- a/lib/src/readers/navigation_reader.dart +++ b/lib/src/readers/navigation_reader.dart @@ -160,10 +160,14 @@ class NavigationReader { 'EPUB parsing error: TOC file $_tocFileEntryPath not found in archive.'); } //Get relative toc file path - _tocFileEntryPath = ((_tocFileEntryPath!.split('/')..removeLast()) - ..removeAt(0)) - .join('/') + - '/'; + if (_tocFileEntryPath!.contains('/')) { + _tocFileEntryPath = ((_tocFileEntryPath!.split('/')..removeLast()) + ..removeAt(0)) + .join('/') + + '/'; + } else { + _tocFileEntryPath = '.'; + } var containerDocument = xml.XmlDocument.parse(convert.utf8.decode(tocFileEntry.content)); diff --git a/lib/src/readers/package_reader.dart b/lib/src/readers/package_reader.dart index 59153a59..7ca81c1e 100644 --- a/lib/src/readers/package_reader.dart +++ b/lib/src/readers/package_reader.dart @@ -290,6 +290,7 @@ class PackageReader { XmlElement metadataMetaNode) { var result = EpubMetadataMeta(); result.Attributes = {}; + result.Content = metadataMetaNode.value ?? metadataMetaNode.innerText; metadataMetaNode.attributes .forEach((XmlAttribute metadataMetaNodeAttribute) { var attributeValue = metadataMetaNodeAttribute.value; @@ -308,9 +309,14 @@ class PackageReader { case 'scheme': result.Scheme = attributeValue; break; + case 'name': + result.Name = attributeValue; + break; + case 'content': + result.Content = attributeValue; + break; } }); - result.Content = metadataMetaNode.text; return result; } diff --git a/pubspec.yaml b/pubspec.yaml index f1cc62cf..8a2a4c9f 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -13,6 +13,7 @@ dependencies: xml: ^6.0.1 image: ^4.0.17 collection: ^1.15.0 + logger: ^1.3.0 dev_dependencies: test: ^1.16.7 From bb865c50c34caafa931a4282ceb722d260eea011 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Thu, 28 Nov 2024 20:02:20 +0100 Subject: [PATCH 13/24] Compress images --- .flutter-plugins | 6 ++++++ .flutter-plugins-dependencies | 1 + lib/src/epub_reader.dart | 20 +++++++++---------- lib/src/readers/book_cover_reader.dart | 2 +- .../epub_byte_content_file_ref.dart | 6 ------ .../ref_entities/epub_content_file_ref.dart | 10 ++++++---- lib/src/utils/image_compressor.dart | 12 +++++++++++ pubspec.yaml | 1 + 8 files changed, 37 insertions(+), 21 deletions(-) create mode 100644 .flutter-plugins create mode 100644 .flutter-plugins-dependencies create mode 100644 lib/src/utils/image_compressor.dart diff --git a/.flutter-plugins b/.flutter-plugins new file mode 100644 index 00000000..8d5602ec --- /dev/null +++ b/.flutter-plugins @@ -0,0 +1,6 @@ +# This is a generated file; do not edit or check into version control. +flutter_image_compress=/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress-2.3.0/ +flutter_image_compress_common=/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/ +flutter_image_compress_macos=/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_macos-1.0.2/ +flutter_image_compress_ohos=/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_ohos-0.0.3/ +flutter_image_compress_web=/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_web-0.1.4+1/ diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies new file mode 100644 index 00000000..e7ca1217 --- /dev/null +++ b/.flutter-plugins-dependencies @@ -0,0 +1 @@ +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_image_compress_common","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_image_compress_common","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/","native_build":true,"dependencies":[]}],"macos":[{"name":"flutter_image_compress_macos","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_macos-1.0.2/","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"flutter_image_compress_web","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_web-0.1.4+1/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_image_compress","dependencies":["flutter_image_compress_common","flutter_image_compress_web","flutter_image_compress_macos","flutter_image_compress_ohos"]},{"name":"flutter_image_compress_common","dependencies":[]},{"name":"flutter_image_compress_macos","dependencies":[]},{"name":"flutter_image_compress_ohos","dependencies":[]},{"name":"flutter_image_compress_web","dependencies":[]}],"date_created":"2024-11-28 18:54:01.055505","version":"3.24.5","swift_package_manager_enabled":false} \ No newline at end of file diff --git a/lib/src/epub_reader.dart b/lib/src/epub_reader.dart index 0835fb31..ec90e3b3 100644 --- a/lib/src/epub_reader.dart +++ b/lib/src/epub_reader.dart @@ -1,22 +1,14 @@ import 'dart:async'; import 'package:archive/archive.dart'; +import 'package:epubx/epubx.dart'; -import 'entities/epub_book.dart'; -import 'entities/epub_byte_content_file.dart'; -import 'entities/epub_chapter.dart'; -import 'entities/epub_content.dart'; -import 'entities/epub_content_file.dart'; -import 'entities/epub_text_content_file.dart'; import 'readers/content_reader.dart'; import 'readers/schema_reader.dart'; -import 'ref_entities/epub_book_ref.dart'; import 'ref_entities/epub_byte_content_file_ref.dart'; -import 'ref_entities/epub_chapter_ref.dart'; import 'ref_entities/epub_content_file_ref.dart'; import 'ref_entities/epub_content_ref.dart'; import 'ref_entities/epub_text_content_file_ref.dart'; -import 'schema/opf/epub_metadata_creator.dart'; /// A class that provides the primary interface to read Epub files. /// @@ -159,7 +151,15 @@ class EpubReader { result.FileName = contentFileRef.FileName; result.ContentType = contentFileRef.ContentType; result.ContentMimeType = contentFileRef.ContentMimeType; - result.Content = await contentFileRef.readContentAsBytes(); + + var isImage = [ + EpubContentType.IMAGE_JPEG, + EpubContentType.IMAGE_PNG, + EpubContentType.IMAGE_GIF, + EpubContentType.IMAGE_BMP, + EpubContentType.IMAGE_SVG + ].contains(result.ContentType); + result.Content = await contentFileRef.readContentAsBytes(isImage); return result; } diff --git a/lib/src/readers/book_cover_reader.dart b/lib/src/readers/book_cover_reader.dart index c4b5158b..3b8629dc 100644 --- a/lib/src/readers/book_cover_reader.dart +++ b/lib/src/readers/book_cover_reader.dart @@ -45,7 +45,7 @@ class BookCoverReader { coverImageContentFileRef = bookRef.Content!.Images![coverManifestItem.Href]; var coverImageContent = - await coverImageContentFileRef!.readContentAsBytes(); + await coverImageContentFileRef!.readContentAsBytes(true); var retval = images.decodeImage(Uint8List.fromList(coverImageContent)); return retval; } diff --git a/lib/src/ref_entities/epub_byte_content_file_ref.dart b/lib/src/ref_entities/epub_byte_content_file_ref.dart index 85a2792d..1c13f477 100644 --- a/lib/src/ref_entities/epub_byte_content_file_ref.dart +++ b/lib/src/ref_entities/epub_byte_content_file_ref.dart @@ -1,12 +1,6 @@ -import 'dart:async'; - import 'epub_book_ref.dart'; import 'epub_content_file_ref.dart'; class EpubByteContentFileRef extends EpubContentFileRef { EpubByteContentFileRef(EpubBookRef epubBookRef) : super(epubBookRef); - - Future> readContent() { - return readContentAsBytes(); - } } diff --git a/lib/src/ref_entities/epub_content_file_ref.dart b/lib/src/ref_entities/epub_content_file_ref.dart index 178b3bf2..67fcdfcf 100644 --- a/lib/src/ref_entities/epub_content_file_ref.dart +++ b/lib/src/ref_entities/epub_content_file_ref.dart @@ -4,6 +4,7 @@ import 'dart:typed_data'; import 'package:archive/archive.dart'; import 'package:collection/collection.dart' show IterableExtension; +import 'package:epubx/src/utils/image_compressor.dart'; import 'package:quiver/core.dart'; import '../entities/epub_content_type.dart'; @@ -54,18 +55,19 @@ abstract class EpubContentFileRef { } List openContentStream(ArchiveFile contentFileEntry) { - var contentStream = []; if (contentFileEntry.content == null) { throw Exception( 'Incorrect EPUB file: content file \"$FileName\" specified in manifest is not found.'); } - contentStream.addAll(contentFileEntry.content); - return contentStream; + return contentFileEntry.content; } - Future readContentAsBytes() async { + Future readContentAsBytes(bool isImage) async { var contentFileEntry = getContentFileEntry(); var content = openContentStream(contentFileEntry); + if (isImage) { + return compressImage(content); + } return Uint8List.fromList(content); } diff --git a/lib/src/utils/image_compressor.dart b/lib/src/utils/image_compressor.dart new file mode 100644 index 00000000..b23c2922 --- /dev/null +++ b/lib/src/utils/image_compressor.dart @@ -0,0 +1,12 @@ +import 'dart:typed_data'; + +import 'package:flutter_image_compress/flutter_image_compress.dart'; + +Future compressImage(List originalImageData) async { + return await FlutterImageCompress.compressWithList( + Uint8List.fromList(originalImageData), + quality: 12, + minWidth: 400, + minHeight: 400, + ); +} diff --git a/pubspec.yaml b/pubspec.yaml index 8a2a4c9f..a0898f5e 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,6 +14,7 @@ dependencies: image: ^4.0.17 collection: ^1.15.0 logger: ^1.3.0 + flutter_image_compress: ^2.3.0 dev_dependencies: test: ^1.16.7 From 9b7f0f5c5e5563df6a1812d63c49eee320d6a930 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Thu, 28 Nov 2024 20:36:56 +0100 Subject: [PATCH 14/24] If you can't compress, don't --- lib/src/utils/image_compressor.dart | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/lib/src/utils/image_compressor.dart b/lib/src/utils/image_compressor.dart index b23c2922..c8015e36 100644 --- a/lib/src/utils/image_compressor.dart +++ b/lib/src/utils/image_compressor.dart @@ -1,12 +1,18 @@ import 'dart:typed_data'; import 'package:flutter_image_compress/flutter_image_compress.dart'; +import 'package:logger/logger.dart'; Future compressImage(List originalImageData) async { - return await FlutterImageCompress.compressWithList( - Uint8List.fromList(originalImageData), - quality: 12, - minWidth: 400, - minHeight: 400, - ); + try { + return await FlutterImageCompress.compressWithList( + Uint8List.fromList(originalImageData), + quality: 12, + minWidth: 400, + minHeight: 400, + ); + } catch (e) { + Logger().e('Error compressing image: $e'); + return Future.value(Uint8List.fromList(originalImageData)); + } } From 9af6224ec3299d8a3d37719202eadb2859c8abc4 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Fri, 29 Nov 2024 18:57:59 +0100 Subject: [PATCH 15/24] Epub v3 nav fix --- lib/src/readers/navigation_reader.dart | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/src/readers/navigation_reader.dart b/lib/src/readers/navigation_reader.dart index becfeabe..daa5b534 100644 --- a/lib/src/readers/navigation_reader.dart +++ b/lib/src/readers/navigation_reader.dart @@ -162,7 +162,8 @@ class NavigationReader { //Get relative toc file path if (_tocFileEntryPath!.contains('/')) { _tocFileEntryPath = ((_tocFileEntryPath!.split('/')..removeLast()) - ..removeAt(0)) + // ..removeAt(0) + ) .join('/') + '/'; } else { From cbd96e67d645fbbeac4928d837dea726ef6e4af6 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Fri, 29 Nov 2024 19:49:54 +0100 Subject: [PATCH 16/24] Yet another tocEntryPath fix --- lib/src/readers/navigation_reader.dart | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/lib/src/readers/navigation_reader.dart b/lib/src/readers/navigation_reader.dart index daa5b534..9f2cb2e2 100644 --- a/lib/src/readers/navigation_reader.dart +++ b/lib/src/readers/navigation_reader.dart @@ -161,9 +161,10 @@ class NavigationReader { } //Get relative toc file path if (_tocFileEntryPath!.contains('/')) { - _tocFileEntryPath = ((_tocFileEntryPath!.split('/')..removeLast()) - // ..removeAt(0) - ) + _tocFileEntryPath = ((_tocFileEntryPath! + .replaceFirst(contentDirectoryPath, '') + .split('/') + ..removeLast())) .join('/') + '/'; } else { From ac39e06ee160ac2d9ce690901ea613a211507d49 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Fri, 29 Nov 2024 20:34:13 +0100 Subject: [PATCH 17/24] A better Book cover reader --- lib/src/readers/book_cover_reader.dart | 40 +++++++++++++++++++------- 1 file changed, 29 insertions(+), 11 deletions(-) diff --git a/lib/src/readers/book_cover_reader.dart b/lib/src/readers/book_cover_reader.dart index 3b8629dc..d318445b 100644 --- a/lib/src/readers/book_cover_reader.dart +++ b/lib/src/readers/book_cover_reader.dart @@ -16,23 +16,41 @@ class BookCoverReader { static Future readBookCover(EpubBookRef bookRef) async { var metaItems = bookRef.Schema!.Package!.Metadata!.MetaItems; if (metaItems == null || metaItems.isEmpty) return null; - var coverMetaItem = metaItems.firstWhereOrNull( (EpubMetadataMeta metaItem) => metaItem.Name != null && metaItem.Name!.toLowerCase() == 'cover'); - if (coverMetaItem == null) return null; - if (coverMetaItem.Content == null || coverMetaItem.Content!.isEmpty) { - logger.e('Incorrect EPUB metadata: cover item content is missing.'); - return null; + var coverManifestId; + var coverManifestSearchId = 'cover'; + if (coverMetaItem != null && + coverMetaItem.Content != null && + coverMetaItem.Content!.isNotEmpty) { + coverManifestId = coverMetaItem.Content!.toLowerCase(); + } else { + logger.e('Cover id is not in manifest.'); + } + var coverManifestItem; + if (coverManifestId != null) { + coverManifestItem = bookRef.Schema!.Package!.Manifest!.Items! + .firstWhereOrNull((EpubManifestItem manifestItem) => + manifestItem.Id!.toLowerCase() == coverManifestId); + } + // If manifest item with cover id is not found, search for item with text "cover" in id + if (coverManifestItem == null) { + var coverManifestItems = bookRef.Schema!.Package!.Manifest!.Items! + .where((EpubManifestItem manifestItem) => + manifestItem.Id!.toLowerCase().contains(coverManifestSearchId)) + .toList(); + if (coverManifestItems.length == 1) { + coverManifestItem = coverManifestItems.first; + } else { + coverManifestItem = coverManifestItems.firstWhereOrNull( + (EpubManifestItem manifestItem) => + manifestItem.MediaType?.contains('image') ?? false); + } } - - var coverManifestItem = bookRef.Schema!.Package!.Manifest!.Items! - .firstWhereOrNull((EpubManifestItem manifestItem) => - manifestItem.Id!.toLowerCase() == - coverMetaItem.Content!.toLowerCase()); if (coverManifestItem == null) { logger.e( - 'Incorrect EPUB manifest: item with ID = \"${coverMetaItem.Content}\" is missing.'); + 'Incorrect EPUB manifest: item with ID = \"$coverManifestId\" is missing.'); return null; } From f6f13bf8fa97f532b48f9868e8372e79746a95fa Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Mon, 9 Dec 2024 09:31:50 +0100 Subject: [PATCH 18/24] 25% quality for images --- lib/src/utils/image_compressor.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/src/utils/image_compressor.dart b/lib/src/utils/image_compressor.dart index c8015e36..f8455ef7 100644 --- a/lib/src/utils/image_compressor.dart +++ b/lib/src/utils/image_compressor.dart @@ -7,7 +7,7 @@ Future compressImage(List originalImageData) async { try { return await FlutterImageCompress.compressWithList( Uint8List.fromList(originalImageData), - quality: 12, + quality: 25, minWidth: 400, minHeight: 400, ); From b478875d0529e896361f446a4478a6c393a1a7ad Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Mon, 23 Dec 2024 16:29:46 +0100 Subject: [PATCH 19/24] Adaptive immage compression based on book size --- .flutter-plugins-dependencies | 2 +- lib/src/epub_reader.dart | 36 +++++++++++++----- lib/src/ref_entities/book_size.dart | 37 +++++++++++++++++++ .../ref_entities/epub_content_file_ref.dart | 5 ++- lib/src/utils/image_compressor.dart | 5 ++- pubspec.yaml | 2 +- 6 files changed, 71 insertions(+), 16 deletions(-) create mode 100644 lib/src/ref_entities/book_size.dart diff --git a/.flutter-plugins-dependencies b/.flutter-plugins-dependencies index e7ca1217..9881206f 100644 --- a/.flutter-plugins-dependencies +++ b/.flutter-plugins-dependencies @@ -1 +1 @@ -{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_image_compress_common","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_image_compress_common","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/","native_build":true,"dependencies":[]}],"macos":[{"name":"flutter_image_compress_macos","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_macos-1.0.2/","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"flutter_image_compress_web","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_web-0.1.4+1/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_image_compress","dependencies":["flutter_image_compress_common","flutter_image_compress_web","flutter_image_compress_macos","flutter_image_compress_ohos"]},{"name":"flutter_image_compress_common","dependencies":[]},{"name":"flutter_image_compress_macos","dependencies":[]},{"name":"flutter_image_compress_ohos","dependencies":[]},{"name":"flutter_image_compress_web","dependencies":[]}],"date_created":"2024-11-28 18:54:01.055505","version":"3.24.5","swift_package_manager_enabled":false} \ No newline at end of file +{"info":"This is a generated file; do not edit or check into version control.","plugins":{"ios":[{"name":"flutter_image_compress_common","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/","native_build":true,"dependencies":[]}],"android":[{"name":"flutter_image_compress_common","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_common-1.0.5/","native_build":true,"dependencies":[]}],"macos":[{"name":"flutter_image_compress_macos","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_macos-1.0.2/","native_build":true,"dependencies":[]}],"linux":[],"windows":[],"web":[{"name":"flutter_image_compress_web","path":"/home/jesse/.pub-cache/hosted/pub.dev/flutter_image_compress_web-0.1.4+1/","dependencies":[]}]},"dependencyGraph":[{"name":"flutter_image_compress","dependencies":["flutter_image_compress_common","flutter_image_compress_web","flutter_image_compress_macos","flutter_image_compress_ohos"]},{"name":"flutter_image_compress_common","dependencies":[]},{"name":"flutter_image_compress_macos","dependencies":[]},{"name":"flutter_image_compress_ohos","dependencies":[]},{"name":"flutter_image_compress_web","dependencies":[]}],"date_created":"2024-12-23 10:21:31.746835","version":"3.24.3","swift_package_manager_enabled":false} \ No newline at end of file diff --git a/lib/src/epub_reader.dart b/lib/src/epub_reader.dart index ec90e3b3..07e0a816 100644 --- a/lib/src/epub_reader.dart +++ b/lib/src/epub_reader.dart @@ -2,6 +2,7 @@ import 'dart:async'; import 'package:archive/archive.dart'; import 'package:epubx/epubx.dart'; +import 'package:epubx/src/ref_entities/book_size.dart'; import 'readers/content_reader.dart'; import 'readers/schema_reader.dart'; @@ -74,12 +75,13 @@ class EpubReader { loadedBytes = bytes; } + final bookSize = BookSize.fromByteLength(loadedBytes.length); var epubBookRef = await openBook(loadedBytes); result.Schema = epubBookRef.Schema; result.Title = epubBookRef.Title; result.AuthorList = epubBookRef.AuthorList; result.Author = epubBookRef.Author; - result.Content = await readContent(epubBookRef.Content!); + result.Content = await readContent(epubBookRef.Content!, bookSize); result.CoverImage = await epubBookRef.readCover(); var chapterRefs = await epubBookRef.getChapters(); result.Chapters = await readChapters(chapterRefs); @@ -87,12 +89,19 @@ class EpubReader { return result; } - static Future readContent(EpubContentRef contentRef) async { + static Future readContent( + EpubContentRef contentRef, BookSize bookSize) async { var result = EpubContent(); result.Html = await readTextContentFiles(contentRef.Html!); result.Css = await readTextContentFiles(contentRef.Css!); - result.Images = await readByteContentFiles(contentRef.Images!); - result.Fonts = await readByteContentFiles(contentRef.Fonts!); + if (bookSize == BookSize.EXTREMELY_LARGE) { + result.Images = {}; + } else { + result.Images = await readByteContentFiles(contentRef.Images!, + imageCompressionRate: bookSize.getImageCompressionRate()); + } + result.Fonts = await readByteContentFiles(contentRef.Fonts!, + imageCompressionRate: bookSize.getImageCompressionRate()); result.AllFiles = {}; result.Html!.forEach((String? key, EpubTextContentFile value) { @@ -111,8 +120,9 @@ class EpubReader { await Future.forEach(contentRef.AllFiles!.keys, (dynamic key) async { if (!result.AllFiles!.containsKey(key)) { - result.AllFiles![key] = - await readByteContentFile(contentRef.AllFiles![key]!); + result.AllFiles![key] = await readByteContentFile( + contentRef.AllFiles![key]!, + imageCompressionRate: bookSize.getImageCompressionRate()); } }); @@ -136,16 +146,19 @@ class EpubReader { } static Future> readByteContentFiles( - Map byteContentFileRefs) async { + Map byteContentFileRefs, + {int imageCompressionRate = 25}) async { var result = {}; await Future.forEach(byteContentFileRefs.keys, (dynamic key) async { - result[key] = await readByteContentFile(byteContentFileRefs[key]!); + result[key] = await readByteContentFile(byteContentFileRefs[key]!, + imageCompressionRate: imageCompressionRate); }); return result; } static Future readByteContentFile( - EpubContentFileRef contentFileRef) async { + EpubContentFileRef contentFileRef, + {int imageCompressionRate = 25}) async { var result = EpubByteContentFile(); result.FileName = contentFileRef.FileName; @@ -159,7 +172,10 @@ class EpubReader { EpubContentType.IMAGE_BMP, EpubContentType.IMAGE_SVG ].contains(result.ContentType); - result.Content = await contentFileRef.readContentAsBytes(isImage); + result.Content = await contentFileRef.readContentAsBytes( + isImage, + imageCompressionRate: imageCompressionRate, + ); return result; } diff --git a/lib/src/ref_entities/book_size.dart b/lib/src/ref_entities/book_size.dart new file mode 100644 index 00000000..b286f480 --- /dev/null +++ b/lib/src/ref_entities/book_size.dart @@ -0,0 +1,37 @@ +enum BookSize { + EXTREMELY_LARGE, + VERY_LARGE, + LARGE, + MEDIUM, + SMALL; + + static BookSize fromByteLength(int size) { + final sizeInMB = size / 1024 / 1024; + if (sizeInMB >= 60) { + return BookSize.EXTREMELY_LARGE; + } else if (sizeInMB >= 30) { + return BookSize.VERY_LARGE; + } else if (sizeInMB >= 10) { + return BookSize.LARGE; + } else if (sizeInMB >= 5) { + return BookSize.MEDIUM; + } else { + return BookSize.SMALL; + } + } + + int getImageCompressionRate() { + switch (this) { + case BookSize.EXTREMELY_LARGE: + return 5; + case BookSize.VERY_LARGE: + return 12; + case BookSize.LARGE: + return 25; + case BookSize.MEDIUM: + return 30; + case BookSize.SMALL: + return 50; + } + } +} diff --git a/lib/src/ref_entities/epub_content_file_ref.dart b/lib/src/ref_entities/epub_content_file_ref.dart index 67fcdfcf..c480d71c 100644 --- a/lib/src/ref_entities/epub_content_file_ref.dart +++ b/lib/src/ref_entities/epub_content_file_ref.dart @@ -62,11 +62,12 @@ abstract class EpubContentFileRef { return contentFileEntry.content; } - Future readContentAsBytes(bool isImage) async { + Future readContentAsBytes(bool isImage, + {int imageCompressionRate = 25}) async { var contentFileEntry = getContentFileEntry(); var content = openContentStream(contentFileEntry); if (isImage) { - return compressImage(content); + return compressImage(content, imageCompressionRate); } return Uint8List.fromList(content); } diff --git a/lib/src/utils/image_compressor.dart b/lib/src/utils/image_compressor.dart index f8455ef7..d3037b96 100644 --- a/lib/src/utils/image_compressor.dart +++ b/lib/src/utils/image_compressor.dart @@ -3,11 +3,12 @@ import 'dart:typed_data'; import 'package:flutter_image_compress/flutter_image_compress.dart'; import 'package:logger/logger.dart'; -Future compressImage(List originalImageData) async { +Future compressImage( + List originalImageData, int imageCompressionRate) async { try { return await FlutterImageCompress.compressWithList( Uint8List.fromList(originalImageData), - quality: 25, + quality: imageCompressionRate, minWidth: 400, minHeight: 400, ); diff --git a/pubspec.yaml b/pubspec.yaml index a0898f5e..4489e570 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -5,7 +5,7 @@ issue_tracker: https://github.com/rbcprolabs/epubx.dart version: 4.0.1 environment: - sdk: ">=2.12.0 <4.0.0" + sdk: ">=2.17.0 <4.0.0" dependencies: archive: ^3.1.6 From bd87b3ade5087bbeb0f2f5a969646b98795e0766 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Sun, 29 Dec 2024 11:26:37 +0100 Subject: [PATCH 20/24] Export book_size --- lib/epubx.dart | 1 + lib/src/ref_entities/book_size.dart | 2 ++ 2 files changed, 3 insertions(+) diff --git a/lib/epubx.dart b/lib/epubx.dart index c5127f2c..02be71a3 100644 --- a/lib/epubx.dart +++ b/lib/epubx.dart @@ -6,6 +6,7 @@ export 'src/epub_reader.dart'; export 'src/epub_writer.dart'; export 'src/ref_entities/epub_book_ref.dart'; export 'src/ref_entities/epub_chapter_ref.dart'; +export 'src/ref_entities/book_size.dart'; export 'src/entities/epub_book.dart'; export 'src/entities/epub_chapter.dart'; export 'src/entities/epub_content.dart'; diff --git a/lib/src/ref_entities/book_size.dart b/lib/src/ref_entities/book_size.dart index b286f480..cd553647 100644 --- a/lib/src/ref_entities/book_size.dart +++ b/lib/src/ref_entities/book_size.dart @@ -20,6 +20,8 @@ enum BookSize { } } + get isTooLarge => this == BookSize.EXTREMELY_LARGE; + int getImageCompressionRate() { switch (this) { case BookSize.EXTREMELY_LARGE: From 039ec51eb1127ba1847bc9403322e8fc23ac47f6 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Sun, 29 Dec 2024 12:56:59 +0100 Subject: [PATCH 21/24] Don't throw exception if files are not found --- lib/src/epub_reader.dart | 18 +++++++++++++----- lib/src/readers/book_cover_reader.dart | 13 +++++++++---- .../ref_entities/epub_content_file_ref.dart | 3 ++- .../ref_entities/file_not_found_exception.dart | 10 ++++++++++ 4 files changed, 34 insertions(+), 10 deletions(-) create mode 100644 lib/src/ref_entities/file_not_found_exception.dart diff --git a/lib/src/epub_reader.dart b/lib/src/epub_reader.dart index 07e0a816..8be332c0 100644 --- a/lib/src/epub_reader.dart +++ b/lib/src/epub_reader.dart @@ -120,9 +120,13 @@ class EpubReader { await Future.forEach(contentRef.AllFiles!.keys, (dynamic key) async { if (!result.AllFiles!.containsKey(key)) { - result.AllFiles![key] = await readByteContentFile( - contentRef.AllFiles![key]!, - imageCompressionRate: bookSize.getImageCompressionRate()); + try { + result.AllFiles![key] = await readByteContentFile( + contentRef.AllFiles![key]!, + imageCompressionRate: bookSize.getImageCompressionRate()); + } catch (FileNotFoundException) { + // Do nothing, let the file be missing. + } } }); @@ -150,8 +154,12 @@ class EpubReader { {int imageCompressionRate = 25}) async { var result = {}; await Future.forEach(byteContentFileRefs.keys, (dynamic key) async { - result[key] = await readByteContentFile(byteContentFileRefs[key]!, - imageCompressionRate: imageCompressionRate); + try { + result[key] = await readByteContentFile(byteContentFileRefs[key]!, + imageCompressionRate: imageCompressionRate); + } catch (FileNotFoundException) { + // Do nothing, let the file be missing. + } }); return result; } diff --git a/lib/src/readers/book_cover_reader.dart b/lib/src/readers/book_cover_reader.dart index d318445b..faa84246 100644 --- a/lib/src/readers/book_cover_reader.dart +++ b/lib/src/readers/book_cover_reader.dart @@ -62,9 +62,14 @@ class BookCoverReader { } coverImageContentFileRef = bookRef.Content!.Images![coverManifestItem.Href]; - var coverImageContent = - await coverImageContentFileRef!.readContentAsBytes(true); - var retval = images.decodeImage(Uint8List.fromList(coverImageContent)); - return retval; + try { + var coverImageContent = + await coverImageContentFileRef!.readContentAsBytes(true); + var retval = images.decodeImage(Uint8List.fromList(coverImageContent)); + return retval; + } catch (e) { + logger.e('Error reading cover image content: $e'); + return null; + } } } diff --git a/lib/src/ref_entities/epub_content_file_ref.dart b/lib/src/ref_entities/epub_content_file_ref.dart index c480d71c..aab7ef6b 100644 --- a/lib/src/ref_entities/epub_content_file_ref.dart +++ b/lib/src/ref_entities/epub_content_file_ref.dart @@ -4,6 +4,7 @@ import 'dart:typed_data'; import 'package:archive/archive.dart'; import 'package:collection/collection.dart' show IterableExtension; +import 'package:epubx/src/ref_entities/file_not_found_exception.dart'; import 'package:epubx/src/utils/image_compressor.dart'; import 'package:quiver/core.dart'; @@ -44,7 +45,7 @@ abstract class EpubContentFileRef { .files .firstWhereOrNull((ArchiveFile x) => x.name == contentFilePath); if (contentFileEntry == null) { - throw Exception( + throw FileNotFoundException( 'EPUB parsing error: file $contentFilePath not found in archive.'); } return contentFileEntry; diff --git a/lib/src/ref_entities/file_not_found_exception.dart b/lib/src/ref_entities/file_not_found_exception.dart new file mode 100644 index 00000000..efe78c58 --- /dev/null +++ b/lib/src/ref_entities/file_not_found_exception.dart @@ -0,0 +1,10 @@ +class FileNotFoundException implements Exception { + final String message; + + FileNotFoundException(this.message); + + @override + String toString() { + return message; + } +} From 8a5b931c91af212f88e8d8bb1b51e03550f28b98 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Sun, 29 Dec 2024 13:18:08 +0100 Subject: [PATCH 22/24] No more image compression logic --- lib/epubx.dart | 1 - lib/src/epub_reader.dart | 44 +++++-------------- lib/src/readers/book_cover_reader.dart | 2 +- lib/src/ref_entities/book_size.dart | 39 ---------------- .../ref_entities/epub_content_file_ref.dart | 7 +-- lib/src/utils/image_compressor.dart | 19 -------- 6 files changed, 12 insertions(+), 100 deletions(-) delete mode 100644 lib/src/ref_entities/book_size.dart delete mode 100644 lib/src/utils/image_compressor.dart diff --git a/lib/epubx.dart b/lib/epubx.dart index 02be71a3..c5127f2c 100644 --- a/lib/epubx.dart +++ b/lib/epubx.dart @@ -6,7 +6,6 @@ export 'src/epub_reader.dart'; export 'src/epub_writer.dart'; export 'src/ref_entities/epub_book_ref.dart'; export 'src/ref_entities/epub_chapter_ref.dart'; -export 'src/ref_entities/book_size.dart'; export 'src/entities/epub_book.dart'; export 'src/entities/epub_chapter.dart'; export 'src/entities/epub_content.dart'; diff --git a/lib/src/epub_reader.dart b/lib/src/epub_reader.dart index 8be332c0..7e3e21e6 100644 --- a/lib/src/epub_reader.dart +++ b/lib/src/epub_reader.dart @@ -2,7 +2,6 @@ import 'dart:async'; import 'package:archive/archive.dart'; import 'package:epubx/epubx.dart'; -import 'package:epubx/src/ref_entities/book_size.dart'; import 'readers/content_reader.dart'; import 'readers/schema_reader.dart'; @@ -75,13 +74,12 @@ class EpubReader { loadedBytes = bytes; } - final bookSize = BookSize.fromByteLength(loadedBytes.length); var epubBookRef = await openBook(loadedBytes); result.Schema = epubBookRef.Schema; result.Title = epubBookRef.Title; result.AuthorList = epubBookRef.AuthorList; result.Author = epubBookRef.Author; - result.Content = await readContent(epubBookRef.Content!, bookSize); + result.Content = await readContent(epubBookRef.Content!); result.CoverImage = await epubBookRef.readCover(); var chapterRefs = await epubBookRef.getChapters(); result.Chapters = await readChapters(chapterRefs); @@ -89,19 +87,12 @@ class EpubReader { return result; } - static Future readContent( - EpubContentRef contentRef, BookSize bookSize) async { + static Future readContent(EpubContentRef contentRef) async { var result = EpubContent(); result.Html = await readTextContentFiles(contentRef.Html!); result.Css = await readTextContentFiles(contentRef.Css!); - if (bookSize == BookSize.EXTREMELY_LARGE) { - result.Images = {}; - } else { - result.Images = await readByteContentFiles(contentRef.Images!, - imageCompressionRate: bookSize.getImageCompressionRate()); - } - result.Fonts = await readByteContentFiles(contentRef.Fonts!, - imageCompressionRate: bookSize.getImageCompressionRate()); + result.Images = await readByteContentFiles(contentRef.Images!); + result.Fonts = await readByteContentFiles(contentRef.Fonts!); result.AllFiles = {}; result.Html!.forEach((String? key, EpubTextContentFile value) { @@ -121,9 +112,8 @@ class EpubReader { await Future.forEach(contentRef.AllFiles!.keys, (dynamic key) async { if (!result.AllFiles!.containsKey(key)) { try { - result.AllFiles![key] = await readByteContentFile( - contentRef.AllFiles![key]!, - imageCompressionRate: bookSize.getImageCompressionRate()); + result.AllFiles![key] = + await readByteContentFile(contentRef.AllFiles![key]!); } catch (FileNotFoundException) { // Do nothing, let the file be missing. } @@ -150,13 +140,11 @@ class EpubReader { } static Future> readByteContentFiles( - Map byteContentFileRefs, - {int imageCompressionRate = 25}) async { + Map byteContentFileRefs) async { var result = {}; await Future.forEach(byteContentFileRefs.keys, (dynamic key) async { try { - result[key] = await readByteContentFile(byteContentFileRefs[key]!, - imageCompressionRate: imageCompressionRate); + result[key] = await readByteContentFile(byteContentFileRefs[key]!); } catch (FileNotFoundException) { // Do nothing, let the file be missing. } @@ -165,25 +153,13 @@ class EpubReader { } static Future readByteContentFile( - EpubContentFileRef contentFileRef, - {int imageCompressionRate = 25}) async { + EpubContentFileRef contentFileRef) async { var result = EpubByteContentFile(); result.FileName = contentFileRef.FileName; result.ContentType = contentFileRef.ContentType; result.ContentMimeType = contentFileRef.ContentMimeType; - - var isImage = [ - EpubContentType.IMAGE_JPEG, - EpubContentType.IMAGE_PNG, - EpubContentType.IMAGE_GIF, - EpubContentType.IMAGE_BMP, - EpubContentType.IMAGE_SVG - ].contains(result.ContentType); - result.Content = await contentFileRef.readContentAsBytes( - isImage, - imageCompressionRate: imageCompressionRate, - ); + result.Content = await contentFileRef.readContentAsBytes(); return result; } diff --git a/lib/src/readers/book_cover_reader.dart b/lib/src/readers/book_cover_reader.dart index faa84246..191c67f0 100644 --- a/lib/src/readers/book_cover_reader.dart +++ b/lib/src/readers/book_cover_reader.dart @@ -64,7 +64,7 @@ class BookCoverReader { coverImageContentFileRef = bookRef.Content!.Images![coverManifestItem.Href]; try { var coverImageContent = - await coverImageContentFileRef!.readContentAsBytes(true); + await coverImageContentFileRef!.readContentAsBytes(); var retval = images.decodeImage(Uint8List.fromList(coverImageContent)); return retval; } catch (e) { diff --git a/lib/src/ref_entities/book_size.dart b/lib/src/ref_entities/book_size.dart deleted file mode 100644 index cd553647..00000000 --- a/lib/src/ref_entities/book_size.dart +++ /dev/null @@ -1,39 +0,0 @@ -enum BookSize { - EXTREMELY_LARGE, - VERY_LARGE, - LARGE, - MEDIUM, - SMALL; - - static BookSize fromByteLength(int size) { - final sizeInMB = size / 1024 / 1024; - if (sizeInMB >= 60) { - return BookSize.EXTREMELY_LARGE; - } else if (sizeInMB >= 30) { - return BookSize.VERY_LARGE; - } else if (sizeInMB >= 10) { - return BookSize.LARGE; - } else if (sizeInMB >= 5) { - return BookSize.MEDIUM; - } else { - return BookSize.SMALL; - } - } - - get isTooLarge => this == BookSize.EXTREMELY_LARGE; - - int getImageCompressionRate() { - switch (this) { - case BookSize.EXTREMELY_LARGE: - return 5; - case BookSize.VERY_LARGE: - return 12; - case BookSize.LARGE: - return 25; - case BookSize.MEDIUM: - return 30; - case BookSize.SMALL: - return 50; - } - } -} diff --git a/lib/src/ref_entities/epub_content_file_ref.dart b/lib/src/ref_entities/epub_content_file_ref.dart index aab7ef6b..a59324be 100644 --- a/lib/src/ref_entities/epub_content_file_ref.dart +++ b/lib/src/ref_entities/epub_content_file_ref.dart @@ -5,7 +5,6 @@ import 'dart:typed_data'; import 'package:archive/archive.dart'; import 'package:collection/collection.dart' show IterableExtension; import 'package:epubx/src/ref_entities/file_not_found_exception.dart'; -import 'package:epubx/src/utils/image_compressor.dart'; import 'package:quiver/core.dart'; import '../entities/epub_content_type.dart'; @@ -63,13 +62,9 @@ abstract class EpubContentFileRef { return contentFileEntry.content; } - Future readContentAsBytes(bool isImage, - {int imageCompressionRate = 25}) async { + Future readContentAsBytes() async { var contentFileEntry = getContentFileEntry(); var content = openContentStream(contentFileEntry); - if (isImage) { - return compressImage(content, imageCompressionRate); - } return Uint8List.fromList(content); } diff --git a/lib/src/utils/image_compressor.dart b/lib/src/utils/image_compressor.dart deleted file mode 100644 index d3037b96..00000000 --- a/lib/src/utils/image_compressor.dart +++ /dev/null @@ -1,19 +0,0 @@ -import 'dart:typed_data'; - -import 'package:flutter_image_compress/flutter_image_compress.dart'; -import 'package:logger/logger.dart'; - -Future compressImage( - List originalImageData, int imageCompressionRate) async { - try { - return await FlutterImageCompress.compressWithList( - Uint8List.fromList(originalImageData), - quality: imageCompressionRate, - minWidth: 400, - minHeight: 400, - ); - } catch (e) { - Logger().e('Error compressing image: $e'); - return Future.value(Uint8List.fromList(originalImageData)); - } -} From 6c19fe608c758af6112971fd0206c30354c63dea Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Sun, 29 Dec 2024 13:21:18 +0100 Subject: [PATCH 23/24] Cleanup --- lib/src/ref_entities/epub_book_ref.dart | 8 -------- 1 file changed, 8 deletions(-) diff --git a/lib/src/ref_entities/epub_book_ref.dart b/lib/src/ref_entities/epub_book_ref.dart index 274fc549..7ddd4b1a 100644 --- a/lib/src/ref_entities/epub_book_ref.dart +++ b/lib/src/ref_entities/epub_book_ref.dart @@ -35,14 +35,6 @@ class EpubBookRef { return hashObjects(objects); } - int get deterministicHash { - var objects = [ - Title.hashCode, - Author.hashCode, - ]; - return hashObjects(objects); - } - @override bool operator ==(other) { if (!(other is EpubBookRef)) { From 2891f17a774fedc2421bc17a6a6341ae5b7cf0b2 Mon Sep 17 00:00:00 2001 From: Jasmeet Singh Date: Sun, 29 Dec 2024 16:12:55 +0100 Subject: [PATCH 24/24] cleanup --- pubspec.yaml | 1 - 1 file changed, 1 deletion(-) diff --git a/pubspec.yaml b/pubspec.yaml index 4489e570..bb10ac11 100644 --- a/pubspec.yaml +++ b/pubspec.yaml @@ -14,7 +14,6 @@ dependencies: image: ^4.0.17 collection: ^1.15.0 logger: ^1.3.0 - flutter_image_compress: ^2.3.0 dev_dependencies: test: ^1.16.7