Changeset 231:e43a99828990

Timestamp:

2007-08-11 17:40:33 (1 year ago)

Author:

Stefan Schwarzer <sschwarzer@sschwarzer.net>

branch:

default

Message:

Handle frames more intelligently. Details:

- If the user types a directory URL into the browser's address line,
  it's automatically opened in frames. The advantage is that the user
  has neither to enter the special /_WEBSOURCERBROSER_/frames URL nor
  has he/she to click "Reset view".

- If a directory link in the directory display (left pane) is clicked,
  it opens in a new frameset. This makes it possible to open a
  directory link in a new window and have the appropriate frameset
  constructed automatically.

- The "frames" builtin is no longer needed and its support has
  therefore been removed.

- The code in `browser.py` and `converter.py` has become more
  complex/nested, though. Perhaps I can clean that a bit up.

Files:

• browser.py (modified) (7 diffs)
• converter.py (modified) (2 diffs)
• session.py (modified) (1 diff)
• template.py (modified) (1 diff)

browser.py

@@ -84 +84 @@
-                           content_type="text/css",
-                           mtime=os.path.getmtime(actual_css_path()))
-        elif builtin == "frames":
-            self.send_response(httplib.OK)
-            header_content_type = "text/html; charset=%s" % \
-                                  coding.DEFAULT_ENCODING
-            self.send_header("Content-type", header_content_type)
-            self.end_headers()
-            self.wfile.write(coding.encode(template.FRAMESET) % {
-              'dir_target': config.DIR_WINDOW_TARGET,
-              'source_target': config.SOURCE_WINDOW_TARGET,
-              'host': config.http_host, 'port': config.http_port})
-        elif builtin == "help":
-            self.emit_data(template.HELP, title=u"Websourcebrowser help",
@@ -121 +111 @@
-    def emit_data(self, data=u"", title=u"", content_type="text/html",
-                   h1_class="Path", http_status=httplib.OK, mtime=None,
-
+, use_header_and_footer=True
-        """
-        Emit the `data` on the HTTP output stream with a content type
@@ -129 +119 @@
-        200 (OK). If `mtime` is set, it's taken as a floating point
-        value like from `time.time()` to set a Last-Modified header.
+        If `use_header_and_footer` is true (the default),
+        prepend/append the header and footer templates from the
+        `template` module.
-        """
-        self.send_response(http_status)
@@ -147 +140 @@
-                h1_class = "Error"
-                title = httplib.responses[http_status]
-
-
-
-
-
-
+
+
+
+
+
+
+
-        if content_type.startswith("text/"):
-            self.wfile.write(coding.encode(data))
-        else:
-            self.wfile.write(data)
-
+ and use_header_and_footer
-            self.wfile.write(coding.encode(template.FOOTER))
-
-path
+url
-        """
-        Return a tuple, splitting the URL `url` into an URL without
@@ -177 +171 @@
-            self.handle_builtin(self.path)
-            return
-path
-path
+URL
+url
-        try:
-            path = urlpath.to_file_system(config.root, url)
@@ -185 +179 @@
-            #  avoiding information disclosure (double dot attack)
-            self.emit_data(http_status=httplib.BAD_REQUEST)
+        use_header_and_footer = True
-        if not os.path.exists(path):
-            self.emit_data(http_status=httplib.NOT_FOUND)
-        else:
-            if os.path.isdir(path):
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-            elif self.is_image_path(path):
-                html = converter.image_to_html(url)
@@ -205 +210 @@
-            title = coding.decode(url[1:]) or u"."
-            title = urllib.unquote(title)
-
+
+
-
-    #

converter.py

@@ -126 +126 @@
-    # show horizontal menu of directory levels
-    add_html('<p class="Options">')
-
-
+
-    add_html('&nbsp;')
-    add_html('<a href="/%s/help" target="%s">Help</a>' %
@@ -197 +196 @@
-    if path != config.root:
-        parent_url = urlpath.to_url(config.root, path) + "/.."
+        params['frames'] = "yes"
-        parent_url = session.default_session.add_to_url(parent_url, params)
-        add_html(u'<tr><td><span class="Options">'
-       u'<a href="%s
+u'<a href="%s" target="_top
-    for item in itertools.ifilterfalse(_ignore_item,
-                walk(path, params['dir_levels'])):
-        # if the item is a directory, append a slash
-        if os.path.isdir(item):
-            target_attribute = u""
-            suffix = u"&nbsp;/"
+            target_attribute = u' target="_top"'
+            params['frames'] = "yes"
-        else:
-            suffix = ""
-            target_attribute = u' target="%s"' % config.SOURCE_WINDOW_TARGET
+            params['frames'] = "no"
-        spacing = (u'<span class="Indent">' +
-                   (u'&gt;' + (config.dir_indent-1) * u'&nbsp;') * \

session.py

@@ -108 +108 @@
-class DefaultSession(Session):
-    def __init__(self):
-
+, 'frames'
-
-    def get_from_url(self, url):

template.py

@@ -60 +60 @@
-</head>
-<frameset cols="30%%,70%%">
-/
+%(dir_url)s
-  <frame name="%(source_target)s" />
-  <noframes>