Permalink
Browse files

Merging my subversion tree into the latest 2.x code that was on

Sourceforge and is now on GitHub.

Conflicts:
	LICENSE
	README
	setup.py
	tests/test.py
  • Loading branch information...
Ken Fox
Ken Fox committed May 21, 2009
2 parents 1e8fbeb + 2c0a845 commit 3580f00c2f8b3d5415c810188fed1094dfa6cae8
View
@@ -0,0 +1,44 @@
+Version 2.0.0a3
+ - Add pagination to album view page to deal with huge directories of
+ images
+ - Modify date handling to support year/month directories before
+ epoch (Jan 1 1970)
+ - Fix // issue with Apache 2
+ - Change macros template to 'macros.html' from 'page.html'
+ - Fix view caching so it detects changes to underlying items
+
+Version 2.0.0a1, ...
+ - Substantially rearranged dispatch. All CGI entry now goes
+ through sscgi.py which centralizes some error reporting and
+ dispatches to action_* handlers.
+ - Defined a 'virtual' handler for files and directories that do not
+ exist, permitting the action_tag handler to be invoked for /tag/blah
+ - Replaced Cheetah with SimpleTAL for templates
+ - Added support to JpegHeader for reading XMP data from JPEGs
+ - Started to remove support for using raw JPEG comments as captions
+ - Defined mechanism for filtered images and added filters/ directory
+ to contain those filters.
+ - Added PIL-based resizer
+ - Moved image processing from albums.py to imageprocessor.py
+ - Moved tag-related code from albums.py to action_tag.py
+ - Added test script extractor.py for running experiments locally
+ - Removed traceback eating behavior of virtual_demand_property
+ - Started to define prettier template for default singleshot templates.K
+ - Completely rewrote EXIF and IPTC reading.
+ - Virtualized access to the CGI data to enable more deployment
+ options.
+ - Added experimental mod_python and FastCGI interfaces to allow
+ Singleshot to be run as a persistent process (== fast).
+
+Version 1.0.1, 29 March 2004
+ - Bug fix #905628: Setting highlight image in _album.cfg doesn't work
+ - Moved classes around to remove cyclic dependency between some
+ modules
+ - Remove use of system() for resizing images; now uses process.py which in
+ turn uses fork/exec
+ - Improved diagnostic output of resize for error conditions
+ - Made singleshot.py more forgiving of spurious /s in input path
+
+
+Version 1.0.0, 18 January 2004
+-- First public release.
View
45 LICENSE
@@ -1,5 +1,5 @@
Singleshot is a web album publishing package.
-Copyright (C) 2004-2005 Ken Fox http://www.xythian.com/
+Copyright (C) 2004-2009 Ken Fox http://www.xythian.com/
See http://www.singleshot.org/ for Singleshot information.
@@ -53,46 +53,3 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-------------------------------------------------------------------
-Singleshot also includes PyRSS2Gen from:
- http://www.dalkescientific.com/Python/PyRSS2Gen.html
-under the following license:
-
-PyRSS2Gen 0.1.1
------------------------------------------------------------------
-(This is the BSD license, based on the template at
- http://www.opensource.org/licenses/bsd-license.php )
-
-Copyright (c) 2003, Dalke Scientific Software, LLC
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are
-met:
-
- * Redistributions of source code must retain the above copyright
- notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
- notice, this list of conditions and the following disclaimer in
- the documentation and/or other materials provided with the
- distribution.
-
- * Neither the name of the Dalke Scientific Softare, LLC, Andrew
- Dalke, nor the names of its contributors may be used to endorse or
- promote products derived from this software without specific prior
- written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
View
2 README
@@ -31,7 +31,7 @@ You will need the following software installed on your web server
to install Singleshot.
* Apache http://www.apache.org/ with mod_rewrite
- * Python 2.4+ http://www.python.org/
+ * Python 2.5+ http://www.python.org/
* ImageMagick http://www.imagemagick.org
Singleshot relies on setting mod_rewrite directives in .htaccess.
View
@@ -0,0 +1,14 @@
+#
+# Switch to wsgiref for the bare bones running.
+#
+import singleshot.serve
+import singleshot.ssconfig
+import os
+
+jroot = '../../sites/photos.xythian.com'
+root = '../singleshot_testroot'
+root = os.path.abspath(root)
+templates = os.path.join(root, 'templates')
+
+store = singleshot.ssconfig.create_store(root, template_root=templates)
+singleshot.serve.serve_http(store, addr='', port=8080)
View
@@ -0,0 +1,3 @@
+[egg_info]
+tag_build = .dev
+tag_svn_revision = 1
View
@@ -1,15 +1,30 @@
#!/usr/bin/python
+from setuptools import setup, find_packages
-from distutils.core import setup
+# need more than one packaging
+# the all-egg packaging with all dependencies suitable for PyPI
+# the debian packages
-setup(name = 'singleshot', version="2.0.2",
- packages=["singleshot", "singleshot.templates", "simpletal", ""],
+# depends on pytz, imagemagick
+
+setup(name = 'singleshot', version="3.0.0",
+ packages=find_packages(),
author = "Ken Fox",
author_email = "fox@mars.org",
scripts = ['scripts/singleshotinit.py'],
- url= 'http://www.singleshot.org/',
- py_modules = ['PyRSS2Gen'],
- package_dir = {"simpletal" : 'lib/simpletal',
- '' : 'lib',
- 'singleshot' : 'src/singleshot'}
+ install_requires = ["shotweb", "shotlib"],
+ entry_points = """
+ [singleshot.actions]
+ rss = singleshot.action_rss:handle
+
+ [singleshot.handlers]
+ .flv = singleshot.handlers.flv:FLVHandler
+ image/jpeg = singleshot.handlers.magick:ImageMagickHandler
+ image/png = singleshot.handlers.magick:ImageMagickHandler
+ image/gif = singleshot.handlers.magick:ImageMagickHandler
+
+ [singleshot.readers]
+ image/jpeg = singleshot.jpeg:JpegHeader
+ """,
+ url= 'http://www.singleshot.org/'
)
View
@@ -0,0 +1,4 @@
+
+#
+# the singleshot package
+#
Oops, something went wrong.

0 comments on commit 3580f00

Please sign in to comment.