Skip to content
This repository has been archived by the owner on Mar 15, 2020. It is now read-only.

Commit

Permalink
Python and modules update. Config cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@rupor-github
rupor-github committed Aug 5, 2016
1 parent 54c9513 commit 82df444
Show file tree
Hide file tree
Showing 3 changed files with 346 additions and 342 deletions.
8 changes: 4 additions & 4 deletions README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
This program is based on fb2conv program published by dnkorpushov on [the-ebook.org](http://www.the-ebook.org/forum/viewtopic.php?t=28447&postdays=0&postorder=asc&start=0) site.

Original program (being Python 2) did not work well under Windows when non-russian system codepage was selected for non-Unicode programs.
In order to improve the situation I had to port it to Python 3 (3.5.1 at the moment). As I am only using it as a companion converter from [MyHomeLib](http://home-lib.net/)
In order to improve the situation I had to port it to Python 3. As I am only using it as a companion converter from [MyHomeLib](http://home-lib.net/)
it lost number of features and gained some bug fixes...

Here is brief list of changes:
Expand All @@ -24,11 +24,11 @@ Program uses source code (modified) from following projects released under GPL:

* [KindleUnpack](https://github.com/kevinhendricks/KindleUnpack)

In order to build [Windows releases](https://github.com/rupor-github/fb2mobi/releases) I am using [this fork](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-requests/87/allow-proper-handling-of-unicode-command/diff) of cx_Freeze 5.0 and following libraries:
In order to build [Windows releases](https://github.com/rupor-github/fb2mobi/releases) I am using Python 3.5.2, [this fork](https://bitbucket.org/anthony_tuininga/cx_freeze/pull-requests/87/allow-proper-handling-of-unicode-command/diff) of cx_Freeze 5.0 and following libraries:

* cssutils-1.0.1
* lxml-3.5.0
* Pillow-3.1.1
* lxml-3.6.0
* Pillow-3.3.0
* PyHyphen-2.0.5

Enjoy!
328 changes: 165 additions & 163 deletions fb2epub.config
View file
Original file line number Diff line number Diff line change
@@ -1,163 +1,165 @@
<?xml version='1.0' encoding='utf-8'?>
<settings>
<debug>False</debug>
<logFile>debug.log</logFile>
<logLevel>DEBUG</logLevel>
<outputFormat>epub</outputFormat>
<kindleCompressionLevel>1</kindleCompressionLevel>
<noDropcapsSymbols>'"-.…0123456789‒–—«»</noDropcapsSymbols>
<transliterate>False</transliterate>
<noMOBIoptimization>False</noMOBIoptimization>
<!-- Voyage, PW3, Aura -->
<screenWidth>988</screenWidth>
<screenHeight>1322</screenHeight>
<!-- PW2
<screenWidth>658</screenWidth>
<screenHeight>904</screenHeight>
-->
<!-- Old eInk devices
<screenWidth>573</screenWidth>
<screenHeight>800</screenHeight>
-->
<defaultProfile>default</defaultProfile>
<profiles>
<profile description="Default profile" name="default">
<hyphens>True</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>False</flatTOC>
<css parse="True">profiles/default.css</css>
<xslt>spaces.xsl</xslt>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#number #abbrseries) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Content</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes>
<vignette level="default">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
<vignette level="h0">
<beforeTitle>None</beforeTitle>
<afterTitle>None</afterTitle>
<chapterEnd>None</chapterEnd>
</vignette>
<vignette level="h1">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
</vignettes>
</profile>
<profile description="Using Liberation fonts" name="liberation">
<hyphens>False</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="True">profiles/sample.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Content</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes/>
</profile>
<profile description="No hyphenation" name="nohyph">
<hyphens>False</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="True">profiles/default.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Content</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes/>
</profile>
<profile description="Vignettes" name="vignettes">
<hyphens>True</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="False">profiles/default.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Аннотация</annotationTitle>
<tocTitle>Содержание</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes>
<vignette level="default">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
<vignette level="h0">
<beforeTitle>None</beforeTitle>
<afterTitle>None</afterTitle>
<chapterEnd>None</chapterEnd>
</vignette>
<vignette level="h1">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
</vignettes>
</profile>
<profile description="Using Windows fonts" name="winfonts">
<hyphens>True</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<tocMaxLevel>1000</tocMaxLevel>
<dropcaps>Smart</dropcaps>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="True">profiles/winfonts.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Contents</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes/>
</profile>
</profiles>
</settings>
<?xml version='1.0' encoding='utf-8'?>
<settings>
<debug>False</debug>
<!--logFile>debug.log</logFile>
<logLevel>DEBUG</logLevel-->
<logFile/>
<logLevel>ERROR</logLevel>
<outputFormat>epub</outputFormat>
<kindleCompressionLevel>1</kindleCompressionLevel>
<noDropcapsSymbols>'"-.…0123456789‒–—«»</noDropcapsSymbols>
<transliterate>False</transliterate>
<noMOBIoptimization>False</noMOBIoptimization>
<!-- Voyage, PW3, Aura -->
<screenWidth>988</screenWidth>
<screenHeight>1322</screenHeight>
<!-- PW2
<screenWidth>658</screenWidth>
<screenHeight>904</screenHeight>
-->
<!-- Old eInk devices
<screenWidth>573</screenWidth>
<screenHeight>800</screenHeight>
-->
<defaultProfile>default</defaultProfile>
<profiles>
<profile description="Default profile" name="default">
<hyphens>True</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>False</flatTOC>
<css parse="True">profiles/default.css</css>
<xslt>spaces.xsl</xslt>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#number #abbrseries) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Content</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes>
<vignette level="default">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
<vignette level="h0">
<beforeTitle>None</beforeTitle>
<afterTitle>None</afterTitle>
<chapterEnd>None</chapterEnd>
</vignette>
<vignette level="h1">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
</vignettes>
</profile>
<profile description="Using Liberation fonts" name="liberation">
<hyphens>False</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="True">profiles/sample.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Content</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes/>
</profile>
<profile description="No hyphenation" name="nohyph">
<hyphens>False</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="True">profiles/default.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Content</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes/>
</profile>
<profile description="Vignettes" name="vignettes">
<hyphens>True</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<dropcaps>None</dropcaps>
<tocMaxLevel>1000</tocMaxLevel>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="False">profiles/default.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Аннотация</annotationTitle>
<tocTitle>Содержание</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes>
<vignette level="default">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
<vignette level="h0">
<beforeTitle>None</beforeTitle>
<afterTitle>None</afterTitle>
<chapterEnd>None</chapterEnd>
</vignette>
<vignette level="h1">
<beforeTitle>profiles/vignettes/title_before.png</beforeTitle>
<afterTitle>profiles/vignettes/title_after.png</afterTitle>
<chapterEnd>profiles/vignettes/chapter_end.png</chapterEnd>
</vignette>
</vignettes>
</profile>
<profile description="Using Windows fonts" name="winfonts">
<hyphens>True</hyphens>
<hyphensReplaceNBSP>False</hyphensReplaceNBSP>
<tocMaxLevel>1000</tocMaxLevel>
<dropcaps>Smart</dropcaps>
<tocBeforeBody>False</tocBeforeBody>
<flatTOC>True</flatTOC>
<css parse="True">profiles/winfonts.css</css>
<chapterOnNewPage>True</chapterOnNewPage>
<authorFormat>#l #f #m</authorFormat>
<bookTitleFormat>(#abbrseries #number) #title</bookTitleFormat>
<annotationTitle>Annotation</annotationTitle>
<tocTitle>Contents</tocTitle>
<notesMode>default</notesMode>
<notesBodies>notes</notesBodies>
<generateTOCPage>True</generateTOCPage>
<generateAnnotationPage>True</generateAnnotationPage>
<generateOPFGuide>True</generateOPFGuide>
<kindleRemovePersonalLabel>True</kindleRemovePersonalLabel>
<vignettes/>
</profile>
</profiles>
</settings>
Loading

0 comments on commit 82df444

Please sign in to comment.