 Issue 5747446760079360:
  Issue 402 - Use a redirector script for downloads, not a direct link  (Closed)
    
  
    Issue 5747446760079360:
  Issue 402 - Use a redirector script for downloads, not a direct link  (Closed) 
  | Left: | ||
| Right: | 
| OLD | NEW | 
|---|---|
| (Empty) | |
| 1 # coding: utf-8 | |
| 2 | |
| 3 # This file is part of the Adblock Plus web scripts, | |
| 4 # Copyright (C) 2006-2014 Eyeo GmbH | |
| 5 # | |
| 6 # Adblock Plus is free software: you can redistribute it and/or modify | |
| 7 # it under the terms of the GNU General Public License version 3 as | |
| 8 # published by the Free Software Foundation. | |
| 9 # | |
| 10 # Adblock Plus is distributed in the hope that it will be useful, | |
| 11 # but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 13 # GNU General Public License for more details. | |
| 14 # | |
| 15 # You should have received a copy of the GNU General Public License | |
| 16 # along with Adblock Plus. If not, see <http://www.gnu.org/licenses/>. | |
| 17 | |
| 18 import re | |
| 19 import time | |
| 20 import posixpath | |
| 21 import urlparse | |
| 22 import multiprocessing | |
| 23 from ConfigParser import SafeConfigParser | |
| 24 from sitescripts.web import url_handler | |
| 25 from sitescripts.extensions.utils import getDownloadLinks | |
| 26 | |
| 27 links = {} | |
| 28 | |
| 29 @url_handler('/latest/') | |
| 30 def handle_request(environ, start_response): | |
| 31 global links | |
| 
Sebastian Noack
2014/09/15 10:18:39
links doesn't have to be declared as global, since
 | |
| 32 update_links() | |
| 
Sebastian Noack
2014/09/15 10:18:39
Since the links links are updated asynchronously i
 
Wladimir Palant
2014/09/15 11:39:52
Yes, it is definitely worth delegating - it can ta
 
Sebastian Noack
2014/09/16 09:33:40
I see. But maybe it would be a better approach to
 
Wladimir Palant
2014/09/16 14:26:17
Any way to implement this without complicating thi
 
Sebastian Noack
2014/09/16 14:30:05
Having that process run for as long as the main pr
 | |
| 33 | |
| 34 request = urlparse.urlparse(environ.get('REQUEST_URI', '')) | |
| 35 basename = posixpath.splitext(posixpath.basename(request.path))[0] | |
| 36 if basename in links: | |
| 37 start_response('302 Found', [('Location', links[basename].encode("utf-8"))]) | |
| 38 else: | |
| 39 start_response('404 Not Found', []) | |
| 40 return [] | |
| 41 | |
| 42 UPDATE_INTERVAL = 10 * 60 # 10 minutes | |
| 43 update_queue = multiprocessing.Queue() | |
| 44 last_update = -float('Inf') | |
| 45 | |
| 46 def update_links(): | |
| 47 global UPDATE_INTERVAL, update_queue, links, last_update | |
| 
Sebastian Noack
2014/09/15 10:18:39
UPDATE_INTERVAL and update_queue don't have to be
 | |
| 48 while not update_queue.empty(): | |
| 49 links = update_queue.get() | |
| 
Sebastian Noack
2014/09/15 10:18:39
You should use atomic get, to avoid race condition
 
Wladimir Palant
2014/09/15 11:39:52
There is no race condition here: elements can only
 
Sebastian Noack
2014/09/16 09:33:40
In this particular case there might be no race con
 | |
| 50 | |
| 51 now = time.time() | |
| 52 if now - last_update > UPDATE_INTERVAL: | |
| 53 last_update = now | |
| 54 | |
| 55 process = multiprocessing.Process(target=_update_links, args=(update_queue,) ) | |
| 56 process.daemon = True | |
| 57 process.start() | |
| 58 | |
| 59 def _update_links(queue): | |
| 60 parser = SafeConfigParser() | |
| 61 getDownloadLinks(parser) | |
| 62 result = {} | |
| 63 for section in parser.sections(): | |
| 64 result[section] = parser.get(section, "downloadURL") | |
| 65 queue.put(result) | |
| 66 | |
| 67 update_links() | |
| OLD | NEW |