Changeset 352

Timestamp:

07/18/10 21:05:52 (7 weeks ago)

Author:

nicholas

Message:

RPC Import

Location:

Python/blog/trunk

Files:

• AUTHORS (modified) (1 diff)
• Changes (modified) (1 diff)
• INSTALL (modified) (1 diff)
• blog/rpc (added)
• blog/rpc/__init__.py (added)
• blog/rpc/decorators.py (added)
• blog/rpc/metaweblog.py (added)
• blog/rpc/utils.py (added)
• blog/rpc/xmlrpc.py (added)
• blog/templatetags/blog.py (modified) (4 diffs)
• blog/urls.py (modified) (2 diffs)

Python/blog/trunk/AUTHORS

@@ -2 +2 @@
 
         * Nicholas Studt <nicholas@nicholasstudt.com>
+
+RPC Support
+        
+        * Carson Gee http://carsonegee.com

Python/blog/trunk/Changes

@@ -3 +3 @@
 1.3
  - Added {% csrf_token %} to search.
-
+ - RPC support for Blogger 1.0, MetaWeblog, and MoveableType (Patch
+   provided by Carson Gee.)
+ 
 1.2 (May  3 2010):
  - Added author list page, which shows all authors.

Python/blog/trunk/INSTALL

@@ -84 +84 @@
      
      </style>
+
+* Configure RPC 
+
+  By default, uploads to settings.MEDIA_ROOT/[datestamp]_[orig_name].
+       
+  If settings.BLOG_RPC_UPLOAD_PATH is set to a tuple, I will run
+  strftime against it, and append the passed in filename to the end of
+  the time format string. The tuple should be ( file_path, url_path )
+
+  If you set settings.BLOG_RPC_UPLOAD_PATH as a python callable, I will
+  call it with **kwargs set at {user: django user object, author_id:
+  blog author id, name: file name to upload } which must return a tuple
+  that is a valid path and URL to that path.
+
+  Two settings.py examples:
+
+  1) 
+    BLOG_RPC_UPLOAD_PATH = ("/home/cgee/tmp/blog/%Y/%m/%d/", "/static_media/%Y/%m/%d/")
+
+  2)
+    import time
+        def rpc_path(**kwargs):
+                base_path = time.strftime('%d/%m/%Y/', time.localtime())
+                base_path = "%s%s/%s" % (base_path,
+                                                                 kwargs['user'].username,
+                                                                 kwargs['name'])
+                return ("/home/cgee/tmp/blog/%s" % base_path, 
+                                "/static_media/%s" % base_path)
+
+        BLOG_RPC_UPLOAD_PATH = rpc_path
+

Python/blog/trunk/blog/templatetags/blog.py

@@ -42 +42 @@
         return ''
 
+class Calendar(template.Node):
+    def __init__(self, var_name, kind='month', limit=None, author=None):
+        self.var_name = var_name
+        self.kind = kind
+        self.limit = limit 
+        self.author = author 
+
+    def render(self, context):
+        author = None
+
+        if self.author:
+            try: 
+                author = Author.objects.get(ident=self.author)
+            except ObjectDoesNotExist: 
+                pass
+
+        if author:
+            list = Entry.objects.published(author=author).dates('pub_date', self.kind, order='DESC')
+        else: 
+            list = Entry.objects.published().dates('pub_date', self.kind, 
+                                               order='DESC')
+
+        if self.limit:
+            context[self.var_name] = list[:self.limit]
+        else:
+            context[self.var_name] = list
+        return ''
+
 class TagList(template.Node):
     def __init__(self, var_name):
@@ -76 +104 @@
 def entry_archive(parser, token):
     """
-    List all of the tags.
+    Listing of of years, months, or days that have entries.
 
     Example::
@@ -112 +140 @@
 entry_archive = register.tag(entry_archive)
 
-def month_cal(year=datetime.date.today().year, month=datetime.date.today().month): 
+def month_calendar(parser, token):
+    """
+    Create a calendar of a month with the days that have entries linked
+    to that day in the archive.
+
+    Example::
+
+        {% month_calendar <year> <month> [author_ident] %}
+        
+        {% load blog %}
+
+        {% month_calendar 2010 11 author_ident_here %} 
+
+    """
+    
+    author = None
+    year = datetime.date.today().year
+    month = datetime.date.today().month
+
+    bits = token.contents.split()
+
+    if len(bits) < 2:
+        raise TemplateSyntaxError, "'%s' tag requires at least the context name to populate" % bits[0]
+    
+    if len(bits) >= 3:
+        (limit, type) = bits[2].split(':') 
+        try: 
+            limit = int(limit)
+        except ValueError: 
+            limit = None
+
+    if len(bits) == 4:
+        author = bits[3]
+
+    return Calendar(bits[1], type, limit, author)
+entry_archive = register.tag(entry_archive)
+
+def month_cal(parser, token):
+    year=datetime.date.today().year
+    month=datetime.date.today().month
 
     # Fix this to just use calendar.* for all math.
@@ -121 +188 @@
 
     last_day_of_calendar = datetime.date(year,month,last_day_of_month[1]) + datetime.timedelta(7 - calendar.weekday(year,month,last_day_of_month[1]))
+
+    return last_day_of_calendar
 
     event_list = Entry.objects.published(pub_date__gte=first_day_of_calendar, pub_date__lte=last_day_of_calendar)

Python/blog/trunk/blog/urls.py

@@ -53 +53 @@
     url(r'^latest/?$', 'blog.views.entry_latest', name="entry_latest"),
 
+    # New RPC handling
+    url(r'^rpc/?$', 'blog.rpc.xmlrpc.view', {'module': 'blog.rpc.metaweblog' }),
+
     url(r'^(?P<author>[-\w]+)/?$', 'blog.views.entry_list', 
         name="author_index"),
@@ -58 +61 @@
     url(r'^$', 'blog.views.entry_list', name="entry_index"),
 )
-