@@ -112,6 +112,17 @@ class RequestHandler(object):
try:
path_to_doc = "%s%s%s"%(self.path_to_document_dir, os.sep, path)
if 'action_create_file' in http_args.keys():
+ #
+ # Check the directory exists and create it if it doesn't
+ path_tokens = path_to_doc.split(os.sep)[:-1]
+ dirname = os.sep.join( path_tokens )
+ if os.path.exists(dirname) and not os.path.isdir(dirname):
+ print "EE Expecting difficulties: %s exists but is not a directory."%dirname
+ elif not os.path.exists(dirname):
+ print "** No dir %s. Attempt to create"%dirname
+ os.mkdir(dirname)
+ print "-> Success"
+ # Now create the file itself
f_ptr = open(path_to_doc, 'w+')
f_ptr.write('\n')
raise cherrypy.HTTPRedirect('/edit/%s'%'/'.join(lst_path))
@@ -475,6 +486,7 @@ def html_display_dir(target_dir, url_relpath):
</div>
"""%(title_str, url_relpath))
sb.append( html_breadcrumb(url_relpath) )
+ sb.append('<br />')
sb.append('<div class="contentbox">')
sb.append('<p class="wordish_title">/%s</p>'%url_relpath)
sb.append('<hr />')
@@ -641,10 +653,23 @@ def html_display_page(doc_path, static_path, fname, print_header=True):
elif doctype == 'mnml':
try:
- b_new_para=True
- b_in_para=False
- listlevel=0
- for line in content.split('\n'):
+ class ParagraphTracker(object):
+ def __init__(self):
+ self.b_new_para=True
+ self.b_in_para=False
+ self.listlevel=0
+ pt = ParagraphTracker()
+ mnml_lines = content.split('\n')
+ def unwrap():
+ "This is what we do to close off a block."
+ while pt.listlevel>0:
+ sb.append('</ul>')
+ pt.listlevel-=1
+ if pt.b_in_para:
+ sb.append('</p>')
+ pt.b_new_para = True
+ pt.b_in_para = False
+ for idx, line in enumerate(mnml_lines):
if line.startswith('TITLE: '):
sb.append('<p class="wordish_title">%s</p>'%' '.join(line.split(' ')[1:]))
sb.append("<hr />")
@@ -661,7 +686,7 @@ def html_display_page(doc_path, static_path, fname, print_header=True):
elif line.startswith('*'):
#
# Use voodoo to get the ul indent to be right
- w_listlevel = listlevel
+ w_listlevel = pt.listlevel
new_listlevel = 0
split_on_stars = line.split('*')
while split_on_stars[0] == '':
@@ -673,22 +698,16 @@ def html_display_page(doc_path, static_path, fname, print_header=True):
while w_listlevel>new_listlevel:
sb.append('</ul>')
w_listlevel-=1
- listlevel = new_listlevel
+ pt.listlevel = new_listlevel
#
# Now that the listlevel is right, output this line in it
- sb.append('<li>%s</li>'%line[listlevel:].strip())
+ sb.append('<li>%s</li>'%line[pt.listlevel:].strip())
elif line.strip() == '':
- while listlevel>0:
- sb.append('</ul>')
- listlevel-=1
- if b_in_para:
- sb.append('</p>')
- b_new_para = True
- b_in_para = False
+ unwrap()
else:
- b_in_para = True
- if b_new_para:
- b_new_para = False
+ pt.b_in_para = True
+ if pt.b_new_para:
+ pt.b_new_para = False
sb.append('<p style="wordish_p">')
wiki_simple_links_pattern = re.compile('\[\[.*\]\]')
wiki_bar_links_pattern = re.compile('\[\[.*|.*\]\]')
@@ -713,6 +732,8 @@ def html_display_page(doc_path, static_path, fname, print_header=True):
sb_line.append(remainder)
line = ''.join(sb_line)
sb.append(line)
+ # Make sure we've closed everything off in this block
+ unwrap()
except Exception, e:
# xxx
print dir(e)
@@ -795,7 +816,7 @@ def html_edit_page(doc_path, fname, error=None):
%s
<h1 class="wordish_h1">Editing %s</h1>
<form method="POST" action="/save/%s" enctype="multipart/form-data">
- <textarea rows="30" cols="120" name="wiki_content">%s</textarea>
+ <textarea rows="20" cols="100" name="wiki_content">%s</textarea>
<br />
<input name="action_save" type="submit" value="Save" />
<input name="action_cancel" type="submit" value="Cancel" />
@@ -848,7 +869,7 @@ def html_breadcrumb(url_relpath):
path_as_list = url_relpath.split('/')
for idx, path_component in enumerate(path_as_list):
cumulative_path = '/'.join( path_as_list[0:idx+1] )
- sb.append(' > <a href="/%s">%s</a>'%(cumulative_path, path_component))
+ sb.append(' > <a href="/%s">%s</a>'%(cumulative_path, path_component))
sb.append('</div>')
return '\n'.join( sb )
Steamdoc.py
@@ -1,7 +1,5 @@
[global]
-server.socket_host = "127.0.0.1"
-#server.socket_host = "10.1.3.132"
-#server.socket_host = '192.168.2.3'
+server.socket_host = "0.0.0.0"
server.socket_port = 8060
-server.thread_pool = 1
+server.thread_pool = 5
tools.sessions.on = True
cherrypy.conf
@@ -408,8 +408,8 @@ h5.wordish_h5 {
}
textarea {
- width: 920px;
- height: 569px;
+ width: 710px;
+ height: 530px;
border: 4px solid #cccccc;
padding: 5px;
font-family: Courier, sans-serif;
steamdoc.css
@@ -1,3 +1,3 @@
-content_dir=/Users/craig/foundry/blog_steamdoc
-static_dir=/Users/craig/foundry/blog_steamdoc/static
+content_dir=/home/craig/seq/00000.doc
+static_dir=/home/craig/seq/00000.doc/static
title_string=Steamdoc
steamdoc.properties
d7d3c391a26c8e43c299b54ba968a748e2ab3b9c
craig
craig@bump.localdomain
http://github.com/cratuki/steamdoc/commit/96ccc14c6fa1d3e85a6bc040894748767b27cf81
96ccc14c6fa1d3e85a6bc040894748767b27cf81
2008-12-31T07:54:12-08:00
2008-12-31T07:54:12-08:00
Lists weren't closing at the end of a mnml block - fixed.
If you try to create a doc in a directory that doesn't exist, it now tries to create the directory first.
Adjusted the edit table - was too big for my liking
09cd3f31046d68de5715a34b1360560cb0801f5d
craig
craig@bump.localdomain