Changeset 221:45ec490f2dba

Timestamp:

2007-08-10 21:02:53 (1 year ago)

Author:

Stefan Schwarzer <sschwarzer@sschwarzer.net>

branch:

default

Message:

The number of directory levels is no longer a per-server value, but
is instead passed from page to page via a query parameter. Allow to
decrease/increase directory nesting levels up to large values.

Files:

• browser.py (modified) (5 diffs)
• converter.py (modified) (6 diffs)
• session.py (modified) (2 diffs)

browser.py

@@ -37 +37 @@
-from websourcebrowser import converter
-from websourcebrowser import pygmentsfinder
+from websourcebrowser import session
-from websourcebrowser import template
-from websourcebrowser import urlpath
@@ -182 +183 @@
-            self.wfile.write(coding.encode(template.FOOTER))
-
+    def _path_and_params(self, url):
+        """
+        Return a tuple, splitting the URL `url` into an URL without
+        query string and a query mapping as returned by `cgi.parse_qs`.
+        """
+        params = session.default_session.get_from_url(url)
+        parsed_url = list(urlparse.urlparse(url))
+        parsed_url[4] = ""
+        return urlparse.urlunparse(parsed_url), params
+
-    def do_GET(self):
-        """
@@ -189 +200 @@
-            self.handle_builtin(self.path)
-            return
+        # separate path and query parameters
+        url, params = self._path_and_params(self.path)
-        try:
-self.path
+url
-        except urlpath.NotUnderRoot:
-            # don't show items "above" the current directory; thereby
@@ -199 +212 @@
-        else:
-            if os.path.isdir(path):
-
+
+
-            elif self.is_image_path(path):
-self.path
+url
-            else:
-                data = self.get_file(path, raw=True,
- 
+
-                if self.is_binary(data):
-                    data = self.get_file(path, raw=True)
@@ -212 +226 @@
-                    html = converter.text_to_html(text, path)
-            # assume title is UTF-8-encoded though we don't know for sure
-self.path
+url
-            title = urllib.unquote(title)
-            self.emit_data(html, title=title, mtime=os.path.getmtime(path))

converter.py

@@ -1 +1 @@
-# Copyright (C) 2007, Stefan Schwarzer
- 
+
-# Permission is hereby granted, free of charge, to any person
-# obtaining a copy of this software and associated documentation files
@@ -8 +8 @@
-# and to permit persons to whom the Software is furnished to do so,
-# subject to the following conditions:
- 
+
-# The above copyright notice and this permission notice shall be
-# included in all copies or substantial portions of the Software.
- 
+
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
@@ -36 +36 @@
-from websourcebrowser import config
-from websourcebrowser import pygmentsfinder
+from websourcebrowser import session
-from websourcebrowser import urlpath
-
@@ -117 +118 @@
-    return False
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    """
-    Return HTML code unicode string for the directory `path`.
@@ -124 +191 @@
-    start_level = dir_level(path)
-    html_parts = []
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-    # show directory listing
-html_parts.append
+add_html
-    if path != config.root:
-html_parts.append
-         
+add_html
+
-    for item in itertools.ifilterfalse(_ignore_item,
-config.dir_levels
+params['dir_levels']
-        # if the item is a directory, append a slash
-        if os.path.isdir(item):
@@ -167 +213 @@
-        link_text = cgi.escape(coding.decode(os.path.basename(item)))
-        if os.access(item, os.R_OK):
-
-
-
+
+
+
+
-        else:
-            # not really a link
-            link = link_text
-
-
-
+
+
-    return u"\n".join(html_parts)
-

session.py

@@ -27 +27 @@
-
-from websourcebrowser import coding
+from websourcebrowser import config
-
-
@@ -102 +103 @@
-        return urlparse.urlunparse(parsed_url).replace("+", "%20")
-
+
+# define the default session, i. e. one with all the usual query
+#  parameters, including parameter conversion
+class DefaultSession(Session):
+    def __init__(self):
+        super(DefaultSession, self).__init__(['dir_levels'])
+
+    def get_from_url(self, url):
+        params = super(DefaultSession, self).get_from_url(url)
+        # set default
+        dir_levels = config.dir_levels
+        if 'dir_levels' in params:
+            dir_levels = params['dir_levels']
+            try:
+                dir_levels_ = int(dir_levels)
+                if dir_levels_ >= 1:
+                    dir_levels = dir_levels_
+            except ValueError:
+                pass
+        params['dir_levels'] = dir_levels
+        return params
+
+    def add_to_url(self, url, params):
+        if 'dir_levels' in params:
+            dir_levels = params['dir_levels']
+        else:
+            dir_levels = config.dir_levels
+        params['dir_levels'] = str(dir_levels)
+        return super(DefaultSession, self).add_to_url(url, params)
+
+
+default_session = DefaultSession()