static/default.css static/default.js @@ -4,8 +4,8 @@ runtime: python api_version: 1 handlers: -- url: /skins - static_dir: skins +- url: /static + static_dir: static - url: /img static_dir: img app.yaml @@ -2,8 +2,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>List of forums</title> - <link href="/skins/default/fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="/skins/default/fofou.js" type="text/javascript"></script> + <link href="/static/default.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/default.js" type="text/javascript"></script> </head> <body> forum_list.html @@ -6,10 +6,10 @@ from offsets import * # you need to provide full url to a given forum's posting interface e.g. # http://foo.com/myforum/importfruitshow -FOFOU_SERVER = None +FOFOU_SERVER = "http://localhost:9999/sumatrapdf/importfruitshow" # You need to provide import secret for this forum (can be set by forum # admin in forum management web page) -IMPORT_SECRET = None +IMPORT_SECRET = "harota" PICKLED_DATA_FILE_NAME = "fruitshow_posts.dat.bz2" @@ -128,7 +128,7 @@ def main(): topics_count = len(all_topics) print("%d topics, %d posts" % (topics_count, len(all_posts))) sent = 0 - for topic in all_topics[800:]: + for topic in all_topics: topic_id = topic[TOPIC_ID] post_ids = [p[TP_POST_ID] for p in topic_posts if topic_id == p[TP_TOPIC_ID]] posts = [p for p in all_posts if p[POST_ID] in post_ids] fruitshow_dump_upload.py @@ -10,7 +10,7 @@ indexes: # automatically uploaded to the admin console when you next deploy # your application using appcfg.py. -# Used 16 times in query history. +# Unused in query history -- copied from input. - kind: Post properties: - name: forum @@ -18,7 +18,7 @@ indexes: - name: created_on direction: desc -# Used 7 times in query history. +# Used 3 times in query history. - kind: Post properties: - name: forum @@ -32,7 +32,7 @@ indexes: - name: topic - name: created_on -# Used 50 times in query history. +# Unused in query history -- copied from input. - kind: Post properties: - name: topic @@ -51,14 +51,14 @@ indexes: - name: forum - name: created_on -# Used 48 times in query history. +# Used 11 times in query history. - kind: Topic properties: - name: forum - name: created_on direction: desc -# Used 2 times in query history. +# Unused in query history -- copied from input. - kind: Topic properties: - name: forum index.yaml @@ -219,8 +219,11 @@ def template_out(response, template_name, template_values): c = str(g_fofou_set_cookie) c = c.split(": ", 1)[1] response.headers["Set-Cookie"] = c - path = os.path.join(os.path.dirname(__file__), template_name) - response.out.write(template.render(path, template_values)) + #path = os.path.join(os.path.dirname(__file__), template_name) + path = template_name + #logging.info("tmpl: %s" % path) + res = template.render(path, template_values) + response.out.write(res) def valid_forum_url(url): if not url: @@ -254,7 +257,7 @@ def forum_from_url(url): def forum_root(forum): return "/" + forum.url + "/" -def forum_siteroot_skinurl_from_url(url): +def forum_siteroot_tmpldir_from_url(url): assert '/' == url[0] path = url[1:] if '/' in path: @@ -268,8 +271,8 @@ def forum_siteroot_skinurl_from_url(url): skin_name = forum.skin if skin_name not in SKINS: skin_name = SKINS[0] - skinurl = "/skins/" + skin_name + "/" - return (forum, siteroot, skinurl) + tmpldir = os.path.join("skins", skin_name) + return (forum, siteroot, tmpldir) def get_log_in_out(url): user = users.get_current_user() @@ -442,14 +445,14 @@ class ForumList(webapp.RequestHandler): # responds to GET /postdel?<post_id> and /postundel?<post_id> class PostDelUndel(webapp.RequestHandler): def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") is_moderator = users.is_current_user_admin() if not is_moderator or forum.is_disabled: return self.redirect(siteroot) post_id = self.request.query_string - logging.info("PostDelUndel: post_id='%s'" % post_id) + #logging.info("PostDelUndel: post_id='%s'" % post_id) post = db.get(db.Key.from_path('Post', int(post_id))) if not post: logging.info("No post with post_id='%s'" % post_id) @@ -501,7 +504,7 @@ class TopicList(webapp.RequestHandler): return (start, topics) def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") start = 0 @@ -516,7 +519,6 @@ class TopicList(webapp.RequestHandler): tvals = { 'siteroot' : siteroot, 'siteurl' : self.request.url, - 'skinurl' : skinurl, 'forum' : forum, 'topics' : topics, 'analytics_code' : forum.analytics_code or "", @@ -525,14 +527,14 @@ class TopicList(webapp.RequestHandler): 'new_from' : new_start, 'log_in_out' : get_log_in_out(siteroot) } - logging.info("skinurl: %s" % skinurl) - template_out(self.response, skinurl[1:] + "topic_list.html", tvals) + tmpl = os.path.join(tmpldir, "topic_list.html") + template_out(self.response, tmpl, tvals) # responds to /<forumurl>/importfruitshow class ImportFruitshow(webapp.RequestHandler): def post(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.error(NOT_ACCEPTABLE) # not active at all if not protected by secret @@ -571,8 +573,6 @@ class ImportFruitshow(webapp.RequestHandler): topic.ncomments = len(posts)-1 topic.updated_on = last_post[POST_POSTED_ON] topic.is_deleted = bool(int(first_post[POST_DELETED])) - if topic.is_deleted: - logging.info("Topic %s is deleted", str(topic_no)) topic.put() #logging.info("created topic, subject: %s, created_on: %s" % (subject, str(created_on))) for post in posts: @@ -613,7 +613,7 @@ class ImportFruitshow(webapp.RequestHandler): class TopicForm(webapp.RequestHandler): def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") @@ -646,7 +646,6 @@ class TopicForm(webapp.RequestHandler): tvals = { 'siteroot' : siteroot, 'forum' : forum, - 'skinurl' : skinurl, 'analytics_code' : forum.analytics_code or "", 'topic' : topic, 'is_moderator' : is_moderator, @@ -654,7 +653,8 @@ class TopicForm(webapp.RequestHandler): 'posts' : posts, 'log_in_out' : get_log_in_out(siteroot) } - template_out(self.response, skinurl[1:] + "topic.html", tvals) + tmpl = os.path.join(tmpldir, "topic.html") + template_out(self.response, tmpl, tvals) # responds to /<forumurl>/rss, returns an RSS feed of recent topics # (taking into account only the first post in a topic - that's what @@ -662,7 +662,7 @@ class TopicForm(webapp.RequestHandler): class RssFeed(webapp.RequestHandler): def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.error(NOT_FOUND) @@ -697,7 +697,7 @@ class RssFeed(webapp.RequestHandler): class RssAllFeed(webapp.RequestHandler): def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.error(NOT_FOUND) @@ -733,23 +733,22 @@ def get_fofou_user(): user = None if user_id: user = FofouUser.gql("WHERE user = :1", user_id).get() - if user: - logging.info("Found existing user for by user_id '%s'" % str(user_id)) + #if user: logging.info("Found existing user for by user_id '%s'" % str(user_id)) else: cookie = get_fofou_cookie_val() if cookie: user = FofouUser.gql("WHERE cookie = :1", cookie).get() - if user: - logging.info("Found existing user for cookie '%s'" % cookie) - else: - logging.info("Didn't find user for cookie '%s'" % cookie) + #if user: + # logging.info("Found existing user for cookie '%s'" % cookie) + #else: + # logging.info("Didn't find user for cookie '%s'" % cookie) return user # responds to /<forumurl>/email[?post_id=<post_id>] class EmailForm(webapp.RequestHandler): def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") (num1, num2) = (random.randint(1,9), random.randint(1,9)) @@ -762,7 +761,6 @@ class EmailForm(webapp.RequestHandler): tvals = { 'siteroot' : siteroot, 'forum' : forum, - 'skinurl' : skinurl, 'num1' : num1, 'num2' : num2, 'num3' : int(num1) + int(num2), @@ -771,15 +769,16 @@ class EmailForm(webapp.RequestHandler): 'subject' : subject, 'log_in_out' : get_log_in_out(siteroot + "post") } - template_out(self.response, skinurl[1:] + "email.html", tvals) + tmpl = os.path.join(tmpldir, "email.html") + template_out(self.response, tmpl, tvals) def post(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") if self.request.get('Cancel'): self.redirect(siteroot) post_id = self.request.get("post_id") - logging.info("post_id = %s" % str(post_id)) + #logging.info("post_id = %s" % str(post_id)) if not post_id: return self.redirect(siteroot) post = db.get(db.Key.from_path('Post', int(post_id))) if not post: return self.redirect(siteroot) @@ -787,17 +786,17 @@ class EmailForm(webapp.RequestHandler): tvals = { 'siteroot' : siteroot, 'forum' : forum, - 'skinurl' : skinurl, 'topic' : topic, 'log_in_out' : get_log_in_out(siteroot + "post") } - template_out(self.response, skinurl[1:] + "email_sent.html", tvals) + tmpl = os.path.join(tmpldir, "email_sent.html") + template_out(self.response, tmpl, tvals) # responds to /<forumurl>/post[?id=<topic_id>] class PostForm(webapp.RequestHandler): def get(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") send_fofou_cookie() @@ -818,7 +817,6 @@ class PostForm(webapp.RequestHandler): tvals = { 'siteroot' : siteroot, 'forum' : forum, - 'skinurl' : skinurl, 'num1' : num1, 'num2' : num2, 'num3' : int(num1) + int(num2), @@ -834,10 +832,11 @@ class PostForm(webapp.RequestHandler): if not topic: return self.redirect(siteroot) tvals['prevTopicId'] = topic_id tvals['prevSubject'] = topic.subject - template_out(self.response, skinurl[1:] + "post.html", tvals) + tmpl = os.path.join(tmpldir, "post.html") + template_out(self.response, tmpl, tvals) def post(self): - (forum, siteroot, skinurl) = forum_siteroot_skinurl_from_url(self.request.path_info) + (forum, siteroot, tmpldir) = forum_siteroot_tmpldir_from_url(self.request.path_info) if not forum or forum.is_disabled: return self.redirect("/") if self.request.get('Cancel'): self.redirect(siteroot) @@ -864,7 +863,6 @@ class PostForm(webapp.RequestHandler): tvals = { 'siteroot' : siteroot, 'forum' : forum, - 'skinurl' : skinurl, 'num1' : num1, 'num2' : num2, 'num3' : int(num1) + int(num2), @@ -898,7 +896,8 @@ class PostForm(webapp.RequestHandler): if errclass: tvals[errclass] = "error" - return template_out(self.response, skinurl[1:] + "post.html", tvals) + tmpl = os.path.join(tmpldir, "topic_list.html") + template_out(self.response, tmpl, tvals) # get user either by google user id or cookie. Create user objects if don't # already exist @@ -907,22 +906,22 @@ class PostForm(webapp.RequestHandler): if user_id: user = FofouUser.gql("WHERE user = :1", user_id).get() if not user: - logging.info("Creating new user for '%s'" % str(user_id)) + #logging.info("Creating new user for '%s'" % str(user_id)) user = FofouUser(user=user_id, remember_me = remember_me, email=email, name=name, homepage=homepage) user.put() else: existing_user = True - logging.info("Found existing user for '%s'" % str(user_id)) + #logging.info("Found existing user for '%s'" % str(user_id)) else: cookie = get_fofou_cookie_val() user = FofouUser.gql("WHERE cookie = :1", cookie).get() if not user: - logging.info("Creating new user for cookie '%s'" % cookie) + #logging.info("Creating new user for cookie '%s'" % cookie) user = FofouUser(cookie=cookie, remember_me = remember_me, email=email, name=name, homepage=homepage) user.put() else: existing_user = True - logging.info("Found existing user for cookie '%s'" % cookie) + #logging.info("Found existing user for cookie '%s'" % cookie) if existing_user: need_update = False @@ -939,14 +938,15 @@ class PostForm(webapp.RequestHandler): user.homepage = homepage need_update = True if need_update: - logging.info("User needed an update") + #logging.info("User needed an update") user.put() if not topic_id: # first post in a topic, so create the topic if not valid_subject(subject): tvals['subject_class'] = "error" - return template_out(self.response, skinurl[1:] + "post.html", tvals) + tmpl = os.path.join(tmpldir, "post.html") + template_out(self.response, tmpl, tvals) topic = Topic(forum=forum, subject=subject, created_by=name) topic.put() else: main.py @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>Create a forum</title> - <link href="/skins/default/fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="/skins/default/fofou.js" type="text/javascript"></script> + <link href="/static/defaultfofou.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/defaultfofou.js" type="text/javascript"></script> </head> <body> <script> manage_forums.html @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>{% firstof forum.title forum.url %}</title> - <link href="{{ skinurl }}fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="{{ skinurl }}fofou.js" type="text/javascript"></script> + <link href="/static/default.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/default.js" type="text/javascript"></script> </head> <body> skins/default/email.html @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>{% firstof forum.title forum.url %}</title> - <link href="{{ skinurl }}fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="{{ skinurl }}fofou.js" type="text/javascript"></script> + <link href="/static/default.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/default.js" type="text/javascript"></script> </head> <body> skins/default/email_sent.html @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>{% firstof forum.title forum.url %}</title> - <link href="{{ skinurl }}fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="{{ skinurl }}fofou.js" type="text/javascript"></script> + <link href="/static/default.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/default.js" type="text/javascript"></script> </head> <body> skins/default/post.html @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>{% firstof forum.title forum.url %}</title> - <link href="{{ skinurl }}fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="{{ skinurl }}fofou.js" type="text/javascript"></script> + <link href="/static/default.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/default.js" type="text/javascript"></script> </head> <body> skins/default/topic.html @@ -3,8 +3,8 @@ <head> <meta http-equiv="Content-Type" content="text/html;charset=utf-8"> <title>{% firstof forum.title forum.url %}</title> - <link href="{{ skinurl }}fofou.css" rel="stylesheet" type="text/css"> - <script language="javascript" src="{{ skinurl }}fofou.js" type="text/javascript"></script> + <link href="/static/default.css" rel="stylesheet" type="text/css"> + <script language="javascript" src="/static/default.js" type="text/javascript"></script> <link type="application/rss+xml" rel="alternate" title="Discussion Group" href="{{ siteroot }}rss"> </head> skins/default/topic_list.html skins/default/fofou.css skins/default/fofou.js d11761b88b84b5cf01bc146d1055e99e8d24a75d Krzysztof Kowalczyk kkowalczyk@gmail.com http://github.com/kjk/fofou/commit/5b9af525a9cc9cfb1ef156162ec45915fd03f67f 5b9af525a9cc9cfb1ef156162ec45915fd03f67f

2008-07-04T23:58:48-07:00

templates cannot be in a directory declared static in app.yaml, so move the files that are actually served via http to static directory and undeclare skins a static dir 58f361de1dcb04544ccba9f4ac08e6f643ed66cc Krzysztof Kowalczyk kkowalczyk@gmail.com