josch/img2pdf
3
6
Fork 10
Code Issues 22 Pull requests 5 Projects Releases 3 Wiki Activity

do not use root logger for logging

Browse source
This commit is contained in:
Johannes Schauer Marin Rodrigues 2021-04-12 14:12:14 +02:00
parent c48e1dbb1e
commit 6cd819d28f
Signed by: josch
GPG key ID: F2CBA5C78FBD83E1
1 changed files with 32 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

62
src/img2pdf.py
View file

@ -36,6 +36,8 @@ import platform
import hashlib import hashlib
from itertools import chain from itertools import chain
logger = logging.getLogger(__name__)
have_pdfrw = True have_pdfrw = True
try: try:
import pdfrw import pdfrw
@ -1177,10 +1179,10 @@ def get_imgmetadata(imgdata, imgformat, default_dpi, colorspace, rawdata=None):
ics = imgdata.mode ics = imgdata.mode
if ics in ["LA", "PA", "RGBA"] or "transparency" in imgdata.info: if ics in ["LA", "PA", "RGBA"] or "transparency" in imgdata.info:
logging.warning("Image contains transparency which cannot be retained in PDF.") logger.warning("Image contains transparency which cannot be retained in PDF.")
logging.warning("img2pdf will not perform a lossy operation.") logger.warning("img2pdf will not perform a lossy operation.")
logging.warning("You can remove the alpha channel using imagemagick:") logger.warning("You can remove the alpha channel using imagemagick:")
logging.warning( logger.warning(
" $ convert input.png -background white -alpha " " $ convert input.png -background white -alpha "
"remove -alpha off output.png" "remove -alpha off output.png"
) )
@ -1201,7 +1203,7 @@ def get_imgmetadata(imgdata, imgformat, default_dpi, colorspace, rawdata=None):
imgdata.tag_v2.get(TiffImagePlugin.Y_RESOLUTION, default_dpi), imgdata.tag_v2.get(TiffImagePlugin.Y_RESOLUTION, default_dpi),
) )
logging.debug("input dpi = %d x %d", *ndpi) logger.debug("input dpi = %d x %d", *ndpi)
rotation = 0 rotation = 0
if hasattr(imgdata, "_getexif") and imgdata._getexif() is not None: if hasattr(imgdata, "_getexif") and imgdata._getexif() is not None:
@ -1224,11 +1226,11 @@ def get_imgmetadata(imgdata, imgformat, default_dpi, colorspace, rawdata=None):
else: else:
raise ExifOrientationError("Invalid rotation (%d)" % value) raise ExifOrientationError("Invalid rotation (%d)" % value)
logging.debug("rotation = %d°", rotation) logger.debug("rotation = %d°", rotation)
if colorspace: if colorspace:
color = colorspace color = colorspace
logging.debug("input colorspace (forced) = %s", color) logger.debug("input colorspace (forced) = %s", color)
else: else:
color = None color = None
for c in Colorspace: for c in Colorspace:
@ -1258,13 +1260,13 @@ def get_imgmetadata(imgdata, imgformat, default_dpi, colorspace, rawdata=None):
# with the first approach for now. # with the first approach for now.
if "adobe" in imgdata.info: if "adobe" in imgdata.info:
color = Colorspace["CMYK;I"] color = Colorspace["CMYK;I"]
logging.debug("input colorspace = %s", color.name) logger.debug("input colorspace = %s", color.name)
iccp = None iccp = None
if "icc_profile" in imgdata.info: if "icc_profile" in imgdata.info:
iccp = imgdata.info.get("icc_profile") iccp = imgdata.info.get("icc_profile")
logging.debug("width x height = %dpx x %dpx", imgwidthpx, imgheightpx) logger.debug("width x height = %dpx x %dpx", imgwidthpx, imgheightpx)
return (color, ndpi, imgwidthpx, imgheightpx, rotation, iccp) return (color, ndpi, imgwidthpx, imgheightpx, rotation, iccp)
@ -1292,8 +1294,8 @@ def ccitt_payload_location_from_pil(img):
(offset,), (length,) = strip_offsets, strip_bytes (offset,), (length,) = strip_offsets, strip_bytes
logging.debug("TIFF strip_offsets: %d" % offset) logger.debug("TIFF strip_offsets: %d" % offset)
logging.debug("TIFF strip_bytes: %d" % length) logger.debug("TIFF strip_bytes: %d" % length)
return offset, length return offset, length
@ -1301,7 +1303,7 @@ def ccitt_payload_location_from_pil(img):
def transcode_monochrome(imgdata): def transcode_monochrome(imgdata):
"""Convert the open PIL.Image imgdata to compressed CCITT Group4 data""" """Convert the open PIL.Image imgdata to compressed CCITT Group4 data"""
logging.debug("Converting monochrome to CCITT Group4") logger.debug("Converting monochrome to CCITT Group4")
# Convert the image to Group 4 in memory. If libtiff is not installed and # Convert the image to Group 4 in memory. If libtiff is not installed and
# Pillow is not compiled against it, .save() will raise an exception. # Pillow is not compiled against it, .save() will raise an exception.
@ -1365,7 +1367,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
if imgformat is None: if imgformat is None:
imgformat = ImageFormat.other imgformat = ImageFormat.other
logging.debug("imgformat = %s", imgformat.name) logger.debug("imgformat = %s", imgformat.name)
# depending on the input format, determine whether to pass the raw # depending on the input format, determine whether to pass the raw
# image or the zlib compressed color information # image or the zlib compressed color information
@ -1382,7 +1384,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
if color == Colorspace["RGBA"]: if color == Colorspace["RGBA"]:
raise JpegColorspaceError("jpeg can't have an alpha channel") raise JpegColorspaceError("jpeg can't have an alpha channel")
im.close() im.close()
logging.debug("read_images() embeds a JPEG") logger.debug("read_images() embeds a JPEG")
return [ return [
( (
color, color,
@ -1419,7 +1421,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
depth = rawdata[24] depth = rawdata[24]
if depth not in [1, 2, 4, 8, 16]: if depth not in [1, 2, 4, 8, 16]:
raise ValueError("invalid bit depth: %d" % depth) raise ValueError("invalid bit depth: %d" % depth)
logging.debug("read_images() embeds a PNG") logger.debug("read_images() embeds a PNG")
return [ return [
( (
color, color,
@ -1503,7 +1505,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
# msb-to-lsb: nothing to do # msb-to-lsb: nothing to do
pass pass
elif fillorder == 2: elif fillorder == 2:
logging.debug("fillorder is lsb-to-msb => reverse bits") logger.debug("fillorder is lsb-to-msb => reverse bits")
# lsb-to-msb: reverse bits of each byte # lsb-to-msb: reverse bits of each byte
rawdata = bytearray(rawdata) rawdata = bytearray(rawdata)
for i in range(len(rawdata)): for i in range(len(rawdata)):
@ -1511,7 +1513,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
rawdata = bytes(rawdata) rawdata = bytes(rawdata)
else: else:
raise ValueError("unsupported FillOrder: %d" % fillorder) raise ValueError("unsupported FillOrder: %d" % fillorder)
logging.debug("read_images() embeds Group4 from TIFF") logger.debug("read_images() embeds Group4 from TIFF")
result.append( result.append(
( (
color, color,
@ -1530,7 +1532,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
img_page_count += 1 img_page_count += 1
continue continue
logging.debug("Converting frame: %d" % img_page_count) logger.debug("Converting frame: %d" % img_page_count)
color, ndpi, imgwidthpx, imgheightpx, rotation, iccp = get_imgmetadata( color, ndpi, imgwidthpx, imgheightpx, rotation, iccp = get_imgmetadata(
imgdata, imgformat, default_dpi, colorspace imgdata, imgformat, default_dpi, colorspace
@ -1540,7 +1542,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
if color == Colorspace["1"]: if color == Colorspace["1"]:
try: try:
ccittdata = transcode_monochrome(imgdata) ccittdata = transcode_monochrome(imgdata)
logging.debug("read_images() encoded a B/W image as CCITT group 4") logger.debug("read_images() encoded a B/W image as CCITT group 4")
result.append( result.append(
( (
color, color,
@ -1559,8 +1561,8 @@ def read_images(rawdata, colorspace, first_frame_only=False):
img_page_count += 1 img_page_count += 1
continue continue
except Exception as e: except Exception as e:
logging.debug(e) logger.debug(e)
logging.debug("Converting colorspace 1 to L") logger.debug("Converting colorspace 1 to L")
newimg = imgdata.convert("L") newimg = imgdata.convert("L")
color = Colorspace.L color = Colorspace.L
elif color in [ elif color in [
@ -1570,7 +1572,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
Colorspace["CMYK;I"], Colorspace["CMYK;I"],
Colorspace.P, Colorspace.P,
]: ]:
logging.debug("Colorspace is OK: %s", color) logger.debug("Colorspace is OK: %s", color)
newimg = imgdata newimg = imgdata
else: else:
raise ValueError("unknown or unsupported colorspace: %s" % color.name) raise ValueError("unknown or unsupported colorspace: %s" % color.name)
@ -1578,7 +1580,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
# compression # compression
if color in [Colorspace.CMYK, Colorspace["CMYK;I"]]: if color in [Colorspace.CMYK, Colorspace["CMYK;I"]]:
imggz = zlib.compress(newimg.tobytes()) imggz = zlib.compress(newimg.tobytes())
logging.debug("read_images() encoded CMYK with flate compression") logger.debug("read_images() encoded CMYK with flate compression")
result.append( result.append(
( (
color, color,
@ -1609,7 +1611,7 @@ def read_images(rawdata, colorspace, first_frame_only=False):
depth = ord(pngbuffer.read(1)) depth = ord(pngbuffer.read(1))
if depth not in [1, 2, 4, 8, 16]: if depth not in [1, 2, 4, 8, 16]:
raise ValueError("invalid bit depth: %d" % depth) raise ValueError("invalid bit depth: %d" % depth)
logging.debug("read_images() encoded an image as PNG") logger.debug("read_images() encoded an image as PNG")
result.append( result.append(
( (
color, color,
@ -2040,7 +2042,7 @@ def convert(*images, **kwargs):
userunit = None userunit = None
if pagewidth < 3.00 or pageheight < 3.00: if pagewidth < 3.00 or pageheight < 3.00:
logging.warning( logger.warning(
"pdf width or height is below 3.00 - too small for some viewers!" "pdf width or height is below 3.00 - too small for some viewers!"
) )
elif pagewidth > 14400.0 or pageheight > 14400.0: elif pagewidth > 14400.0 or pageheight > 14400.0:
@ -3614,7 +3616,7 @@ and left/right, respectively. It is not possible to specify asymmetric borders.
# if no positional arguments were supplied, read a single image from # if no positional arguments were supplied, read a single image from
# standard input # standard input
if len(args.images) == 0: if len(args.images) == 0:
logging.info("reading image from standard input") logger.info("reading image from standard input")
try: try:
args.images = [sys.stdin.buffer.read()] args.images = [sys.stdin.buffer.read()]
except KeyboardInterrupt: except KeyboardInterrupt:
@ -3625,14 +3627,14 @@ and left/right, respectively. It is not possible to specify asymmetric borders.
if args.viewer_initial_page is not None: if args.viewer_initial_page is not None:
if args.viewer_initial_page < 1: if args.viewer_initial_page < 1:
parser.print_usage(file=sys.stderr) parser.print_usage(file=sys.stderr)
logging.error( logger.error(
"%s: error: argument --viewer-initial-page: must be " "%s: error: argument --viewer-initial-page: must be "
"greater than zero" % parser.prog "greater than zero" % parser.prog
) )
sys.exit(2) sys.exit(2)
if args.viewer_initial_page > len(args.images): if args.viewer_initial_page > len(args.images):
parser.print_usage(file=sys.stderr) parser.print_usage(file=sys.stderr)
logging.error( logger.error(
"%s: error: argument --viewer-initial-page: must be " "%s: error: argument --viewer-initial-page: must be "
"less than or equal to the total number of pages" % parser.prog "less than or equal to the total number of pages" % parser.prog
) )
@ -3669,8 +3671,8 @@ and left/right, respectively. It is not possible to specify asymmetric borders.
pdfa=args.pdfa, pdfa=args.pdfa,
) )
except Exception as e: except Exception as e:
logging.error("error: " + str(e)) logger.error("error: " + str(e))
if logging.getLogger().isEnabledFor(logging.DEBUG): if logger.isEnabledFor(logging.DEBUG):
import traceback import traceback
traceback.print_exc(file=sys.stderr) traceback.print_exc(file=sys.stderr)