From d264a37dcc576c502c84b2e24728f8501931f6dc Mon Sep 17 00:00:00 2001
From: killing <xjqkilling@gmail.com>
Date: Fri, 14 Sep 2012 19:35:19 +0800
Subject: [PATCH] Enable browser cache for getting file.

---
 views.py | 48 ++++++++++++++++++++----------------------------
 1 file changed, 20 insertions(+), 28 deletions(-)

diff --git a/views.py b/views.py
index 4167d84880..2f07b506ba 100644
--- a/views.py
+++ b/views.py
@@ -312,12 +312,11 @@ def repo_upload_file(request, repo_id):
         parent_dir  = request.GET.get('p', '/')
         zipped = gen_path_link (parent_dir, repo.name)
 
-        token = ''        
         if access_to_repo(request, repo_id, ''):
-            token = gen_token()
-            seafserv_rpc.web_save_access_token(token, repo_id,
-                                               'dummy', 'upload',
-                                               request.user.username)
+            token = seafserv_rpc.web_get_access_token(repo_id,
+                                                      'dummy',
+                                                      'upload',
+                                                      request.user.username)
         else:
             return render_permission_error(request, u'无法访问该目录')
 
@@ -349,12 +348,11 @@ def repo_update_file(request, repo_id):
             return render_error(request, u'非法链接')
         zipped = gen_path_link (target_file, repo.name)
 
-        token = ''        
         if access_to_repo(request, repo_id, ''):
-            token = gen_token()
-            seafserv_rpc.web_save_access_token(token, repo_id,
-                                               'dummy', 'update',
-                                               request.user.username)
+            token = seafserv_rpc.web_get_access_token(repo_id,
+                                                      'dummy',
+                                                      'update',
+                                                      request.user.username)
         else:
             return render_permission_error(request, u'无法访问该目录')
 
@@ -895,12 +893,12 @@ def repo_view_file(request, repo_id):
     if not repo:
         raise Http404
 
-    token = ''        
     if access_to_repo(request, repo_id, ''):
         # Get a token to visit file
-        token = gen_token()
-        seafserv_rpc.web_save_access_token(token, repo_id, obj_id,
-                                           'view', request.user.username)
+        token = seafserv_rpc.web_get_access_token(repo_id,
+                                                  obj_id,
+                                                  'view',
+                                                  request.user.username)
     else:
         render_permission_error(request, '无法查看该文件')
 
@@ -1043,9 +1041,8 @@ def pdf_full_view(request):
     obj_id = request.GET.get('obj_id', '')
     file_name = request.GET.get('file_name', '')
 
-    token = gen_token()
-    seafserv_rpc.web_save_access_token(token, repo_id, obj_id,
-                                           'view', request.user.username)
+    token = seafserv_rpc.web_get_access_token(repo_id, obj_id,
+                                              'view', request.user.username)
     file_src = gen_file_get_url(token, file_name)
     return render_to_response('pdf_full_view.html', {
             'file_src': file_src,
@@ -1126,11 +1123,9 @@ def repo_file_edit(request, repo_id):
     if not obj_id:
         return render_error(request, '文件不存在')
 
-    token = ''        
     if access_to_repo(request, repo_id, ''):
-        token = gen_token()
-        seafserv_rpc.web_save_access_token(token, repo_id, obj_id,
-                                           'view', request.user.username)
+        token = seafserv_rpc.web_get_access_token(repo_id, obj_id,
+                                                  'view', request.user.username)
     else:
         render_permission_error(request, '无法查看该文件')
 
@@ -1189,12 +1184,10 @@ def repo_access_file(request, repo_id, obj_id):
     else:
         from_shared_link = False
 
-    token = ''        
     if access_to_repo(request, repo_id, '') or from_shared_link:
         # Get a token to access file
-        token = gen_token()
-        seafserv_rpc.web_save_access_token(token, repo_id, obj_id,
-                                           op, request.user.username)
+        token = seafserv_rpc.web_get_access_token(repo_id, obj_id,
+                                                  op, request.user.username)
     else:
         render_permission_error(request, '无法访问文件')
 
@@ -2023,9 +2016,8 @@ def view_shared_file(request, token):
     if not repo:
         raise Http404
 
-    access_token = gen_token()
-    seafserv_rpc.web_save_access_token(access_token, repo.id, obj_id,
-                                       'view', '')
+    access_token = seafserv_rpc.web_get_access_token(repo.id, obj_id,
+                                                     'view', '')
     
     filetype, fileext = valid_previewed_file(filename)