From 58a7e7086022f666127243543a7aa1c44a6f7518 Mon Sep 17 00:00:00 2001 From: a2p1k02 Date: Sun, 3 Jan 2021 16:32:31 +0300 Subject: [PATCH 1/3] vars refactor --- src/fb3_reader/fb3.py | 12 +++++------- src/fb3_reader/fb3.pyi | 1 + src/main.py | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 src/fb3_reader/fb3.pyi diff --git a/src/fb3_reader/fb3.py b/src/fb3_reader/fb3.py index 4c00326..f7f0087 100644 --- a/src/fb3_reader/fb3.py +++ b/src/fb3_reader/fb3.py @@ -1,12 +1,10 @@ -import sys from zipfile import ZipFile # from bs4 import BeautifulSoup # from lxml import etree -def reader(): - files = input("Enter the path to file: ") - with ZipFile(files) as book: - for row in book.read('2/fb3/body.xml').decode('utf-8').splitlines(): - opened = open("test.txt", "a") - opened.write(row) +def reader(path_to_file): + with ZipFile(path_to_file) as book: + for book_content in book.read('2/fb3/body.xml').decode('utf-8').splitlines(): + output_content = open("test.txt", "a") + output_content.write(book_content) diff --git a/src/fb3_reader/fb3.pyi b/src/fb3_reader/fb3.pyi new file mode 100644 index 0000000..c83594e --- /dev/null +++ b/src/fb3_reader/fb3.pyi @@ -0,0 +1 @@ +def reader(path_to_file: str): ... \ No newline at end of file diff --git a/src/main.py b/src/main.py index 223b06f..aef53ab 100644 --- a/src/main.py +++ b/src/main.py @@ -1,4 +1,4 @@ from fb3_reader import fb3 if __name__ == '__main__': - fb3.reader() + fb3.reader(input("Enter path to file: ")) From 51c9bb05c67ae74c54b1d1a615f46c38114e0041 Mon Sep 17 00:00:00 2001 From: a2p1k02 Date: Sun, 3 Jan 2021 17:10:49 +0300 Subject: [PATCH 2/3] add arguments to take a version --- src/fb3_reader/__init__.py | Bin 1024 -> 22 bytes src/fb3_reader/fb3.py | 2 -- src/main.py | 11 +++++++++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/fb3_reader/__init__.py b/src/fb3_reader/__init__.py index 06d7405020018ddf3cacee90fd4af10487da3d20..485f44ac21b2ee78a2ee1ed0ea584114a1c957c3 100644 GIT binary patch literal 22 dcma!#FH0>d&dkq?k5{l&P%_Xn)H77#0svR320Q=& literal 1024 ScmZQz7zLvtFd70QH3R?z00031 diff --git a/src/fb3_reader/fb3.py b/src/fb3_reader/fb3.py index f7f0087..ca3a937 100644 --- a/src/fb3_reader/fb3.py +++ b/src/fb3_reader/fb3.py @@ -1,6 +1,4 @@ from zipfile import ZipFile -# from bs4 import BeautifulSoup -# from lxml import etree def reader(path_to_file): diff --git a/src/main.py b/src/main.py index aef53ab..7844df6 100644 --- a/src/main.py +++ b/src/main.py @@ -1,4 +1,11 @@ -from fb3_reader import fb3 +from sys import argv +from fb3_reader import fb3, __version__ if __name__ == '__main__': - fb3.reader(input("Enter path to file: ")) + try: + if argv[1] == "--version" or argv[1] == "-v": + print(__version__) + else: + fb3.reader(input("Enter path to file: ")) + except IndexError: + fb3.reader(input("Enter path to file: ")) From 01b89b341a90eaeaf53a4025c815ee03e72a9f9b Mon Sep 17 00:00:00 2001 From: a2p1k02 Date: Sun, 3 Jan 2021 17:12:02 +0300 Subject: [PATCH 3/3] add arguments to take a version --- src/main.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main.py b/src/main.py index 7844df6..18c0f82 100644 --- a/src/main.py +++ b/src/main.py @@ -5,7 +5,5 @@ if __name__ == '__main__': try: if argv[1] == "--version" or argv[1] == "-v": print(__version__) - else: - fb3.reader(input("Enter path to file: ")) except IndexError: fb3.reader(input("Enter path to file: "))