Skip to content
This repository has been archived by the owner on Dec 25, 2022. It is now read-only.

Commit

Permalink
Merge pull request #32 from tubone24/black_reformat
Browse files Browse the repository at this point in the history 
Black format style.
  • Loading branch information
@tubone24
tubone24 committed Feb 17, 2019
2 parents e735d1a + c3d9769 commit 334d06a
Show file tree
Hide file tree
Showing 11 changed files with 318 additions and 177 deletions.
3 changes: 3 additions & 0 deletions README.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ The ``Ebook_homebrew`` is changing file name to only digit name like ``001.jpg``
:target: https://ebook-homebrew.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status

.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black

.. image:: https://img.shields.io/pypi/dm/ebook-homebrew.svg
:target: https://pypi.org/project/ebook-homebrew/#files

Expand Down
3 changes: 3 additions & 0 deletions doc_src/index.rst
View file
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,9 @@ Badges:
:target: https://ebook-homebrew.readthedocs.io/en/latest/?badge=latest
:alt: Documentation Status

.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
:target: https://github.com/ambv/black

.. image:: https://img.shields.io/pypi/dm/ebook-homebrew.svg
:target: https://pypi.org/project/ebook-homebrew/#files

Expand Down
15 changes: 11 additions & 4 deletions ebook_homebrew/archive.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ class MakeArchive(Common):
"""Make archive file.
"""

def __init__(self, extension, directory_path=None):
"""Constructor
Expand Down Expand Up @@ -55,14 +56,20 @@ def make_zip(self, filename, remove_flag=False, overwrite=False):
file_mode = "x"
for file in files:
if not self.__regex_ext.search(file):
_logger.debug("Skip(No target extension): {filename}".format(filename=file))
_logger.debug(
"Skip(No target extension): {filename}".format(filename=file)
)
else:
try:
with zipfile.ZipFile(filename, file_mode, zipfile.ZIP_DEFLATED) as zip_file:
with zipfile.ZipFile(
filename, file_mode, zipfile.ZIP_DEFLATED
) as zip_file:
zip_file.write(file)
count += 1
_logger.debug("Add Zipfile n files: {count}. Filename: "
"{filename}".format(count=count, filename=file))
_logger.debug(
"Add Zipfile n files: {count}. Filename: "
"{filename}".format(count=count, filename=file)
)
file_mode = "a"
except FileExistsError:
raise ZipFileExistError()
Expand Down
273 changes: 151 additions & 122 deletions ebook_homebrew/cli.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,132 +17,161 @@ def main():
epilog="More information? Access here: https://github.com/tubone24/ebook_homebrew",
add_help=True,
)
parser.add_argument("-v", "--version",
action="store_true",
help="Show version")
parser.add_argument("-v", "--version", action="store_true", help="Show version")

subparsers = parser.add_subparsers(description="Choose subcommands. Usually choose \"auto\"")
subparsers = parser.add_subparsers(
description='Choose subcommands. Usually choose "auto"'
)

parser_auto = subparsers.add_parser("auto",
description="Make only digit file name, "
"convert e-book file such as PDF",
help="Make only digit file name, "
"convert e-book file such as PDF")
parser_auto = subparsers.add_parser(
"auto",
description="Make only digit file name, " "convert e-book file such as PDF",
help="Make only digit file name, " "convert e-book file such as PDF",
)

parser_auto.set_defaults(handler=execute_auto)

parser_auto.add_argument("-s", "--src_dir",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Source directory which put original image files.",
metavar="SRC_DIR")

parser_auto.add_argument("--dst_dir",
action="store",
nargs=1,
const=None,
default=None,
type=str,
help="Destination directory which put e-book file.",
metavar="DST_DIR")

parser_auto.add_argument("-d", "--digit",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Serial number digits you remain file name",
metavar="N,N")

parser_auto.add_argument("-e", "--extension",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="EXT")

parser_auto.add_argument("-f", "--filename",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="FILENAME")

parser_auto.add_argument("-m", "--manual",
action="store_true",
help="Duplicate file name, solving manually.")

parser_auto.add_argument("-r", "--remove",
action="store_true",
help="Remove original image file.")

parser_auto.add_argument("-y", "--assume_yes",
action="store_true",
help="no verify users.")

parser_make_zip = subparsers.add_parser("makezip",
description="Make zip file for files "
"which you choose extension.",
help="Make zip file for adding specify extension files.")

parser_make_zip.add_argument("-s", "--src_dir",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Source directory which put original image files.",
metavar="SRC_DIR")

parser_make_zip.add_argument("--dst_dir",
action="store",
nargs=1,
const=None,
default=None,
type=str,
help="Destination directory which put e-book file.",
metavar="DST_DIR")

parser_make_zip.add_argument("-e", "--extension",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="EXT")

parser_make_zip.add_argument("-f", "--filename",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="FILENAME")

parser_make_zip.add_argument("-r", "--remove",
action="store_true",
help="Remove original image file.")

parser_make_zip.add_argument("-y", "--assume_yes",
action="store_true",
help="no verify users.")
parser_auto.add_argument(
"-s",
"--src_dir",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Source directory which put original image files.",
metavar="SRC_DIR",
)

parser_auto.add_argument(
"--dst_dir",
action="store",
nargs=1,
const=None,
default=None,
type=str,
help="Destination directory which put e-book file.",
metavar="DST_DIR",
)

parser_auto.add_argument(
"-d",
"--digit",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Serial number digits you remain file name",
metavar="N,N",
)

parser_auto.add_argument(
"-e",
"--extension",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="EXT",
)

parser_auto.add_argument(
"-f",
"--filename",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="FILENAME",
)

parser_auto.add_argument(
"-m",
"--manual",
action="store_true",
help="Duplicate file name, solving manually.",
)

parser_auto.add_argument(
"-r", "--remove", action="store_true", help="Remove original image file."
)

parser_auto.add_argument(
"-y", "--assume_yes", action="store_true", help="no verify users."
)

parser_make_zip = subparsers.add_parser(
"makezip",
description="Make zip file for files " "which you choose extension.",
help="Make zip file for adding specify extension files.",
)

parser_make_zip.add_argument(
"-s",
"--src_dir",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Source directory which put original image files.",
metavar="SRC_DIR",
)

parser_make_zip.add_argument(
"--dst_dir",
action="store",
nargs=1,
const=None,
default=None,
type=str,
help="Destination directory which put e-book file.",
metavar="DST_DIR",
)

parser_make_zip.add_argument(
"-e",
"--extension",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="EXT",
)

parser_make_zip.add_argument(
"-f",
"--filename",
action="store",
nargs=1,
const=None,
default=None,
required=True,
type=str,
help="Destination directory which put e-book file.",
metavar="FILENAME",
)

parser_make_zip.add_argument(
"-r", "--remove", action="store_true", help="Remove original image file."
)

parser_make_zip.add_argument(
"-y", "--assume_yes", action="store_true", help="no verify users."
)

args = parser.parse_args()

Expand All @@ -154,5 +183,5 @@ def main():
parser.print_help()


if __name__ == '__main__':
if __name__ == "__main__":
main()
11 changes: 9 additions & 2 deletions ebook_homebrew/convert.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class Image2PDF(Common):
"""Make pdf file for using e-books.
"""

def __init__(self, digits, extension, directory_path=None):
"""Constructor
Expand Down Expand Up @@ -67,15 +68,21 @@ def make_pdf(self, filename, remove_flag=False):
pdf_file = self._convert_image_to_pdf(file)

if self._merge_pdf_file(pdf_file, filename):
logger.info("Success write pdf for {page} page.".format(page=page_count + 1))
logger.info(
"Success write pdf for {page} page.".format(page=page_count + 1)
)
page_count += 1
if remove_flag:
remove_files.append(file)
logger.info("-" * 55)
if page_count == 0:
logger.warn("Target file doesn't exist... Finish.")
return False
logger.info("All image file are converted. Filename: {filename}".format(filename=filename))
logger.info(
"All image file are converted. Filename: {filename}".format(
filename=filename
)
)
if self._remove_file_bulk(remove_files):
logger.info("Post possess is finished")
return True
Expand Down

0 comments on commit 334d06a

Please sign in to comment.