Merge branch 'master' into releases

Author: mox1

.gitignore

@@ -37,6 +37,6 @@ nosetests.xml
 .pydevproject
 
 sessions/
-logs/*.log
+logs/*.log*
 static/upload/
 peewee.db

app.py

@@ -3,14 +3,17 @@
 #err under Apache this is going to cause some issues 
 #because Apache does add "." to path
 import os,sys
+CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
+sys.path.insert(0,CURRENT_DIR)
+import config
 import logging
-import dolog
-dolog.setup_logging(logdir="logs/",scrnlog=False,loglevel=logging.INFO)
-logger = logging.getLogger("")
+logger = logging.getLogger("blogstrap")
 logger.info("Starting blogstrap.py")
+logger.debug("app.py DEBUG messages enabled!")
 
-#redirect stderr to the log
-sys.stderr = dolog.LoggerWriter(logger, logging.DEBUG)
+from dolog import LoggerWriter
+#redirect stderr to stdout and the logger created above
+sys.stderr = LoggerWriter(logger)
 
 from collections import defaultdict
 from datetime import datetime
@@ -19,17 +22,18 @@
 import web
 from web import websafe
 import datetime
-import config
 import model as m
 import hashlib
+import xml.etree.ElementTree as ET
 
-VERSION = "0.9.6-BETA"
+VERSION = "0.9.8-BETA"
 
 logger.info("You are running version %s" % VERSION)
 
-#if you change urls, make sure url[0]  is your homepage!!
+#if you change urls, make sure urls[0]  is your homepage!!
 urls = (
     r"/", "Index",
+    r"/sitemap.xml","SiteMap",
     r"/newest", "IndexFull",
     r"/post", "BlogPost",
     r"/about", "About",
@@ -39,6 +43,7 @@
     r"/contactme", "ContactMe",
     r"/tags", "Tags",
     r"/search", "Search",
+    r"/admin/preview", "Preview",
     r"/admin/(.*)","Admin")
 
 app = web.application(urls, globals())
@@ -51,18 +56,29 @@
 
 # Allow session to be reloadable in development mode.
 if web.config.get("_session") is None:
-    session = web.session.Session(app, web.session.DiskStore("sessions"),
+    session = web.session.Session(app, web.session.DiskStore("%s/sessions" % CURRENT_DIR),
                                   initializer=sinit)
 
     web.config._session = session
 else:
     session = web.config._session
 
 
+b_data = m.BlogData.get(update=True)
+def blog_data(update = False):
+    global b_data
+    if update == False:
+        return b_data
+    else:
+        b_data = m.BlogData.get(update=True)
+        return b_data
+
+
 def update_db():
     global t_globals
     logger.info("Start updating blog data")
     m.BlogData.update_stats()
+    blog_data(update=True)
     logger.info("Finish updating blog data")
 
 
@@ -107,6 +123,7 @@ def csrf_protected(f):
     def decorated(*args,**kwargs):
         inp = web.input()
         if not (inp.has_key('csrf_token') and inp.csrf_token==session.pop('csrf_token',None)):
+            logger.debug("CSRF Detected!!!: ip=%s" % web.ctx.ip )
             raise web.HTTPError(
                 "400 Bad request",
                 {'content-type':'text/html'},
@@ -115,22 +132,13 @@ def decorated(*args,**kwargs):
         return f(*args,**kwargs)
     return decorated
 
-b_data = m.BlogData.get(update=True)
-def blog_data(update = False):
-    global b_data
-    if update == False:
-        return b_data
-    else:
-        b_data = m.BlogData.get(update=True)
-        return b_data
-    
 #lets check if out database tables exist, if not create them
 for x in [m.User,m.Post,m.Image,m.Comment,m.BlogData]:
  #this will fail silently if they already exist
  x.create_table(True)
 
 
-render = web.template.render("templates/",
+render = web.template.render("%s/templates/" % CURRENT_DIR,
                              #base="base",
                              cache=config.cache)
 t_globals = web.template.Template.globals
@@ -158,6 +166,42 @@ def blog_data(update = False):
 print "Admin page currently set to: /admin/%s" % blog_data().adminurl
 logger.info("Admin page currently set to: /admin/%s" % blog_data().adminurl)
 
+#Dynamically Generated sitemap.xml 
+#By default simply includes links to all blog posts that are public
+class SiteMap:
+    def GET(self):
+        host = web.ctx.home
+        print web.ctx
+        #1st get all public posts
+        posts = m.Post.all()
+        #generate opening xml
+        urlset = ET.Element("urlset",xmlns="http://www.sitemaps.org/schemas/sitemap/0.9")
+        #add root
+        url = ET.SubElement(urlset,"url")
+        loc = ET.SubElement(url,"loc")
+        loc.text = "%s/" % host
+        lastmod = ET.SubElement(url,"lastmod")
+        lastmod.text = datetime.datetime.now().strftime("%Y-%m-%d")
+        changefreq = ET.SubElement(url,"changefreq")
+        changefreq.text = "daily"
+        priority = ET.SubElement(url,"priority")
+        priority.text = "0.8"
+        
+        for post in posts:
+            url = ET.SubElement(urlset,"url")
+            loc = ET.SubElement(url,"loc")
+            loc.text = "%s/post?pid=%d" % (host,post.id)
+            lastmod = ET.SubElement(url,"lastmod")
+            lastmod.text = post.updated.strftime("%Y-%m-%d")
+            changefreq = ET.SubElement(url,"changefreq")
+            changefreq.text = "yearly"
+        
+        #ok return xml
+        web.header("Content-Type", "text/xml; charset=utf-8")
+        return ET.tostring(urlset, encoding="utf-8", method="xml")
+        
+        
+
 
 #This is the main Admin handler class. All admin functions are executed through POST's
 #utilizing a method=XXX variable passed by an ajax call, a form, etc.
@@ -187,7 +231,7 @@ def GET(self,url):
                 #show login page
                 return render.fullpageindex("Please Login to Continue",render.login(),"")
         else:
-            images = m.Image.get_all()
+            images = m.Image.get_all(private=True)
             return render.fullpageindex("Logged in as %s" % session.dispname,render.admin(images),render.bottom_admin())
 
     def POST(self,url):
@@ -265,7 +309,7 @@ def POST(self,url):
                 resl = m.Post.all(evenprivate=True)
                 return render.datatable_posts(resl)
             elif method == "getallimages":
-                images = m.Image.get_all()
+                images = m.Image.get_all(private=True)
                 return render.datatable_images(images)
             elif method == "getcomments":
                 id = data.get("id","-1")
@@ -274,7 +318,7 @@ def POST(self,url):
             elif method == "getsinglepost":
                 id = data.get("id","-1")
                 resl = m.Post.get(m.Post.id==id)
-                images = m.Image.get_all()
+                images = m.Image.get_all(private=True)
                 return render.adminsinglepost(resl,images)
             elif method == "getsingleimage":
                 id = data.get("id","-1")
@@ -409,6 +453,35 @@ def GET(self):
 
         return render.blogdetail(post,count,comments,next,prev,session.logged_in)
 
+
+class Preview:
+    def POST(self):
+        if session.logged_in == False:
+            logger.info("Attempt to get preview page while not logged in!?")
+            return web.notfound()
+        else:
+            data = web.input(nifile={})
+            (resl,msg) = m.Post.update_from_input(data,session.uid)
+            if resl == None:
+                flash("There was a problem previewing: %s" % msg)
+                return web.seeother(urls[0])
+            
+            post = resl
+            flash("success","Below is a preview of your posting. To save this switch to the other tab and click \"Update Post\"")
+            count,comments = m.Comment.get_comments(post.id,False)
+            #for next and prev links
+            try:
+                next = m.Post.get_next(post.created_at,1).get()
+            except:
+                next = None
+            try:
+                prev = m.Post.get_prev(post.created_at,1).get()
+            except:
+                prev = None
+                
+            return render.blogdetail(post,count,comments,next,prev,session.logged_in)
+            
+            
 class BlogPost:
     def GET(self):
         pid = -1
@@ -419,7 +492,7 @@ def GET(self):
                 raise Exception
         except:
             flash("error", "Sorry, that post doesn't exist!")
-            return web.seeother("/")
+            return web.seeother(urls[0])
 
         #for next and prev links
         try:
@@ -435,7 +508,9 @@ def GET(self):
         return render.blogdetail(post,count,comments,next,prev,session.logged_in)
 class About:
     def GET(self):
-        return render.about(m.User.by_id(1))
+        #TODO: Eventually if we support multple users, fix this
+        user = m.User.by_id(1)
+        return render.about(user)
 
 class ContactMe:
     def POST(self):
@@ -471,7 +546,7 @@ def POST(self):
             #failure, return him to homepage with a flash msg
             flash("error","Sorry, you failed the spam test, post not accepted. Turn on javascript.")
             print "New comment SPAM test failed by %s" % ip 
-            return web.seeother(url[0])
+            return web.seeother(urls[0])
 
         postid = websafe(int(data.get("pid","-1")))
         text = websafe(data.get("message",None))
@@ -495,7 +570,7 @@ def POST(self):
             user = m.User.by_id(session.uid)
             author = user.name
             email = user.email
-        c1 = m.Comment.new(postid,parentid,title,author,text,email,session.logged_in,ip)
+        c1 = m.Comment.new(postid,parentid,title,author,text,email,session.logged_in,ip,web.sendmail)
         if c1 != None:
             flash("success","Thanks for joining the discussion!")
         else:

config.py

@@ -1,9 +1,15 @@
-import logging
-logger = logging.getLogger("")
 import os
 import sys
+
+CURRENT_DIR = os.path.dirname(os.path.realpath(__file__))
+#sys.path.insert(0,os.path.dirname(os.path.realpath(__file__)))
+import dolog
+import logging
+logger = dolog.setup_logging("blogstrap",logdir="%s/logs/" % CURRENT_DIR,scrnlog=False,loglevel=logging.DEBUG)
 import web
 
+
+
 ####USER EDITABLE####
 #disabled by default, set to true to enable
 EMAIL_ERRORS = False
@@ -52,7 +58,7 @@
 if env == "production":
     web.config.debug = False
     cache = True
-    logging.getLogger("").setLevel(logging.INFO)
+    #logging.getLogger("").setLevel(logging.INFO)
     email_errors.to_address = ERROR_EMAIL_ADDR
 elif env == "staging":
     dac_host = "localhost:8000"

dolog.py

@@ -2,15 +2,16 @@
 from logging.handlers import RotatingFileHandler
 import os
 
-def setup_logging(logdir=None, scrnlog=True, txtlog=True, loglevel=logging.DEBUG):
+def setup_logging(name,logdir=None, scrnlog=True, txtlog=True, loglevel=logging.DEBUG):
     logdir = os.path.abspath(logdir)
 
     if not os.path.exists(logdir):
         os.mkdir(logdir)
 
-    log = logging.getLogger("")
+    log = logging.getLogger(name)
     log.setLevel(loglevel)
-
+    log.propagate = False
+    
     log_formatter = logging.Formatter("%(asctime)s - %(name)s - %(levelname)s - %(message)s")
 
     if txtlog:
@@ -25,21 +26,17 @@ def setup_logging(logdir=None, scrnlog=True, txtlog=True, loglevel=logging.DEBUG
         console_handler.setFormatter(log_formatter)
         log.addHandler(console_handler)
 
-
+    return log
+        
+        
 #this allows us to redirect stderr and stdout to a logfile
 #mainly because looking at stderr with lighttpd + mod_fastcgi is important
 class LoggerWriter:
-    def __init__(self,logger, level):
+    def __init__(self,logger):
         self.logger = logger
-        self.level = level
-        self.msg = ""
 
-#do some funky things to help print tracebacks better
     def write(self, message):
         #pump message to stdout
-        print message,
-        self.msg += message.replace("\n"," ")
-        if len(message) < 2:
-            return
-        self.logger.log(self.level, self.msg)
-        self.msg = ""
+        print message
+        #and to log
+        self.logger.error(message)