forks/sigal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change params management, replace ConfigObj by ConfigParser

Browse Source
This commit is contained in:
Simon
2011-04-12 00:15:56 +02:00
parent 5fd0c545a9
commit 4db182c4a1
6 changed files with 105 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
runtests.py
View File

@@ -29,14 +29,13 @@ from sigal.image import Gallery
from sigal.params import read_params
if __name__ == '__main__':
# read params from config file
config_file = os.path.join(sys.path[0], 'sigal.conf')
print ":: Reading parameters ..."
params = read_params(config_file)
params = read_params("./test")
print "\n".join(["%s=%s" % (k, v) for k, v in params.items()])
print "\n"
print ":: params :"
print params.items('sigal')
# print "\n".join(["%s=%s" % (k, v) for k, v in params.items()])
# print "\n"
# create gallery
gallery = Gallery(params)

27
sigal.conf
View File

@@ -1,27 +0,0 @@
## main settings
# size of resized image
im_width=640
im_height=480
# prefix for thumbnails name
thumb_prefix=TN-
# thumbnail size
thumb_width=150
thumb_height=112
# keep big image
bigimg=1
# generate squared thumbnails
squarethumb=1
# jpeg quality
jpgquality=90
# keep exif metadatas in output image
exif=1
# add a copyright text on the image
copyright=1
## core settings
thumb_dir=thumbnail
bigimg_dir=pwg_high
fileExtList=.jpg,.jpeg,.JPG,.JPEG,.png

12
sigal.py
View File

@@ -44,8 +44,8 @@ def main():
parser = OptionParser(usage=usage, version="%prog "+version)
parser.add_option("-c", "--config", dest="config",
help="specify an alternative config file")
# parser.add_option("-c", "--config", dest="config",
# help="specify an alternative config file")
(options, args) = parser.parse_args()
@@ -64,12 +64,8 @@ def main():
print "Create %s" % output_dir
os.makedirs(output_dir)
# read params from config file
config_file = options.config if options.config \
else os.path.join(sys.path[0], 'sigal.conf')
print "Reading parameters ..."
params = read_params(config_file)
print ":: Reading parameters ..."
params = read_params(input_dir)
# create gallery
gallery = Gallery(params)

92
sigal/image.py
View File

@@ -33,33 +33,43 @@ class Gallery:
"Prepare a gallery of images for Piwigo"
def __init__(self, params):
self.filepath = ""
self.params = params
self.imsize = self.getsize(params.get('sigal', 'img_size'))
self.bigimg = params.getint('sigal', 'big_img')
self.bigimg_dir = params.get('sigal', 'bigimg_dir')
def getpath(self, pathname):
"return abslolute path from params dict"
return os.path.join(self.filepath, self.params[pathname]) \
if self.params.has_key(pathname) else ""
self.thumb_size = self.getsize(params.get('sigal', 'thumb_size'))
self.thumb_dir = params.get('sigal', 'thumb_dir')
self.thumb_prefix = params.get('sigal', 'thumb_prefix')
self.square_thumb = params.getint('sigal', 'square_thumb')
self.jpgquality = params.getint('sigal', 'jpg_quality')
self.exif = params.getint('sigal', 'exif')
self.copyright = params.getint('sigal', 'copyright')
self.fileExtList = params.get('sigal', 'fileExtList')
def getsize(self, string):
size = [int(i) for i in string.split("x")]
if size[1] > size[0]:
size[0], size[1] = size[1], size[0]
return tuple(size)
def create_gallery(self, input_dir, output_dir):
"create image gallery"
imglist = get_filelist(input_dir, self.params['fileExtList'])
imglist = get_filelist(input_dir, self.fileExtList)
print "Found %i images in %s" % (len(imglist), input_dir)
self.filepath = output_dir
self.output_dir = output_dir
self.bigimg_dir = os.path.join(self.output_dir, self.bigimg_dir)
self.thumb_dir = os.path.join(self.output_dir, self.thumb_dir)
print "Create output directories ..."
try:
os.makedirs(self.getpath('thumb_dir'))
os.makedirs(self.thumb_dir)
if self.bigimg:
os.mkdir(self.bigimg_dir)
except OSError:
pass
if self.params['bigimg']:
try:
os.mkdir(self.getpath('bigimg_dir'))
except OSError:
pass
return self.process_images(imglist)
def process_images(self, imglist):
@@ -75,7 +85,7 @@ class Gallery:
imgname = raw_input('Enter new image name: ')
nfill = 2 if (len(imglist)<100) else 3
if self.params['copyright']:
if self.copyright:
copyrightmsg = raw_input('Enter copyright message: ')
copyrightmsg = '\xa9 ' + copyrightmsg
@@ -91,21 +101,19 @@ class Gallery:
else:
print "%s" % filename
if self.params['bigimg']:
im.save(os.path.join(self.getpath('bigimg_dir'), filename),
quality=self.params['jpgquality'])
out_bigimglist.append(os.path.join(self.getpath('bigimg_dir'),
filename))
if self.bigimg:
im.save(os.path.join(self.bigimg_dir, filename),
quality=self.jpgquality)
out_bigimglist.append(os.path.join(self.bigimg_dir, filename))
# resize image
if im.size[0] > im.size[1]:
im_size = (self.params['im_width'], self.params['im_height'])
im2 = im.resize(self.imsize, Image.ANTIALIAS)
else:
im_size = (self.params['im_height'], self.params['im_width'])
im2 = im.resize(im_size, Image.ANTIALIAS)
im2 = im.resize([self.imsize[1], self.imsize[0]], Image.ANTIALIAS)
# create thumbnail
if self.params['squarethumb']:
if self.square_thumb:
if im.size[0] > im.size[1]:
offset = (im.size[0] - im.size[1])/2
box = (offset, 0, im.size[0]-offset, im.size[1])
@@ -114,33 +122,31 @@ class Gallery:
box = (0, offset, im.size[0], im.size[1]-offset)
im = im.crop(box)
thumbsize = (self.params['thumb_width'],
self.params['thumb_width'])
thumb_size = [self.thumb_size[0], self.thumb_size[0]]
elif im.size[0] > im.size[1]:
thumb_size = self.thumb_size
else:
thumbsize = (self.params['thumb_width'],
self.params['thumb_height'])
thumb_size = [self.thumb_size[1], self.thumb_size[0]]
im.thumbnail(thumbsize, Image.ANTIALIAS)
im.thumbnail(thumb_size, Image.ANTIALIAS)
# copyright
if self.params['copyright']:
if self.copyright:
draw = ImageDraw.Draw(im2)
draw.text((5, im2.size[1]-15), copyrightmsg)
# save
im.save(os.path.join(self.getpath('thumb_dir'),
self.params['thumb_prefix']+filename),
quality=self.params['jpgquality'])
im2.save(os.path.join(self.filepath, filename),
quality=self.params['jpgquality'])
im.save(os.path.join(self.thumb_dir, self.thumb_prefix+filename),
quality=self.jpgquality)
im2.save(os.path.join(self.output_dir, filename),
quality=self.jpgquality)
out_thumblist.append(os.path.join(self.getpath('thumb_dir'),
self.params['thumb_prefix']+
filename))
out_imglist.append(os.path.join(self.filepath, filename))
out_thumblist.append(os.path.join(self.thumb_dir,
self.thumb_prefix+filename))
out_imglist.append(os.path.join(self.output_dir, filename))
if self.params['exif']:
self.process_exif(f, os.path.join(self.filepath, filename))
if self.exif:
self.process_exif(f, os.path.join(self.output_dir, filename))
return [out_imglist, out_thumblist, out_bigimglist]
@@ -149,7 +155,7 @@ class Gallery:
try:
import pyexiv2
except ImportError:
self.params['exif'] = 0
self.exif = 0
print "Error: install pyexiv2 module to use exif metadatas."
return

42
sigal/params.py
View File

@@ -19,21 +19,35 @@
"""Parameters utils"""
from configobj import ConfigObj
import os
import ConfigParser
def read_params(config_file):
CONFIGFILE = '~/.sigal/config'
SOURCEDIR_CONFIGFILE = 'sigal.conf'
CONFIGDEFAULTS = {
'img_size': '640x480',
'thumb_prefix': '',
'thumb_size': '150x112',
'big_img': 1,
'square_thumb': 1,
'jpg_quality': 90,
'exif': 1,
'copyright': 0,
'thumb_dir': "thumbnail",
'bigimg_dir': "pwg_high",
'fileExtList': ".jpg,.jpeg,.JPG,.JPEG,.png"
}
def read_params(source_dir):
"Read params from a config file"
params = ConfigObj(config_file,file_error=True)
# Read configuration file
config = ConfigParser.ConfigParser(defaults = CONFIGDEFAULTS)
config.read(os.path.expanduser(CONFIGFILE))
# convert types
params["im_width"] = int(params["im_width"])
params["im_height"] = int(params["im_height"])
params["thumb_width"] = int(params["thumb_width"])
params["thumb_height"] = int(params["thumb_height"])
params["bigimg"] = int(params["bigimg"])
params["squarethumb"] = int(params["squarethumb"])
params["jpgquality"] = int(params["jpgquality"])
params["exif"] = int(params["exif"])
params["copyright"] = int(params["copyright"])
return params
# Load a config file in the source_dir root
sourcedir_configfile = os.path.join(source_dir, SOURCEDIR_CONFIGFILE)
if os.path.isfile(sourcedir_configfile):
config.read(sourcedir_configfile)
return config

19
test/sigal.conf Normal file
View File

@@ -0,0 +1,19 @@
[sigal]
# size of resized image
img_size = 640x480
# prefix for thumbnails name
thumb_prefix = TN-
# thumbnail size
thumb_size = 150x112
# keep big image
big_img = 1
# generate squared thumbnails
square_thumb = 1
# jpeg quality
jpg_quality = 90
# keep exif metadatas in output image
exif = 1
# add a copyright text on the image
copyright = 1