From beb970fd56f4e9db980bc71ae49806c667f9099f Mon Sep 17 00:00:00 2001
From: Max Goodman <max@reddit.com>
Date: Thu, 16 Jun 2011 09:28:58 +0000
Subject: [PATCH] Switch to symlinks for unique static filenames.

Disable static hash middleware, since it is no longer necessary.
---
 r2/Makefile                |  3 ++-
 r2/r2/config/middleware.py |  2 +-
 r2/r2/lib/static.py        | 10 ++++++++--
 3 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/r2/Makefile b/r2/Makefile
index a77f57fa2..90cd19d9f 100644
--- a/r2/Makefile
+++ b/r2/Makefile
@@ -59,6 +59,7 @@ PYX_FILES := $(shell find . -name \*.pyx)
 PYXSO_FILES := $(PYX_FILES:.pyx=.so)
 
 NAMED = $(JSOUTPUTS) $(CSSTARGETS) $(MAINCSS) $(RTLCSS)
+NAMELINKS = $(patsubst %.css,%.*.css,$(patsubst %.js,%.*.js,$(NAMED)))
 
 INIUPDATE = $(wildcard *.update)
 INIS      = $(INIUPDATE:.update=.ini)
@@ -118,4 +119,4 @@ clean: clean_static
 	rm -f $(PYXSO_FILES)
 
 clean_static:
-	rm -f $(JSOUTPUTS) $(CSSTARGETS) $(SPRITES) $(MAINCSS) $(MD5S) $(INIS)
+	rm -f $(JSOUTPUTS) $(CSSTARGETS) $(SPRITES) $(MAINCSS) $(NAMES) $(NAMELINKS) $(INIS)
diff --git a/r2/r2/config/middleware.py b/r2/r2/config/middleware.py
index d92099f04..40f38937a 100644
--- a/r2/r2/config/middleware.py
+++ b/r2/r2/config/middleware.py
@@ -617,7 +617,7 @@ def make_app(global_conf, full_stack=True, **app_conf):
     # Static files
     javascripts_app = StaticJavascripts()
     static_app = StaticURLParser(config['pylons.paths']['static_files'])
-    static_app = StaticURLHashMiddleware(static_app)
+    #static_app = StaticURLHashMiddleware(static_app)
     app = Cascade([static_app, javascripts_app, app])
 
     app = make_gzip_middleware(app, app_conf)
diff --git a/r2/r2/lib/static.py b/r2/r2/lib/static.py
index 575b31b04..382c23493 100755
--- a/r2/r2/lib/static.py
+++ b/r2/r2/lib/static.py
@@ -17,7 +17,7 @@ def generate_static_name(name, base=None, shorthash=None):
     name, ext = os.path.splitext(name)
     return name + '.' + shorthash + ext
 
-def update_static_names(names_file, files):
+def update_static_names(names_file, files, make_links=False):
     """Generate a unique file name mapping for ``files`` and write it to a
     JSON file at ``names_file``."""
     if os.path.exists(names_file):
@@ -33,5 +33,11 @@ def update_static_names(names_file, files):
     json_enc = json.JSONEncoder(indent=2, sort_keys=True)
     open(names_file, "w").write(json_enc.encode(names))
 
+    if make_links:
+        for name, staticname in names.iteritems():
+            os.symlink(name, os.path.join(base, staticname))
+
+    return names
+
 if __name__ == "__main__":
-    update_static_names(sys.argv[1], sys.argv[2:])
+    update_static_names(sys.argv[1], sys.argv[2:], make_links=True)