--- a/.hgignore Wed Jun 03 19:26:26 2009 +0300
+++ b/.hgignore Wed Jun 03 19:40:35 2009 +0300
@@ -3,3 +3,4 @@
^MANIFEST$
^dist/
\.sw[op]$
+\.pyc$
--- a/bin/degal Wed Jun 03 19:26:26 2009 +0300
+++ b/bin/degal Wed Jun 03 19:40:35 2009 +0300
@@ -1,30 +1,14 @@
#!/usr/bin/env python2.5
#
# DeGAL - A pretty simple web image gallery
-# Copyright (C) 2007 Tero Marttila
-# http://marttila.de/~terom/degal/
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
+# Copyright 2008 Tero Marttila
#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the
-# Free Software Foundation, Inc.,
-# 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#
+
+from degal import folder, shorturl, log
import os.path, os
from optparse import OptionParser
-from lib import folder, shorturl, log
-
def main (dir='.', targets=()) :
root_filter = {}
@@ -41,10 +25,11 @@
root = folder.Folder(dir)
root.index(root_filter)
log.up()
-
- log.title("Syncing ShortURLs...")
- shorturl.updateDB(root)
- log.up()
+
+ if False :
+ log.title("Syncing ShortURLs...")
+ shorturl.updateDB(root)
+ log.up()
log.title("Rendering updated dirs...")
root.render()
--- a/degal/db.py Wed Jun 03 19:26:26 2009 +0300
+++ b/degal/db.py Wed Jun 03 19:40:35 2009 +0300
@@ -1,6 +1,10 @@
import sqlite3
-conn = sqlite3.connect("db/degal.db")
+try :
+ conn = sqlite3.connect("db/degal.db")
+
+except sqlite3.OperationalError :
+ conn = None
def execute (expr, *args) :
c = conn.cursor()
@@ -54,5 +58,7 @@
delete_many = execute_commit_many
-cursor = conn.cursor
+if conn :
+ cursor = conn.cursor
+
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/degal/resources.py Wed Jun 03 19:40:35 2009 +0300
@@ -0,0 +1,10 @@
+"""
+ Resource management
+"""
+
+import pkg_resources
+
+# path to package template files
+TEMPLATE_DIR = pkg_resources.resource_filename('degal', 'templates')
+STATIC_DIR = pkg_resources.resource_filename('degal', 'static')
+
--- a/degal/template.py Wed Jun 03 19:26:26 2009 +0300
+++ b/degal/template.py Wed Jun 03 19:40:35 2009 +0300
@@ -1,7 +1,7 @@
from mako import exceptions
from mako.lookup import TemplateLookup
-import settings, helpers
+import settings, resources, helpers
import log
@@ -10,8 +10,8 @@
"""
_lookup = TemplateLookup(
- directories=[settings.TEMPLATE_DIR],
- module_directory='%s/cache' % settings.TEMPLATE_DIR,
+ directories=[resources.TEMPLATE_DIR],
+# module_directory='%s/cache' % settings.TEMPLATE_DIR,
output_encoding='utf-8',
filesystem_checks=False, # this may need to be changed if used in a long-term process
)