Merge pull request orthros#55 from orthros/dev

Version 2.0.6
EgemenInal · May 22, 2019 · 51aee96 · 51aee96
2 parents 7dffcf8 + 02e1f08
commit 51aee96
Show file tree

Hide file tree

Showing 9 changed files with 26 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 ## Unreleased
 
+## [2.0.6] - 2019-05-22
+### Fixed
+- Fixed Issue #35: File cannot be opened if its path is url-encoded in the manifest
+- Updated `examples/dart_ex` to have a README as well as use a locally stored file.
+
 ## [2.0.5] - 2019-05-16
 ### Changed
 - Exposed `EpubChapterRef` to consumers.

diff --git a/example/dart_ex/README.md b/example/dart_ex/README.md
@@ -0,0 +1,9 @@
+# dart_ex
+
+An example of using the `epub` library in a "standard" command line application.
+
+## To Run
+
+```shell
+dart example.dart
+```
diff --git a/example/dart_ex/alicesAdventuresUnderGround.epub b/example/dart_ex/alicesAdventuresUnderGround.epub
diff --git a/example/dart_ex/example.dart b/example/dart_ex/example.dart
@@ -5,8 +5,8 @@ import 'package:epub/epub.dart';
 
 main(List<String> args) async {
   //Get the epub into memory somehow
-  String fileName = "hittelOnGoldMines.epub";
-  String fullPath = path.join(io.Directory.current.path, 'test', fileName);
+  String fileName = "alicesAdventuresUnderGround.epub";
+  String fullPath = path.join(io.Directory.current.path, fileName);
   var targetFile = new io.File(fullPath);
   List<int> bytes = await targetFile.readAsBytes();
 

diff --git a/example/flutter_ex/README.md b/example/flutter_ex/README.md
@@ -4,6 +4,10 @@ A sample application that fetches an epub from a given URL and displays the Titl
 
 Place a URL in the text box (e.g. https://www.gutenberg.org/ebooks/11.epub.images), hit the "Inspect Book" button and watch the application download the book and extract some relevant information.
 
-## Example
+## Examples
 
-![](example.png)
+### With Cover Image
+![](examplewithcover.png)
+
+### Without Cover Image
+![](example.png)
diff --git a/example/flutter_ex/examplewithcover.png b/example/flutter_ex/examplewithcover.png
diff --git a/example/flutter_ex/pubspec.yaml b/example/flutter_ex/pubspec.yaml
@@ -21,10 +21,6 @@ dependencies:
 
   image: ^2.0.0
 
-dependency_overrides:
-  epub:
-    path: ../../
-
 dev_dependencies:
   flutter_test:
     sdk: flutter

diff --git a/lib/src/readers/content_reader.dart b/lib/src/readers/content_reader.dart
@@ -32,7 +32,7 @@ class ContentReader {
           EpubTextContentFileRef epubTextContentFile =
               new EpubTextContentFileRef(bookRef);
           {
-            epubTextContentFile.FileName = fileName;
+            epubTextContentFile.FileName = Uri.decodeFull(fileName);
             epubTextContentFile.ContentMimeType = contentMimeType;
             epubTextContentFile.ContentType = contentType;
           }
@@ -64,7 +64,7 @@ class ContentReader {
           EpubByteContentFileRef epubByteContentFile =
               new EpubByteContentFileRef(bookRef);
           {
-            epubByteContentFile.FileName = fileName;
+            epubByteContentFile.FileName = Uri.decodeFull(fileName);
             epubByteContentFile.ContentMimeType = contentMimeType;
             epubByteContentFile.ContentType = contentType;
           }

diff --git a/pubspec.yaml b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: epub
-version: 2.0.5
-author: Colin Nelson <[email protected]>
+version: 2.0.6
+author: Colin Nelson <[email protected]>
 description: Epub Parser for Dart. Suitable for use on the Server, the Web, or in Flutter
 homepage: https://github.com/orthros/dart-epub
 environment: