Changeset 2522

Timestamp:

02/03/10 11:47:39 (6 weeks ago)

Author:

JensDiemer

Message:

some weave plugin updates: storing wbos works better, but a real sync doesn't work, yet.

Location:

PyLucidPlugins/weave

Files:

• admin.py (modified) (2 diffs)
• models.py (modified) (3 diffs)
• urls.py (modified) (1 diff)
• views.py (modified) (13 diffs)

PyLucidPlugins/weave/admin.py

@@ -29 +29 @@
 
 
+
 class WboAdmin(VersionAdmin):
-    """
-    """
-#    list_display = ("id", "headline", "is_public", "view_on_site_link", "site_info", "lastupdatetime", "lastupdateby")
-#    list_display_links = ("headline",)
-#    list_filter = ("is_public", "sites", "createby", "lastupdateby",)
-#    date_hierarchy = 'lastupdatetime'
+    def payload_cutout(self, obj):
+        MAX = 100
+        payload = obj.payload
+        if len(payload) > MAX:
+            payload = payload[:MAX] + "..."
+        return payload
+    payload_cutout.short_description = "Payload cutout"
+#    view_on_site_link.allow_tags = True
+
+    list_display = ("id", "lastupdatetime", "user", "wboid", "parentid", "sortindex", "lastupdateby", "payload_cutout")
+    list_display_links = ("wboid",)
+    list_filter = ("user", "collection")
+    date_hierarchy = 'lastupdatetime'
 #    search_fields = ("headline", "content")
 
@@ -44 +52 @@
     """
     """
-#    list_display = ("id", "headline", "is_public", "view_on_site_link", "site_info", "lastupdatetime", "lastupdateby")
-#    list_display_links = ("headline",)
-#    list_filter = ("is_public", "sites", "createby", "lastupdateby",)
-#    date_hierarchy = 'lastupdatetime'
+    list_display = ("id", "lastupdatetime", "user", "name", "lastupdateby")
+    list_display_links = ("name",)
+    list_filter = ("user", "createby", "lastupdateby",)
+    date_hierarchy = 'lastupdatetime'
 #    search_fields = ("headline", "content")
 

PyLucidPlugins/weave/models.py

@@ -28 +28 @@
         return u"weave collection %r for user %r" % (self.name, self.user.username)
 
+    class Meta:
+        ordering = ("-lastupdatetime",)
+
 
 class Wbo(UpdateInfoBaseModel):
@@ -40 +43 @@
         lastupdateby   -> ForeignKey to user who has edited this entry
     """
-    collection = models.ForeignKey(Collection)
+    collection = models.ForeignKey(Collection, blank=True, null=True)
+    user = models.ForeignKey(User)
     wboid = models.CharField(max_length=64, blank=True,
         help_text="wbo identifying string"
+    )
+    parentid = models.CharField(max_length=64, blank=True, null=True,
+        help_text="wbo parent identifying string"
     )
     sortindex = models.IntegerField(null=True, blank=True,
@@ -58 +65 @@
     def __unicode__(self):
         return u"weave wbo %r (%r)" % (self.wboid, self.collection)
+
+    class Meta:
+        ordering = ("-lastupdatetime",)

PyLucidPlugins/weave/urls.py

@@ -20 +20 @@
 
 
-    #/1.0/test1/storage/keys/pubkey
     url(r'^/(?P<version>.*?)/(?P<username>.*?)/storage/(?P<col_name>.*?)/(?P<wboid>.*?)$', views.storage),
+    url(r'^/(?P<version>.*?)/(?P<username>.*?)/storage/(?P<wboid>.*?)$', views.storage_wboid),
 
     #/1.0/UserName/info/collections

PyLucidPlugins/weave/views.py

@@ -15 +15 @@
     from django.utils.functional import wraps  # Python 2.3, 2.4 fallback.
 
-from django import http
+from django.http import HttpResponse
 from django.conf import settings
 from django.contrib.auth.models import User
@@ -41 +41 @@
 
 def _debug_request(request):
+    MAX = 120
+    def cut(s):
+        s = repr(s)
+        if len(s) > MAX:
+            return s[:MAX] + "..."
+        return s
+
     print "request.META['CONTENT_LENGTH']: %r" % request.META['CONTENT_LENGTH']
     print "request.GET: %r" % request.GET
-    print "request.POST: %r" % request.POST
+    print "request.POST: %s" % cut(request.POST)
     print "request.FILES: %r" % request.FILES
-    print "request.raw_post_data: %r" % request.raw_post_data
+    print "request.raw_post_data: %s" % cut(request.raw_post_data)
 
 
@@ -81 +88 @@
             data = function(request, *args, **kwargs)
 
+            if isinstance(data, HttpResponse):
+                if debug:
+                    print "render debug for %r:" % function.__name__
+                    print "data: %r" % data
+                    print "response.content:", data.content
+                return data
+
             if not isinstance(data, dict):
                 msg = (
-                    "renter_to info: %s has not return a dict, has return: %r (%r)"
+                    "json_response info: %s has not return a dict, has return: %r (%r)"
                 ) % (function.__name__, type(data), function.func_code)
                 raise AssertionError(msg)
@@ -93 +107 @@
                 raise
 
-            response = http.HttpResponse(data_string,
+            response = HttpResponse(data_string,
 #                content_type='application/json'
                 content_type='text/plain'
@@ -112 +126 @@
 
 
+class RecordNotFoundResponse(HttpResponse):
+    status_code = 404
+    def __init__(self, content='"record not found"'):
+        HttpResponse.__init__(self)
+        self._container = [content]
+
 
 
 def root_view(request):
-    print "root_view!"
+    print " *** root_view! ***"
     _debug_request(request)
 
@@ -129 +149 @@
     https://wiki.mozilla.org/Labs/Weave/Sync/1.0/API#GET
     """
+    print "_" * 79
     print "info_collections:"
     _debug_request(request)
@@ -157 +178 @@
     return timestamps
 
-
+@assert_username(debug=True)
+@check_permissions(superuser_only=False, permissions=(u'weave.add_collection', u'weave.add_wbo'))
+@json_response(debug=True)
+def storage_wboid(request, version, username, wboid):
+    """
+    get items from storage
+    e.g.:
+    GET /1.0/UserName/storage/history?newer=1265189444.85&full=1&sort=index&limit=1500
+    """
+    print "_" * 79
+    print "storage_wboid", wboid
+    _debug_request(request)
+
+    user = request.user
+    if request.method == 'POST':
+        payload = request.raw_post_data
+        if not payload:
+            # If the WBO does not contain a payload, it will only update
+            # the provided metadata fields on an already defined object.
+            raise NotImplemented
+
+        collection, created = Collection.on_site.get_or_create(user=user, name=wboid)
+        if created:
+            print "Collection %r created" % collection
+        else:
+            print "Collection %r exists" % collection
+
+        data = json.loads(payload)
+        if not isinstance(data, list):
+            raise NotImplemented
+
+        for item in data:
+            wbo, created = Wbo.objects.get_or_create(
+                collection=collection,
+                user=user,
+                wboid=item["id"],
+                defaults={
+                    "parentid": item.get("parentid", None), # FIXME: must wboid + parentid be unique?
+                    "sortindex": item.get("sortindex", None),
+                    "payload": item["payload"],
+                }
+            )
+            if created:
+                print "New wbo created: %r" % wbo
+            else:
+                wbo.parentid = item.get("parentid", None)
+                wbo.sortindex = item.get("sortindex", None)
+                wbo.payload = item["payload"]
+                wbo.save()
+                print "Existing wbo updated: %r" % wbo
+
+#        assert val["id"] == wboid, "wrong wbo id: %r != %r" % (val["id"], wboid)
+
+        return {}
+    elif request.method == 'GET':
+        try:
+            wbo = Wbo.objects.filter(user=user).get(wboid=wboid)
+        except Wbo.DoesNotExist:
+            print "Wbo %r not exist for user %r" % (wboid, user)
+            return RecordNotFoundResponse()
+
+        payload = wbo.payload
+        data = json.loads(payload)
+        data["modified"] = _datetime2epochtime(wbo.lastupdatetime)
+        return data
+    else:
+
+        raise NotImplemented
 
 @assert_username(debug=True)
@@ -179 +267 @@
                 'meta': '1265103193.99'}}
     """
+    print "_" * 79
     print "storage", col_name, wboid
     _debug_request(request)
@@ -207 +296 @@
         wbo = Wbo(
             collection=collection,
+            user=user,
             wboid=wboid,
             sortindex=sortindex,
@@ -221 +311 @@
             collection = Collection.on_site.get(user=user, name=col_name)
         except Collection.DoesNotExist:
-            raise http.Http404
-
-        wbos = Wbo.objects.all().filter(collection=collection)
-        print "+++", wbos
-        timestamps = {}
-        for wbo in wbos:
-            lastupdatetime = wbo.lastupdatetime
-            timestamp = _datetime2epochtime(lastupdatetime) # datetime -> time since the epoch
-            timestamps[wbo.wboid] = str(timestamp)
-
-        print timestamps
-
-        return timestamps
+            print "Collection %r for user %r not found" % (col_name, user)
+            return RecordNotFoundResponse()
+
+        try:
+            wbo = Wbo.objects.all().filter(collection=collection).get(wboid=wboid)
+        except Wbo.DoesNotExist:
+            print "Wbo %r not exist for collection %r" % (wboid, collection)
+            return RecordNotFoundResponse()
+
+        payload = wbo.payload
+        data = json.loads(payload)
+        data["modified"] = _datetime2epochtime(wbo.lastupdatetime)
+        return data
+#        print "+++", wbos
+#        timestamps = {}
+#        for wbo in wbos:
+#            lastupdatetime = wbo.lastupdatetime
+#            timestamp = _datetime2epochtime(lastupdatetime) # datetime -> time since the epoch
+#            timestamps[wbo.wboid] = str(timestamp)
+
+#        val = json.loads(raw_post_data)
+#        print "val1: %r" % val
+#        val['modified'] = _timestamp()
+#        print "val2: %r" % val
+#        val = json.dumps(val, sort_keys=True)
+
+#        if not timestamps:
+#            print "wboid %r not found for collection %r" % (wboid, collection)
+#            return RecordNotFoundResponse()
+#
+#        return timestamps
     else:
         raise NotImplemented
@@ -249 +357 @@
 
 
-    try:
-        collection = Collection.on_site.get(user=request.user, name=col_name)
-    except Collection.DoesNotExist:
-        raise http.Http404("collection not found.")
-
-
-    raw_post_data = request.raw_post_data
-    if raw_post_data:
-        print "raw_post_data: %r" % raw_post_data
-        val = json.loads(raw_post_data)
-        print "val1: %r" % val
-        val['modified'] = _timestamp()
-        print "val2: %r" % val
-        val = json.dumps(val, sort_keys=True)
-
-#        self.collections.setdefault(col, {})[key] = val
-#        self.ts_col(col)
-
-
-    response = http.HttpResponse("{}", content_type='application/json')
-    response["X-Weave-Timestamp"] = _timestamp()
-    return response
-
-
+#    try:
+#        collection = Collection.on_site.get(user=user, name=col_name)
+#    except Collection.DoesNotExist:
+#        print "Collection %r for user %r not found" % (col_name, user)
+#        return RecordNotFoundResponse()
+#
+#
+#    raw_post_data = request.raw_post_data
+#    if raw_post_data:
+#        print "raw_post_data: %r" % raw_post_data
+
+#
+##        self.collections.setdefault(col, {})[key] = val
+##        self.ts_col(col)
+#
+#
+#    response = HttpResponse("{}", content_type='application/json')
+#    response["X-Weave-Timestamp"] = _timestamp()
+#    return response
+
+
+@assert_username(debug=True)
 def sign_in(request, version, username):
+    """
+    finding cluster for user -> return 404 -> Using serverURL as data cluster (multi-cluster support disabled)
+    """
+    print "_" * 79
     print "sign_in %r" % username
     print "request.user: %r" % request.user
     _debug_request(request)
-    raise http.Http404
-
-
+
+#    absolute_uri = request.build_absolute_uri()
+
+#    response = HttpResponse("",
+##                content_type='application/json'
+#        content_type='text/plain'
+#    )
+#    response["X-Weave-Timestamp"] = _timestamp()
+#
+#    return response
+
+    return RecordNotFoundResponse(content="404 Not Found")
+#
+#    response = HttpResponse("", content_type='text/html')
+#    response["X-Weave-Timestamp"] = _timestamp()
+#    return response
+
+
+@assert_username(debug=True)
+@json_response(debug=True)
 def exist_user(request, version, username):
     """
     https://wiki.mozilla.org/Labs/Weave/User/1.0/API
-    Returns 1 if the username is in use, 0 if it is available. 
-    """
+    Returns 1 if the username is in use, 0 if it is available.
+    
+    e.g.: https://auth.services.mozilla.com/user/1/UserName
+    """
+    print "_" * 79
     print "exist_user:"
     _debug_request(request)
@@ -294 +424 @@
         response_content = "0"
 
-    response = http.HttpResponse(response_content, content_type='application/json')
+    response = HttpResponse(response_content, content_type='text/html')
     response["X-Weave-Timestamp"] = _timestamp()
     return response
 
+
 def captcha_html(request, version):
+    print "_" * 79
     print "captcha_html:"
     _debug_request(request)
 
-#    raise http.Http404
-    #response = http.HttpResponse("11", status=400, content_type='application/json')
-    response = http.HttpResponse("not supported")
+#    raise Http404
+    #response = HttpResponse("11", status=400, content_type='application/json')
+    response = HttpResponse("not supported")
     response["X-Weave-Timestamp"] = _timestamp()
     return response
@@ -310 +442 @@
 
 def setup_user(request, version, username):
+    print "_" * 79
     print "setup_user", version, username
     _debug_request(request)