kvs.git

@@ -56,7 +56,6 @@ if __name__ == '__main__':

     localdir = os.path.abspath(os.path.dirname(sys.argv[0]))

     args = cgi.FieldStorage()

     key = None

-    extra = None

     auth = None

     get_key = False

     auth_in_get = False

@@ -83,28 +82,13 @@ if __name__ == '__main__':

         if not auth_in_get and "auth" in args:

             auth = args["auth"].value

-    if "extra" in args:

-        extra = args["extra"].value

-

     store = read_file(os.path.join(localdir, store_name))

     if get_key:

         keys = key.split(',')

-        if len(keys) > 1:

-            devices = set()

-            for k in store:

-                d = store[k]

-                if k in keys:

-                    devices.add((d['time'], key, d['value']))

-            if devices:  # not empty

-                print "Content-type: text/plain; charset=utf-8\n"

-                sys.stdout.write(sorted(devices, reverse=True)[0][2])

-            else:

-                print 'Status: 404 Not Found\n'

-        elif key in store:

+        matches = sorted([(store[x]['time'], store[x]['value']) for x in keys if x in store], reverse=True)

+        if matches:

             print "Content-type: text/plain; charset=utf-8\n"

-            sys.stdout.write(store[key]['value'])

-            if extra is not None:

-                sys.stdout.write('\n%s' % (store[key]['time'],))

+            sys.stdout.write(matches[0][1])

         else:

             print 'Status: 404 Not Found\n'

     else:

@@ -113,7 +97,7 @@ if __name__ == '__main__':

             authorization = f.read().strip()

         if doing_post and auth == authorization:

             for new_key in args:

-                if new_key not in ('auth', 'extra') and \

+                if new_key not in ('auth', ) and \

                     len(new_key) < 80 and len(args[new_key].value) < 140:

                     if new_key in store and 'created' in store[new_key]:

                         created_time = store[new_key]['created']

@@ -163,6 +147,7 @@ if __name__ == '__main__':

             print 'Tip:'

             print 'sync_ip () { export ENV_VAR=$(curl -s "%s?k=2FN50L002036,2FN44N010911"); }' % os.environ['SCRIPT_URI']

             print 'curl --data "`hostname -s`=`hostname -i`&auth=$AUTH" "%s"' % os.environ['SCRIPT_URI']

+            print 'Source code at http://git.dlma.com/kvs.git/'

         if not wrote_response:

             print 'Status: 400 Bad Request\n'