Skip to content

Commit 47a5069

Browse files
SergeShkurkoSergeShkurko
committed
Rename package for publish
1 parent 2c42d52 commit 47a5069

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+128
-135
lines changed

‎README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
1-
# dart-epub
2-
[![Build Status](https://travis-ci.org/orthros/dart-epub.svg?branch=master)](https://travis-ci.org/orthros/dart-epub)
1+
# epubx
2+
3+
dart-epub fork
34

45
Epub Reader and Writer for Dart inspired by [this fantastic C# Epub Reader](https://github.com/versfx/EpubReader)
56

@@ -9,7 +10,7 @@ This does not rely on the ```dart:io``` package in any way, so it is avilable fo
910
Add the package to the ```dependencies``` section of your pubspec.yaml
1011
```
1112
dependencies:
12-
epub: ^2.0.0
13+
epubx: ^3.0.0-dev.1
1314
```
1415

1516
## Example

‎example/dart_ex/example.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import 'dart:io' as io;
22

33
import 'package:path/path.dart' as path;
4-
import 'package:epub/epub.dart';
4+
import 'package:epubx/epub.dart';
55

66
main(List<String> args) async {
77
//Get the epub into memory somehow

‎example/flutter_ex/lib/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'package:flutter/material.dart';
22
import 'package:http/http.dart' as http;
3-
import 'package:epub/epub.dart' as epub;
3+
import 'package:epubx/epub.dart' as epub;
44
import 'package:image/image.dart' as image;
55

66
void main() => runApp(EpubWidget());

‎example/web_ex/web/main.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import 'dart:html';
22
import 'package:http/http.dart' as http;
3-
import 'package:epub/epub.dart' as epub;
3+
import 'package:epubx/epub.dart' as epub;
44

55
void main() async {
66
querySelector('#output').text = 'Your Dart app is running.';

‎lib/epub.dart renamed to ‎lib/epubx.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
library epub;
1+
library epubx;
22

33
export 'src/utils/enum_from_string.dart';
44

‎lib/src/epub_writer.dart

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
11
import 'package:archive/archive.dart';
22
import 'dart:convert' as convert;
3-
import 'package:epub/epub.dart';
4-
import 'package:epub/src/utils/zip_path_utils.dart';
5-
import 'package:epub/src/writers/epub_package_writer.dart';
3+
import 'package:epubx/src/utils/zip_path_utils.dart';
4+
import 'package:epubx/src/writers/epub_package_writer.dart';
5+
6+
import 'entities/epub_book.dart';
7+
import 'entities/epub_byte_content_file.dart';
8+
import 'entities/epub_text_content_file.dart';
69

710
class EpubWriter {
811
static const _container_file =

‎lib/src/readers/navigation_reader.dart

Lines changed: 17 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ import 'dart:async';
33
import 'package:archive/archive.dart';
44
import 'dart:convert' as convert;
55
import 'package:collection/collection.dart' show IterableExtension;
6-
import 'package:epub/src/schema/opf/epub_version.dart';
6+
import 'package:epubx/src/schema/opf/epub_version.dart';
77
import 'package:xml/xml.dart' as xml;
88

99
import '../schema/navigation/epub_metadata.dart';
@@ -37,8 +37,8 @@ class NavigationReader {
3737
return null;
3838
}
3939

40-
var tocManifestItem = package.Manifest!.Items!
41-
.firstWhereOrNull((EpubManifestItem item) =>
40+
var tocManifestItem = package.Manifest!.Items!.firstWhereOrNull(
41+
(EpubManifestItem item) =>
4242
item.Id!.toLowerCase() == tocId.toLowerCase());
4343
if (tocManifestItem == null) {
4444
throw Exception(
@@ -47,9 +47,8 @@ class NavigationReader {
4747

4848
var tocFileEntryPath =
4949
ZipPathUtils.combine(contentDirectoryPath, tocManifestItem.Href);
50-
var tocFileEntry = epubArchive.files.firstWhereOrNull(
51-
(ArchiveFile file) =>
52-
file.name.toLowerCase() == tocFileEntryPath!.toLowerCase());
50+
var tocFileEntry = epubArchive.files.firstWhereOrNull((ArchiveFile file) =>
51+
file.name.toLowerCase() == tocFileEntryPath!.toLowerCase());
5352
if (tocFileEntry == null) {
5453
throw Exception(
5554
'EPUB parsing error: TOC file ${tocFileEntryPath} not found in archive.');
@@ -85,15 +84,13 @@ class NavigationReader {
8584
'EPUB parsing error: TOC file does not contain docTitle element.');
8685
}
8786

88-
var navigationDocTitle =
89-
readNavigationDocTitle(docTitleNode);
87+
var navigationDocTitle = readNavigationDocTitle(docTitleNode);
9088
result.DocTitle = navigationDocTitle;
9189
result.DocAuthors = <EpubNavigationDocAuthor>[];
9290
ncxNode
9391
.findElements('docAuthor', namespace: ncxNamespace)
9492
.forEach((xml.XmlElement docAuthorNode) {
95-
var navigationDocAuthor =
96-
readNavigationDocAuthor(docAuthorNode);
93+
var navigationDocAuthor = readNavigationDocAuthor(docAuthorNode);
9794
result.DocAuthors!.add(navigationDocAuthor);
9895
});
9996

@@ -119,8 +116,7 @@ class NavigationReader {
119116
ncxNode
120117
.findElements('navList', namespace: ncxNamespace)
121118
.forEach((xml.XmlElement navigationListNode) {
122-
var navigationList =
123-
readNavigationList(navigationListNode);
119+
var navigationList = readNavigationList(navigationListNode);
124120
result.NavLists!.add(navigationList);
125121
});
126122

@@ -254,13 +250,11 @@ class NavigationReader {
254250
.forEach((xml.XmlElement navigationListChildNode) {
255251
switch (navigationListChildNode.name.local.toLowerCase()) {
256252
case 'navlabel':
257-
var navigationLabel =
258-
readNavigationLabel(navigationListChildNode);
253+
var navigationLabel = readNavigationLabel(navigationListChildNode);
259254
result.NavigationLabels!.add(navigationLabel);
260255
break;
261256
case 'navtarget':
262-
var navigationTarget =
263-
readNavigationTarget(navigationListChildNode);
257+
var navigationTarget = readNavigationTarget(navigationListChildNode);
264258
result.NavigationTargets!.add(navigationTarget);
265259
break;
266260
}
@@ -279,8 +273,7 @@ class NavigationReader {
279273
.whereType<xml.XmlElement>()
280274
.forEach((xml.XmlElement navigationPointNode) {
281275
if (navigationPointNode.name.local.toLowerCase() == 'navpoint') {
282-
var navigationPoint =
283-
readNavigationPoint(navigationPointNode);
276+
var navigationPoint = readNavigationPoint(navigationPointNode);
284277
result.Points!.add(navigationPoint);
285278
}
286279
});
@@ -295,8 +288,7 @@ class NavigationReader {
295288
.whereType<xml.XmlElement>()
296289
.forEach((xml.XmlElement pageTargetNode) {
297290
if (pageTargetNode.name.local == 'pageTarget') {
298-
var pageTarget =
299-
readNavigationPageTarget(pageTargetNode);
291+
var pageTarget = readNavigationPageTarget(pageTargetNode);
300292
result.Targets!.add(pageTarget);
301293
}
302294
});
@@ -347,8 +339,7 @@ class NavigationReader {
347339
result.NavigationLabels!.add(navigationLabel);
348340
break;
349341
case 'content':
350-
var content =
351-
readNavigationContent(navigationPageTargetChildNode);
342+
var content = readNavigationContent(navigationPageTargetChildNode);
352343
result.Content = content;
353344
break;
354345
}
@@ -390,13 +381,11 @@ class NavigationReader {
390381
.forEach((xml.XmlElement navigationPointChildNode) {
391382
switch (navigationPointChildNode.name.local.toLowerCase()) {
392383
case 'navlabel':
393-
var navigationLabel =
394-
readNavigationLabel(navigationPointChildNode);
384+
var navigationLabel = readNavigationLabel(navigationPointChildNode);
395385
result.NavigationLabels!.add(navigationLabel);
396386
break;
397387
case 'content':
398-
var content =
399-
readNavigationContent(navigationPointChildNode);
388+
var content = readNavigationContent(navigationPointChildNode);
400389
result.Content = content;
401390
break;
402391
case 'navpoint':
@@ -450,13 +439,11 @@ class NavigationReader {
450439
.forEach((xml.XmlElement navigationTargetChildNode) {
451440
switch (navigationTargetChildNode.name.local.toLowerCase()) {
452441
case 'navlabel':
453-
var navigationLabel =
454-
readNavigationLabel(navigationTargetChildNode);
442+
var navigationLabel = readNavigationLabel(navigationTargetChildNode);
455443
result.NavigationLabels!.add(navigationLabel);
456444
break;
457445
case 'content':
458-
var content =
459-
readNavigationContent(navigationTargetChildNode);
446+
var content = readNavigationContent(navigationTargetChildNode);
460447
result.Content = content;
461448
break;
462449
}

‎lib/src/writers/epub_guide_writer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:epub/src/schema/opf/epub_guide.dart';
1+
import 'package:epubx/src/schema/opf/epub_guide.dart';
22
import 'package:xml/src/xml/builder.dart' show XmlBuilder;
33

44
class EpubGuideWriter {

‎lib/src/writers/epub_manifest_writer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:epub/src/schema/opf/epub_manifest.dart';
1+
import 'package:epubx/src/schema/opf/epub_manifest.dart';
22
import 'package:xml/src/xml/builder.dart' show XmlBuilder;
33

44
class EpubManifestWriter {

‎lib/src/writers/epub_metadata_writer.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import 'package:epub/src/schema/opf/epub_metadata.dart';
2-
import 'package:epub/src/schema/opf/epub_version.dart';
1+
import 'package:epubx/src/schema/opf/epub_metadata.dart';
2+
import 'package:epubx/src/schema/opf/epub_version.dart';
33
import 'package:xml/src/xml/builder.dart' show XmlBuilder;
44

55
class EpubMetadataWriter {

‎lib/src/writers/epub_package_writer.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
import 'package:epub/src/schema/opf/epub_package.dart';
2-
import 'package:epub/src/schema/opf/epub_version.dart';
3-
import 'package:epub/src/writers/epub_guide_writer.dart';
4-
import 'package:epub/src/writers/epub_manifest_writer.dart';
5-
import 'package:epub/src/writers/epub_spine_writer.dart';
1+
import 'package:epubx/src/schema/opf/epub_package.dart';
2+
import 'package:epubx/src/schema/opf/epub_version.dart';
3+
import 'package:epubx/src/writers/epub_guide_writer.dart';
4+
import 'package:epubx/src/writers/epub_manifest_writer.dart';
5+
import 'package:epubx/src/writers/epub_spine_writer.dart';
66
import 'package:xml/src/xml/builder.dart' show XmlBuilder;
77
import 'epub_metadata_writer.dart';
88

‎lib/src/writers/epub_spine_writer.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import 'package:epub/src/schema/opf/epub_spine.dart';
1+
import 'package:epubx/src/schema/opf/epub_spine.dart';
22
import 'package:xml/src/xml/builder.dart' show XmlBuilder;
33

44
class EpubSpineWriter {

‎pubspec.yaml

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,18 @@
1-
name: epub
2-
version: 3.0.0
3-
author: Colin Nelson <[email protected]>
1+
name: epubx
2+
version: 3.0.0-dev.1
43
description: Epub Parser for Dart. Suitable for use on the Server, the Web, or in Flutter
5-
homepage: https://github.com/orthros/dart-epub
4+
homepage: https://github.com/rbcprolabs/epubx.dart
5+
66
environment:
77
sdk: '>=2.12.0 <3.0.0'
8+
89
dependencies:
910
archive: ^3.1.2
1011
quiver: ^3.0.0
1112
xml: ^5.0.2
1213
image: ^3.0.1
1314
collection: ^1.15.0-nullsafety.4
15+
1416
dev_dependencies:
1517
test: "^1.0.0"
1618
path: "^1.5.1"

‎test/entities/epub_book_test.dart

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
library epubreadertest;
22

3-
import 'package:epub/epub.dart';
4-
import 'package:epub/src/entities/epub_schema.dart';
3+
import 'package:epubx/epub.dart';
4+
import 'package:epubx/src/entities/epub_schema.dart';
55
import 'package:test/test.dart';
66

77
main() async {

‎test/entities/epub_byte_content_file_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
library epubreadertest;
22

3-
import 'package:epub/epub.dart';
3+
import 'package:epubx/epub.dart';
44
import 'package:test/test.dart';
55

66
main() async {

‎test/entities/epub_chapter_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
library epubreadertest;
22

3-
import 'package:epub/epub.dart';
3+
import 'package:epubx/epub.dart';
44
import 'package:test/test.dart';
55

66
main() async {

‎test/entities/epub_content_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
library epubreadertest;
22

3-
import 'package:epub/epub.dart';
3+
import 'package:epubx/epub.dart';
44
import 'package:test/test.dart';
55

66
main() async {

‎test/entities/epub_schema_test.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
library epubreadertest;
22

3-
import 'package:epub/epub.dart';
4-
import 'package:epub/src/entities/epub_schema.dart';
5-
import 'package:epub/src/schema/navigation/epub_navigation_doc_author.dart';
6-
import 'package:epub/src/schema/navigation/epub_navigation_doc_title.dart';
7-
import 'package:epub/src/schema/opf/epub_guide.dart';
8-
import 'package:epub/src/schema/opf/epub_version.dart';
3+
import 'package:epubx/epub.dart';
4+
import 'package:epubx/src/entities/epub_schema.dart';
5+
import 'package:epubx/src/schema/navigation/epub_navigation_doc_author.dart';
6+
import 'package:epubx/src/schema/navigation/epub_navigation_doc_title.dart';
7+
import 'package:epubx/src/schema/opf/epub_guide.dart';
8+
import 'package:epubx/src/schema/opf/epub_version.dart';
99
import 'package:test/test.dart';
1010

1111
main() async {

‎test/entities/epub_text_content_file_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
library epubreadertest;
22

3-
import 'package:epub/epub.dart';
3+
import 'package:epubx/epub.dart';
44
import 'package:test/test.dart';
55

66
main() async {

‎test/enum_string_test.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ library epubtest;
22

33
import 'package:test/test.dart';
44

5-
import 'package:epub/epub.dart';
5+
import 'package:epubx/epub.dart';
66

77
main() {
88
test("Enum One", () {

‎test/epub_image_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'dart:io' as io;
55
import 'package:path/path.dart' as path;
66
import 'package:test/test.dart';
77

8-
import 'package:epub/epub.dart';
8+
import 'package:epubx/epub.dart';
99

1010
main() async {
1111
String fileName = "alicesAdventuresUnderGround.epub";

‎test/epub_reader_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import 'dart:io' as io;
55
import 'package:path/path.dart' as path;
66
import 'package:test/test.dart';
77

8-
import 'package:epub/epub.dart';
8+
import 'package:epubx/epub.dart';
99

1010
main() async {
1111
String fileName = "hittelOnGoldMines.epub";

‎test/epub_writer_tests.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ library epubreadertest;
22

33
import 'dart:io' as io;
44

5-
import 'package:epub/epub.dart';
5+
import 'package:epubx/epub.dart';
66
import 'package:path/path.dart' as path;
77
import 'package:test/test.dart';
88

0 commit comments

Comments
 (0)