From 3acedec771bc2ca2afcbcc99a529ac1b309929f0 Mon Sep 17 00:00:00 2001
From: Tom Christie <tomchristie@bright-interactive.co.uk>
Date: Tue, 22 Mar 2011 22:48:59 +0000
Subject: [PATCH] Fix some examples

---
 .hgignore                        |  4 ++--
 examples/media/objectstore/.keep |  1 +
 examples/media/pygments/.keep    |  1 +
 examples/objectstore/views.py    | 14 ++++++++------
 examples/pygments_api/views.py   |  5 ++---
 5 files changed, 14 insertions(+), 11 deletions(-)
 create mode 100644 examples/media/objectstore/.keep
 create mode 100644 examples/media/pygments/.keep

diff --git a/.hgignore b/.hgignore
index 1b63b944b..49cc62366 100644
--- a/.hgignore
+++ b/.hgignore
@@ -8,8 +8,8 @@ env
 docs/build
 html
 htmlcov
-examples/media/pygments/*
-examples/media/objectstore/*
+examples/media/pygments/[A-Za-z0-9]*
+examples/media/objectstore/[A-Za-z0-9]*
 build/*
 dist/*
 xmlrunner/*
diff --git a/examples/media/objectstore/.keep b/examples/media/objectstore/.keep
new file mode 100644
index 000000000..02be0b514
--- /dev/null
+++ b/examples/media/objectstore/.keep
@@ -0,0 +1 @@
+Force media/objectstore directory to created
diff --git a/examples/media/pygments/.keep b/examples/media/pygments/.keep
new file mode 100644
index 000000000..577b3f1b8
--- /dev/null
+++ b/examples/media/pygments/.keep
@@ -0,0 +1 @@
+Force media/pygments directory to created
diff --git a/examples/objectstore/views.py b/examples/objectstore/views.py
index 02b469dbf..2e353e08c 100644
--- a/examples/objectstore/views.py
+++ b/examples/objectstore/views.py
@@ -11,16 +11,16 @@ import uuid
 import operator
 
 OBJECT_STORE_DIR = os.path.join(settings.MEDIA_ROOT, 'objectstore')
-MAX_FILES = 20
+MAX_FILES = 10
 
 
 def remove_oldest_files(dir, max_files):
     """Remove the oldest files in a directory 'dir', leaving at most 'max_files' remaining.
     We use this to limit the number of resources in the sandbox."""
-    filepaths = [os.path.join(dir, file) for file in os.listdir(dir)]
+    filepaths = [os.path.join(dir, file) for file in os.listdir(dir) if not file.startswith('.')]
     ctime_sorted_paths = [item[0] for item in sorted([(path, os.path.getctime(path)) for path in filepaths],
                                                      key=operator.itemgetter(1), reverse=True)]
-    [os.remove(path) for path in ctime_sorted_paths[max_file:]]
+    [os.remove(path) for path in ctime_sorted_paths[max_files:]]
 
 
 class ObjectStoreRoot(Resource):
@@ -29,9 +29,11 @@ class ObjectStoreRoot(Resource):
     allowed_methods = anon_allowed_methods = ('GET', 'POST')
 
     def get(self, request, auth):
-        """Return a list of all the stored object URLs."""
-        keys = sorted(os.listdir(OBJECT_STORE_DIR))
-        return [reverse('stored-object', kwargs={'key':key}) for key in keys]
+        """Return a list of all the stored object URLs. (Ordered by creation time, newest first)"""
+        filepaths = [os.path.join(OBJECT_STORE_DIR, file) for file in os.listdir(OBJECT_STORE_DIR) if not file.startswith('.')]
+        ctime_sorted_basenames = [item[0] for item in sorted([(os.path.basename(path), os.path.getctime(path)) for path in filepaths],
+                                                             key=operator.itemgetter(1), reverse=True)]
+        return [reverse('stored-object', kwargs={'key':key}) for key in ctime_sorted_basenames]
     
     def post(self, request, auth, content):
         """Create a new stored object, with a unique key."""
diff --git a/examples/pygments_api/views.py b/examples/pygments_api/views.py
index 91c6045b7..6fb9217aa 100644
--- a/examples/pygments_api/views.py
+++ b/examples/pygments_api/views.py
@@ -19,11 +19,11 @@ import operator
 
 # We need somewhere to store the code that we highlight
 HIGHLIGHTED_CODE_DIR = os.path.join(settings.MEDIA_ROOT, 'pygments')
-MAX_FILES = 20
+MAX_FILES = 10
 
 def list_dir_sorted_by_ctime(dir):
     """Return a list of files sorted by creation time"""
-    filepaths = [os.path.join(dir, file) for file in os.listdir(dir)]
+    filepaths = [os.path.join(dir, file) for file in os.listdir(dir) if not file.startswith('.')]
     return [item[0] for item in sorted([(path, os.path.getctime(path)) for path in filepaths],
                                                      key=operator.itemgetter(1), reverse=True)]
 def remove_oldest_files(dir, max_files):
@@ -46,7 +46,6 @@ class PygmentsRoot(Resource):
     def get(self, request, auth):
         """Return a list of all currently existing snippets."""
         unique_ids = [os.path.split(f)[1] for f in list_dir_sorted_by_ctime(HIGHLIGHTED_CODE_DIR)]
-        unique_ids.reverse()
         return [reverse('pygments-instance', args=[unique_id]) for unique_id in unique_ids]
 
     def post(self, request, auth, content):