commit ')
#    linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
    self.add_html("
" + data + "
")
    data = data.replace('\ncommit ','\n
commit ')
    linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
    self.add_html(linkified_data)
 
   def add_links(self):
     page = self.page
@@ -379,8 +390,6 @@ class GitWiki:
     if page_opt == 'log':
         log_link = 'current' % (page,debp)
     edit_link = 'edit' % (page,debp)
    if view_only:
        edit_link = ''
 
     s ="""
        
 %s [%s]  %s  %s 
\n
@@ -401,8 +410,6 @@ class GitWiki:
     self.add_html(START_HTML)
     self.add_html(TOOLTIP_INCLUDE)
 
    if view_only:
        user = view_only
     self.add_debug(':: user=%s\n'%user)
     self.add_debug( '$ cat %s\n' % git_config)
     if not os.path.exists(git_config):

commit 45215a8f70bea04ce3468bfa51278edee01e3851
Author: Robert Frank 
Date:   8 months ago

    Revert "removed index.view.py, since gitwiki.py now contains a view only mode."
    
    This reverts commit 86e4b566f328f8fd81a6df2896c02f6360636d63.

diff --git a/src/index.view.py b/src/index.view.py
new file mode 100755
index 0000000..7281cfd
--- /dev/null
+++ b/src/index.view.py
@@ -0,0 +1,57 @@
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
+
form = cgi.FieldStorage()
+
view_only = True
print "Content-Type: text/html\n"
+
print ''
+
page = 'Home'
page_opt = 'view'
if form.has_key("r"):
    page_parts = form["r"].value.split(':')
    page = page_parts[0]
    if len(page_parts) > 1:
        page_opt = page_parts[1]
+
git_dir = '/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/httpdocs/data/.git'
git_config = '/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/gitconfig'
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
+
def git(run):
    p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
+
os.chdir("/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/httpdocs/data")
+
git(['/usr/bin/git', 'init'])
git(['/usr/bin/git', 'stash'])
git(['/usr/bin/git', 'pull','/home/git/pygitwiki.git'])
git(['/usr/bin/git', 'stash','clear'])
+
try:
    fp = open('%s' % page)
    data = fp.read()
    fp.close()
except:
    data = 'File doesn\'t exist, create one here' % (page)
#		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
if page != 'Home':
    data = '| Home | [%s] | \n\n'%(page)+data
else:
    data = '| [%s] | \n\n' % (page) + data
+
#data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
data = re.sub(r'\[([A-Z]\w+)\]', r'\1', data)
data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2', data)
+
print textile.textile(data)
print ''

commit 10aae573c26356ce906052f534781e488314b537
Author: Robert Frank 
Date:   8 months ago

    added colors

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 233709b..35f27f4 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -17,21 +17,13 @@ cgitb.enable()
 form = cgi.FieldStorage()
 
 # Configuration - these should be made into constants, later
config = ConfigParser.ConfigParser()
config.read('config.cfg')
-
try:
  view_only = config.get('gitwiki', 'view_only', 0)
except:
  view_only = False
-
try:
    USER = os.environ['REMOTE_USER']
except:
    USER = view_only
USER = os.environ['REMOTE_USER']
 QUERY_STRING = os.environ['QUERY_STRING']
 user = USER
 
config = ConfigParser.ConfigParser()
config.read('config.cfg')
+
 git_location = config.get('gitwiki','git_location',0)
 http_dir     = config.get('gitwiki','http_dir',0)
 git_push_dir = config.get('gitwiki', 'git_push_dir', 0)
@@ -164,8 +156,6 @@ class GitWiki:
      sys.exit(0)
 
   def save(self, form):
    if view_only:
        return
     page = self.page
     if page.find('..') >= 0 or page.find('/') >= 0:
         self.add_html('Invalid filename')
@@ -186,8 +176,6 @@ class GitWiki:
         self.git([git_location, 'push', git_push_dir])
 
   def rename(self, form):
    if view_only:
        return
     page = self.page
     debp = self.debp
     new_name = form['new_name'].value
@@ -243,8 +231,6 @@ class GitWiki:
 
   @action('edit')
   def action_edit(self):
      if view_only:
          return
       page = self.page
       debp = self.debp
       data = ''
@@ -276,12 +262,11 @@ class GitWiki:
 
   @action('blame')
   def action_blame(self):
      if not view_only:
          if not os.path.exists(self.page):
              self.add_html('File doesn\'t exist, create one here' % (self.page,self.debp))
              return
      if not os.path.exists(self.page):
          self.add_html('File doesn\'t exist, create one here' % (self.page,self.debp))
          return
       data = self.git([git_location,'blame','-c',self.page], self.debug)
      lines = data.split('\n')
      lines = data.split('\r\n')
       data = ''
       blamery = {}
       for i,line in enumerate(lines):
@@ -312,8 +297,6 @@ class GitWiki:
                     else:
                         txt = '%s seconds ago' % int(diff)
                   except:
                    self.add_debug('exception')
                    import traceback
                     pass
                   blamery[tag] = [tabs[0], txt, tabs[1][1:].strip()]
       blob = textile.textile(data)
@@ -361,10 +344,24 @@ class GitWiki:
               or self.page_opt == 'save' \
               or self.page_opt == 'rename':
         linksopt = ''
    lout = ''
    inpage = False
    for line in data.split('\n'):
        if line[:2] == '@@':
            inpage = True
        elif line[:13] == 'diff --git a/':
            inpage = False
        elif len(line) > 1 and inpage:
            if line[0] == '+' and line[:4] != '+++ ':
                line = '' + line[1:] + ''
            elif line[0] == '-' and line[:4] != '--- ':
                line = '' + line[1:] + ''
        lout += line+'\n'
    data = lout
     data = '\n'+re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
    data = data.replace('\ncommit ','\n

commit ')
#    linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
    self.add_html("
" + data + "
")
    data = data.replace('\ncommit ','\n
commit ')
    linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
    self.add_html(linkified_data)
 
   def add_links(self):
     page = self.page
@@ -379,8 +376,6 @@ class GitWiki:
     if page_opt == 'log':
         log_link = 'current' % (page,debp)
     edit_link = 'edit' % (page,debp)
    if view_only:
        edit_link = ''
 
     s ="""
        
 %s [%s]  %s  %s 
\n
@@ -401,8 +396,6 @@ class GitWiki:
     self.add_html(START_HTML)
     self.add_html(TOOLTIP_INCLUDE)
 
    if view_only:
        user = view_only
     self.add_debug(':: user=%s\n'%user)
     self.add_debug( '$ cat %s\n' % git_config)
     if not os.path.exists(git_config):

commit 86e4b566f328f8fd81a6df2896c02f6360636d63
Author: Robert Frank 
Date:   8 months ago

    removed index.view.py, since gitwiki.py now contains a view only mode.

diff --git a/src/index.view.py b/src/index.view.py
deleted file mode 100755
index 7281cfd..0000000
--- a/src/index.view.py
+++ /dev/null
@@ -1,57 +0,0 @@
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
-
form = cgi.FieldStorage()
-
view_only = True
print "Content-Type: text/html\n"
-
print ''
-
page = 'Home'
page_opt = 'view'
if form.has_key("r"):
    page_parts = form["r"].value.split(':')
    page = page_parts[0]
    if len(page_parts) > 1:
        page_opt = page_parts[1]
-
git_dir = '/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/httpdocs/data/.git'
git_config = '/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/gitconfig'
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
-
def git(run):
    p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
-
os.chdir("/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/httpdocs/data")
-
git(['/usr/bin/git', 'init'])
git(['/usr/bin/git', 'stash'])
git(['/usr/bin/git', 'pull','/home/git/pygitwiki.git'])
git(['/usr/bin/git', 'stash','clear'])
-
try:
    fp = open('%s' % page)
    data = fp.read()
    fp.close()
except:
    data = 'File doesn\'t exist, create one here' % (page)
#		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
if page != 'Home':
    data = '| Home | [%s] | \n\n'%(page)+data
else:
    data = '| [%s] | \n\n' % (page) + data
-
#data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
data = re.sub(r'\[([A-Z]\w+)\]', r'\1', data)
data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2', data)
-
print textile.textile(data)
print ''

commit 6950933bac1430e199d6d66a1e5f9809674a10f2
Author: Robert Frank 
Date:   8 months ago

    changed home

diff --git a/Home b/Home
index 1a5fb66..955a0fe 100644
--- a/Home
+++ b/Home
@@ -10,7 +10,7 @@ h2. Features
 * very simple
 * git based in python for minimal code
 * git blame being used for viewing with tooltip for details of who made the most recent change to a line
* git log is viewable at log (along with diffs)
* git log is viewable at log (along with diffs)
 * renaming a wiki page goes into each page containing a link to the renamed page, and corrects it for you.
 * a preview button so you can see the textile output without saving
 

commit 2a6a1e9329deb42450d6c939ca6a3cccdf721ae4
Author: root 
Date:   8 months ago

    added view only mode

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 67f55c8..233709b 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -276,11 +276,12 @@ class GitWiki:
 
   @action('blame')
   def action_blame(self):
      if not os.path.exists(self.page):
          self.add_html('File doesn\'t exist, create one here' % (self.page,self.debp))
          return
      if not view_only:
          if not os.path.exists(self.page):
              self.add_html('File doesn\'t exist, create one here' % (self.page,self.debp))
              return
       data = self.git([git_location,'blame','-c',self.page], self.debug)
      lines = data.split('\r\n')
      lines = data.split('\n')
       data = ''
       blamery = {}
       for i,line in enumerate(lines):
@@ -311,6 +312,8 @@ class GitWiki:
                     else:
                         txt = '%s seconds ago' % int(diff)
                   except:
                    self.add_debug('exception')
                    import traceback
                     pass
                   blamery[tag] = [tabs[0], txt, tabs[1][1:].strip()]
       blob = textile.textile(data)

commit 1e84a0ebfa03378bfc6f415fcefee64539856c89
Author: Robert Frank 
Date:   8 months ago

    added view only mode to gitwiki

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 81aefe6..67f55c8 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -17,13 +17,21 @@ cgitb.enable()
 form = cgi.FieldStorage()
 
 # Configuration - these should be made into constants, later
USER = os.environ['REMOTE_USER']
QUERY_STRING = os.environ['QUERY_STRING']
user = USER
-
 config = ConfigParser.ConfigParser()
 config.read('config.cfg')
 
try:
  view_only = config.get('gitwiki', 'view_only', 0)
except:
  view_only = False
+
try:
    USER = os.environ['REMOTE_USER']
except:
    USER = view_only
QUERY_STRING = os.environ['QUERY_STRING']
user = USER
+
 git_location = config.get('gitwiki','git_location',0)
 http_dir     = config.get('gitwiki','http_dir',0)
 git_push_dir = config.get('gitwiki', 'git_push_dir', 0)
@@ -156,6 +164,8 @@ class GitWiki:
      sys.exit(0)
 
   def save(self, form):
    if view_only:
        return
     page = self.page
     if page.find('..') >= 0 or page.find('/') >= 0:
         self.add_html('Invalid filename')
@@ -176,6 +186,8 @@ class GitWiki:
         self.git([git_location, 'push', git_push_dir])
 
   def rename(self, form):
    if view_only:
        return
     page = self.page
     debp = self.debp
     new_name = form['new_name'].value
@@ -231,6 +243,8 @@ class GitWiki:
 
   @action('edit')
   def action_edit(self):
      if view_only:
          return
       page = self.page
       debp = self.debp
       data = ''
@@ -362,6 +376,8 @@ class GitWiki:
     if page_opt == 'log':
         log_link = 'current' % (page,debp)
     edit_link = 'edit' % (page,debp)
    if view_only:
        edit_link = ''
 
     s ="""
        
 %s [%s]  %s  %s 
\n
@@ -382,6 +398,8 @@ class GitWiki:
     self.add_html(START_HTML)
     self.add_html(TOOLTIP_INCLUDE)
 
    if view_only:
        user = view_only
     self.add_debug(':: user=%s\n'%user)
     self.add_debug( '$ cat %s\n' % git_config)
     if not os.path.exists(git_config):

commit d4847733404bb83d89d7eb6688af2646920a8f53
Author: Robert Frank 
Date:   8 months ago

    fixed up homepage

diff --git a/Home b/Home
index 110626f..1a5fb66 100644
--- a/Home
+++ b/Home
@@ -1,6 +1,22 @@
 h1. PyGitWiki
 
* A simple wiki, which uses git as a revision repository
* based on textile and wz_tooltip.js
* Currently the source is located at git.bobfrank.org
* useful for organizing thoughts and seeing who's thoughts were organized
 
PyGitWiki is a simple wiki based on the textile python module, and uses git to control history revisions

Currently the source is located at git.bobfrank.org
h2. Features
+
* very simple
* git based in python for minimal code
* git blame being used for viewing with tooltip for details of who made the most recent change to a line
* git log is viewable at log (along with diffs)
* renaming a wiki page goes into each page containing a link to the renamed page, and corrects it for you.
* a preview button so you can see the textile output without saving
+
h2. To-do items for this project
+
* notifications of changes (if you subscribe to a page, or to new pages)
* fancier preview tab
* a hierarchy of wikis, so one wiki can belong to another
 

commit b3a90a043bbfade77900657e5cb7809c960f9d63
Author: okay 
Date:   8 months ago

    Wrap each commit in a 
 field. Initial go at it.
    
    Unlinkify diff text

diff --git a/src/gitwiki.py b/src/gitwiki.py
index a729aea..81aefe6 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -345,9 +345,9 @@ class GitWiki:
               or self.page_opt == 'rename':
         linksopt = ''
     data = '\n'+re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
    data = data.replace('\ncommit ','\n
commit ')
    linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
    self.add_html(linkified_data)
    data = data.replace('\ncommit ','\n
commit ')
#    linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
    self.add_html("
" + data + "
")
 
   def add_links(self):
     page = self.page

commit 994e3151a4620271a407333b54265c3fb5729bf8
Author: Robert Frank 
Date:   8 months ago

    added author fix

diff --git a/src/gitwiki.py b/src/gitwiki.py
index a582a53..a729aea 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -120,6 +120,7 @@ class GitWiki:
     self.debug_html = ''
     self.page = 'Home'
     self.page_opt = 'blame'
    self.author = False
 
   def set_debug(self):
     if QUERY_STRING.find('debug') > 0:
@@ -167,7 +168,11 @@ class GitWiki:
         else:
             self.add_debug('no data found in form for save!')
         self.git([git_location, 'add', page])
        self.git([git_location, 'commit','-a','-m','changed page %s via website' % page])
        run = [git_location, 'commit', '-a', '-m', 'changed page %s via website' % page]
        if self.author:
            run.append('--author')
            run.append(self.author)
        self.git(run)
         self.git([git_location, 'push', git_push_dir])
 
   def rename(self, form):
@@ -190,13 +195,16 @@ class GitWiki:
                     self.git([git_location, 'add', file])
                 if file == page:
                     self.git([git_location, 'mv', page, new_name])
        self.git([git_location, 'commit','-a','-m',
                  'renaming %s to %s via website' % (page,new_name)])
        run = [git_location, 'commit', '-a', '-m',
                  'renaming %s to %s via website' % (page, new_name)]
        if self.author:
            run.append('--author')
            run.append(self.author)
        self.git(run)
         self.git([git_location, 'push', git_push_dir])
     self.redirect("/%s%s" % (new_name, debp))
 
   def git(self, run, debug=False):
      self.add_debug( '$ %s' % ' '.join(run))
       p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
       o,e = p.communicate()
       self.add_debug( '$ %s\n' % ' '.join(run))
@@ -204,6 +212,23 @@ class GitWiki:
       self.add_debug( 'rcode=%d\n' % p.returncode)
       return o
 
  def load_config(self, cfg):
      data = {}
      group = ''
      fp = open(cfg)
      for line in fp:
          if len(line) > 1 and line[0] == '[':
              group = line[1:].split(']')[0]
              data[group] = {}
          sp = line.split('=')
          if len(sp) == 2:
              data[group][sp[0].strip()] = sp[1].strip()
      fp.close()
      if data.has_key('user'):
          if data['user'].has_key('name') and data['user'].has_key('email'):
              self.author = '%s <%s>' % (data['user']['name'], data['user']['email'])
              self.add_debug(':: author = "%s"\n' % self.author.replace('<','<').replace('>','>'))
+
   @action('edit')
   def action_edit(self):
       page = self.page
@@ -361,11 +386,13 @@ class GitWiki:
     self.add_debug( '$ cat %s\n' % git_config)
     if not os.path.exists(git_config):
         open(git_config).write("""[user]
        name = %s
        email = %s@theinternetneverlies.com""" % (user,user) )
name = %s
email = %s@theinternetneverlies.com""" % (user,user) )
     self.add_debug( open(git_config).read())
     self.add_debug( ':: page=%s, page_opt=%s
' % (self.page, self.page_opt))
 
    self.load_config(git_config)
+
     # an actual chdir
     self.add_debug( '$ cd %s' % (http_dir))
     os.chdir(http_dir)

commit fe9a913a53b16cce51237c76e606b97522b5e52e
Author: Robert Frank 
Date:   8 months ago

    fixed up relative dating for blame, so it works with old versions.
    added seperator for log page and action.

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 4a737ef..a582a53 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -302,12 +302,12 @@ class GitWiki:
 
   @page('log')
   def page_log(self):
    data = '\n'+self.git([git_location,'log','-p', '--date=relative'])
    data = self.git([git_location,'log','-p', '--date=relative'])
     self.handle_logs(data)
 
   @action('log')
   def action_log(self):
    data = '\n'+self.git([git_location,'log','-p',self.page])
    data = self.git([git_location,'log','-p',self.page])
     self.handle_logs(data)
 
   def handle_logs(self, data):
@@ -319,7 +319,8 @@ class GitWiki:
               or self.page_opt == 'save' \
               or self.page_opt == 'rename':
         linksopt = ''
    data = re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
    data = '\n'+re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
    data = data.replace('\ncommit ','\n
commit ')
     linkified_data = links(data.replace('\n', '
'), self.debp, linksopt)
     self.add_html(linkified_data)
 

commit 27cbd97823bba478ab36118e0da4966fb2149440
Author: Robert Frank 
Date:   8 months ago

    changed relative dates

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 17e347d..4a737ef 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -22,7 +22,7 @@ QUERY_STRING = os.environ['QUERY_STRING']
 user = USER
 
 config = ConfigParser.ConfigParser()
config.read('/var/www/data/config.cfg')
config.read('config.cfg')
 
 git_location = config.get('gitwiki','git_location',0)
 http_dir     = config.get('gitwiki','http_dir',0)
@@ -240,7 +240,7 @@ class GitWiki:
       if not os.path.exists(self.page):
           self.add_html('File doesn\'t exist, create one here' % (self.page,self.debp))
           return
      data = self.git([git_location,'blame','-c','--date=relative', self.page], self.debug)
      data = self.git([git_location,'blame','-c',self.page], self.debug)
       lines = data.split('\r\n')
       data = ''
       blamery = {}
@@ -253,7 +253,27 @@ class GitWiki:
               else:
                   tag = ' thisisanendoflineforline-%s-'%i
                   data = data + tabs[3][k+1:]+'%s\n'%tag
                  blamery[tag] = [tabs[0], tabs[2], tabs[1][1:].strip()]
                  txt = tabs[2]
                  try:
                    import time
                    tm = time.mktime(time.strptime(tabs[2][:19],"%Y-%m-%d %H:%M:%S"))
                    hrs = int(tabs[2][20:23])
                    tm -= hrs*60
                    diff = time.time()-tm
                    if diff > 120*60*24:
                        diff /= 60*60*24
                        txt = '%d days ago' % int(diff)
                    elif diff > 120*60:
                        diff /= 60*60
                        txt = '%s hours ago' % int(diff)
                    elif diff > 120:
                        diff /= 60
                        txt = '%s minutes ago' % int(diff)
                    else:
                        txt = '%s seconds ago' % int(diff)
                  except:
                    pass
                  blamery[tag] = [tabs[0], txt, tabs[1][1:].strip()]
       blob = textile.textile(data)
       for tag in blamery:
          k = blob.find(tag)

commit b3b15d5d43668d488ac4e9ae8bf062e5e877c3be
Author: natan 
Date:   8 months ago

    Date should output in relative format

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 3d65016..17e347d 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -22,7 +22,7 @@ QUERY_STRING = os.environ['QUERY_STRING']
 user = USER
 
 config = ConfigParser.ConfigParser()
config.read('config.cfg')
config.read('/var/www/data/config.cfg')
 
 git_location = config.get('gitwiki','git_location',0)
 http_dir     = config.get('gitwiki','http_dir',0)
@@ -282,7 +282,7 @@ class GitWiki:
 
   @page('log')
   def page_log(self):
    data = '\n'+self.git([git_location,'log','-p'])
    data = '\n'+self.git([git_location,'log','-p', '--date=relative'])
     self.handle_logs(data)
 
   @action('log')

commit 0ff3ffbef2e020a77fa5853e506e3b604f8bbe15
Author: natan 
Date:   8 months ago

    ugh, annoying space issue

diff --git a/css/wiki.css b/css/wiki.css
index 358df31..4d52671 100644
--- a/css/wiki.css
+++ b/css/wiki.css
@@ -41,8 +41,8 @@
   color: #4c4c43;
 }
 
#content form #rename #rename_bar {
  position : relative
#content form#rename #rename_bar {
  position : relative;
 }
 
 #content form#rename #rename_label {

commit f06a371c80aa815a1360270204a8ff834725bb5b
Author: natan 
Date:   8 months ago

    More css style tweaks

diff --git a/css/wiki.css b/css/wiki.css
index 939716d..358df31 100644
--- a/css/wiki.css
+++ b/css/wiki.css
@@ -31,6 +31,16 @@
   border-bottom : none;
   display : inline-block
 }
+
#content form input[type=submit] {
  background: none;
  border: none;
  font-weight: bold;
  font-size: 16px;
  cursor: pointer;
  color: #4c4c43;
}
+
 #content form #rename #rename_bar {
   position : relative
 }
@@ -75,4 +85,4 @@
   position : absolute;
   width : 100%;
   border : 1px solid #cdcdcd
} 
}

commit b7277b45448bdf8c558462764a3fc940a825ff7f
Author: natan 
Date:   8 months ago

    Fix css mistkae.

diff --git a/css/wiki.css b/css/wiki.css
index 83a3c37..939716d 100644
--- a/css/wiki.css
+++ b/css/wiki.css
@@ -52,7 +52,7 @@
   border : 3px solid #cdcdcd
 }
 
#content form#edit input[value="rename"] {
#content form#rename input[value="rename"] {
   position : absolute;
   right : 10px;
   top : 10px;
@@ -75,6 +75,4 @@
   position : absolute;
   width : 100%;
   border : 1px solid #cdcdcd
}
-
-
} 

commit 695ac22dcd860af2a4267e123fd514b79d4944b0
Merge: ea2d272... 983897e...
Author: natan 
Date:   8 months ago

    Merge branch 'master' of okay@bobfrank.org:/home/git/pygitwiki

commit ea2d272fd0d4c7f314a7215e09ca8bfbc261be6a
Author: natan 
Date:   8 months ago

    Add css style updates. Modify links html.

diff --git a/css/wiki.css b/css/wiki.css
index aaf8406..83a3c37 100644
--- a/css/wiki.css
+++ b/css/wiki.css
@@ -1,19 +1,80 @@
 #content {
  width: 650;
  padding: 25px;
  margin: auto;
  border: 1px solid #dedede;
  width : 650;
  padding : 25px;
  margin : auto;
  border : 1px solid #dedede
 }
+
#content a:visited, #content a {
  color : #4c4c43;
  font-size : 100%;
  text-decoration : none;
  border-bottom : 1px dotted #cdcdcd;
  font-family : sans-serif
}
+
#content a:hover {
  color : #000;
  border-bottom : none
}
+
#content div#nav_bar {
  margin-bottom : 15px
}
+
#content div#nav_bar a {
  border-left : 2px dashed #A3BFBD;
  color : #6d6d6d;
  font-size : 16px;
  padding : 5px;
  text-decoration : none;
  border-bottom : none;
  display : inline-block
}
#content form #rename #rename_bar {
  position : relative
}
+
#content form#rename #rename_label {
  position : absolute;
  left : 5px;
  top : 5px;
  height : 35px;
  font-size : 14px
}
+
#content form#rename input[name="new_name"] {
  font-size : 30px;
  padding-left : 100px;
  margin-right : 100px;
  width : 100%;
  margin-bottom : 20px;
  border : 3px solid #cdcdcd
}
+
#content form#edit input[value="rename"] {
  position : absolute;
  right : 10px;
  top : 10px;
  height : 25px
}
+
#content form#edit textarea#data {
  height : 400px;
  width : 650px;
  overflow : auto;
  padding : 5px;
  border : 3px solid #cdcdcd;
  margin-bottom : 20px
}
+
 #debug {
  height:200px;
  left:0;
  overflow-y:scroll;
  position:absolute;
  width:100%;
  border: 1px solid #cdcdcd;
}
textarea #data {
  height: 400px;
  width: 650px;
  overflow: auto;
  height : 200px;
  left : 0;
  overflow-y : scroll;
  position : absolute;
  width : 100%;
  border : 1px solid #cdcdcd
 }
+
+
diff --git a/src/gitwiki.py b/src/gitwiki.py
index ee3cc7b..96e7fc8 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -44,17 +44,20 @@ START_HTML = """
 

 """
 RENAME_HTML = """

  Editing 

   
          
  
+
  

    Editing Page:
    
    
  
 
 """
 EDIT_HTML = """


 
%(data)s

%(data)s

 
 
 

@@ -81,6 +84,7 @@ TOOLTIP_INCLUDE = ''
TOOLTIP_INCLUDE = ''
 START_DEBUG = '
[debug mode on]
'
 END_DEBUG = '
'
 
@@ -151,7 +145,6 @@ class GitWiki:
 
   def redirect(self, url):
     # pass
    print CONTENT_TYPE
     print REDIRECT_HTML % { "url" : url }
     sys.exit(0)
 

commit e0761decf51b1e760b8813cfd630a5074feb5045
Merge: 7d933f1... 69d6bff...
Author: natan 
Date:   8 months ago

    Merge branch 'master' of okay@bobfrank.org:/home/git/pygitwiki

commit 7d933f1d30e764c40badfcff08d1b166922d596e
Author: natan 
Date:   8 months ago

    Add redirect() command and hook up to rename/save

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 49bcc2a..cee2ecc 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -75,6 +75,13 @@ END_HTML = """
 

[source code]

 """
 
REDIRECT_HTML = """





"""
 
 TOOLTIP_INCLUDE = ''
 START_DEBUG = '
[debug mode on]
'
@@ -142,6 +149,12 @@ class GitWiki:
     if self.debug:
         self.debug_html += data + "\n"
 
  def redirect(self, url):
    # pass
    print CONTENT_TYPE
    print REDIRECT_HTML % { "url" : url }
    sys.exit(0)
+
   def save(self, form):
     page = self.page
     if page.find('..') >= 0 or page.find('/') >= 0:
@@ -180,6 +193,7 @@ class GitWiki:
         self.git([git_location, 'commit','-a','-m',
                   'renaming %s to %s via website' % (page,new_name)])
         self.git([git_location, 'push', git_push_dir])
    self.redirect("/%s%s" % (new_name, debp))
 
   def git(self, run, debug=False):
       self.add_debug( '$ %s' % ' '.join(run))
@@ -214,6 +228,7 @@ class GitWiki:
           self.add_html(HIDE_EDIT_TEXTAREA)
       elif form.has_key("save"):
           self.save(form)
          self.redirect("/%s%s" % (page, debp))
           # And redirect, after
       else:
           self.add_html(RENAME_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "edit" })

commit 69d6bffd46c63570c5cfd392d15d6f64d603c3a5
Merge: 469539d... 70e1ccb...
Author: Robert Frank 
Date:   8 months ago

    Merge branch 'master' of bobfrank.org:/home/git/pygitwiki
    
    Conflicts:
    	src/gitwiki.py

commit 469539d751ee2125e7e4ec814579d2ec3f4d6c45
Author: Robert Frank 
Date:   8 months ago

    changed around gitwiki

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 0dcb449..9ae79dc 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -157,9 +157,9 @@ class GitWiki:
   def git(self, run, debug=False):
       p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
       o,e = p.communicate()
      self.add_debug( '$ %s' % ' '.join(run))
      self.add_debug( o.replace('\n', '
') + e.replace('\n', '
') )
      self.add_debug( '
rcode=%d' % p.returncode)
      self.add_debug( '$ %s\n' % ' '.join(run))
      self.add_debug( '%s%s\n' % (o, e) )
      self.add_debug( 'rcode=%d\n' % p.returncode)
       return o
 
   @action('edit')
@@ -200,7 +200,7 @@ class GitWiki:
               if len(tabs[3][k+1:]) == 0 or tabs[3][-1] == '|':
                   data = data + tabs[3][k+1:]+'\n'
               else:
                  tag = 'thisisanendoflineforline-%s-'%i
                  tag = ' thisisanendoflineforline-%s-'%i
                   data = data + tabs[3][k+1:]+'%s\n'%tag
                   blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
       blob = textile.textile(data)
@@ -229,44 +229,66 @@ class GitWiki:
 
   @page('log')
   def page_log(self):
    data = self.git([git_location,'log'])
    data = '\n'+self.git([git_location,'log','-p'])
    self.handle_logs(data)
+
  @action('log')
  def action_log(self):
    data = '\n'+self.git([git_location,'log','-p',self.page])
    self.handle_logs(data)
+
  def handle_logs(self, data):
     k = -2
     last = ''
    diffs = {}
    while True:
        k = data.find('commit', k+2)
        if k >= 0:
            j = data.find('\n',k)
            if j >= 0:
                commit = data[k+7:j]
                if len(commit) > 10:
                    if last != '':
                        diffs[last] = commit
                    last = commit
        else:
            break
    for a in diffs:
        b = diffs[a]
        data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
    self.add_html('
%s
' % data)
-
  @page('diff')
  def page_diff(self):
    if form.has_key('a') and form.has_key('b'):
        data = self.git([git_location,'diff',form['a'].value,form['b'].value])
    	data = re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
        self.add_html(links(data.replace('\n','
'),self.debp))
#    diffs = {}
#    while True:
#        k = data.find('commit', k+2)
#        if k >= 0:
#            j = data.find('\n',k)
##            if j >= 0:
#                commit = data[k+7:j]
#                if len(commit) > 10:
#                    if last != '':
#                        diffs[last] = commit
#                    last = commit
#        else:
#            break
#    for a in diffs:
#        b = diffs[a]
#        data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
    linksopt = self.page_opt
    if self.page_opt == 'edit' \
              or self.page_opt == 'blame' \
              or self.page_opt == 'save' \
              or self.page_opt == 'rename':
        linksopt = ''
    data = re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
    self.add_html(links(data.replace('\n','
'),self.debp,linksopt))
+
#  @page('diff')
#  def page_diff(self):
#    if form.has_key('a') and form.has_key('b'):
#        data = self.git([git_location,'diff',form['a'].value,form['b'].value])
#    	data = re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
#        self.add_html(links(data.replace('\n','
'),self.debp))
 
   def add_links(self):
     page = self.page
     page_opt = self.page_opt
     debp = self.debp
 
    s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
    log_link = 'log' % (page,debp)
    if page_opt == 'log':
        log_link = 'regular page' % (page,debp)
    edit_link = 'edit' % (page,debp)
    s ='| [%s] | %s | %s |

\n' % (page,log_link,edit_link)
     if page != 'Home':
         s = '| Home '+s
     linksopt = self.page_opt
    if self.page_opt == 'edit' or self.page_opt == 'blame' or self.page_opt == 'save' or self.page_opt == 'rename':
    if self.page_opt == 'edit' \
              or self.page_opt == 'blame' \
              or self.page_opt == 'save' \
              or self.page_opt == 'rename':
         linksopt = ''
     self.add_html(links(s,debp,linksopt))
 
@@ -278,8 +300,8 @@ class GitWiki:
     self.add_html(START_HTML)
     self.add_html(TOOLTIP_INCLUDE)
 
    self.add_debug(':: user=%s'%user)
    self.add_debug( '$ cat %s' % git_config)
    self.add_debug(':: user=%s\n'%user)
    self.add_debug( '$ cat %s\n' % git_config)
     if not os.path.exists(git_config):
         open(git_config).write("""[user]
         name = %s

commit 70e1ccbf0cd5628cee8a6a07a34ac0d401fb9bcd
Author: natan 
Date:   8 months ago

    Re-order HTML in form and add better text area CSS

diff --git a/css/wiki.css b/css/wiki.css
index 383ccc8..aaf8406 100644
--- a/css/wiki.css
+++ b/css/wiki.css
@@ -11,5 +11,9 @@
   position:absolute;
   width:100%;
   border: 1px solid #cdcdcd;
  
}
textarea #data {
  height: 400px;
  width: 650px;
  overflow: auto;
 }
diff --git a/src/gitwiki.py b/src/gitwiki.py
index 00624c4..49bcc2a 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -43,13 +43,15 @@ START_HTML = """
 
 

 

 """
EDIT_HTML = """
RENAME_HTML = """
 

   Editing 
   
           
   
 

"""
EDIT_HTML = """
 

 
 %(data)s

@@ -205,6 +207,7 @@ class GitWiki:
 
       if form.has_key("preview"):
           # Show the POSTed data
          self.add_html(RENAME_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "edit" })
           self.add_html(textile.textile(links(data,self.debp,'view')))
           self.add_html(EDIT_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "edit" })
           # Hide the text area, too.
@@ -213,6 +216,7 @@ class GitWiki:
           self.save(form)
           # And redirect, after
       else:
          self.add_html(RENAME_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "edit" })
           self.add_html(EDIT_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "preview" })
 
   @action('blame')

commit dff1017dfd1c0e5d787eaa33ad55205d365b71d5
Author: natan 
Date:   8 months ago

    Fix textile bad parsing error.

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 51ff400..00624c4 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -134,11 +134,11 @@ class GitWiki:
                 self.page_opt = self.page_opt.split('&')[0]
 
   def add_html(self, data):
    self.html = '%s%s' % (self.html,data)
    self.html = '%s%s\r\n' % (self.html,data)
 
   def add_debug(self, data):
     if self.debug:
        self.debug_html += data
        self.debug_html += data + "\n"
 
   def save(self, form):
     page = self.page
@@ -231,7 +231,7 @@ class GitWiki:
               if len(tabs[3][k+1:]) == 0 or tabs[3][-1] == '|':
                   data = data + tabs[3][k+1:]+'\n'
               else:
                  tag = 'thisisanendoflineforline-%s-'%i
                  tag = ' thisisanendoflineforline-%s-'%i
                   data = data + tabs[3][k+1:]+'%s\n'%tag
                   blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
       blob = textile.textile(data)

commit e7ed03c23d2e7c3f9b362d45dff00fec3b47b968
Author: natan 
Date:   8 months ago

    Add css styles

diff --git a/css/no-reset.css b/css/no-reset.css
new file mode 100644
index 0000000..72d2b2b
--- /dev/null
+++ b/css/no-reset.css
@@ -0,0 +1,176 @@
/*
   No Reset: A Base Stylesheet For Your Projects
   Makes browser default styles more consistent, and provides a canvas that
   you SHOULD modify to fit your needs.
   http://covertprestige.info/css/base-stylesheet/
*/
+
+
/* --- BASIC STYLES --- */
+
/* Page */
html {
  font-size: 100%; /* Avoids IE 5-7 bug with EM fonts */
}
body {
  margin: 0;
  padding: 1em; /* set to zero if needed! */
  /* font-family examples:
  font-family: Arial, Helvetica, "Liberation Sans", FreeSans, sans-serif;
  font-family: Verdana, "DejaVu Sans", "Bitstream Vera Sans", Geneva, sans-serif;
  font-family: Georgia, "DejaVu Serif", Norasi, serif; */
  font-size: .8em; /* Adapt for your chosen type! Usual range: .625 to 1 */
  line-height: 1.4; /* Adapt for your design and chosen type! 1.1-1.2 is good
    for title text or narrow column text but you will want to increase that
    to something in the 1.2-1.8 range for main content text. */
  color: black;
  background: white;
}
+
/* Titles */
h1, h2, h3, h4, h5, h6 {
  margin: 1em 0 .5em 0; /* Titles should be close to the text they describe */
  line-height: 1.2; /* Bigger text is often nicer with smaller line space */
  font-weight: bold; /* Browser default. Use "normal" for less bulky titles */
  font-style: normal;
}
h1 {
  font-size: 1.75em;
}
h2 {
  font-size: 1.5em;
}
h3 {
  font-size: 1.25em;
}
h4 {
  font-size: 1em;
}
+
/* Lists */
ul, ol {
  margin: .75em 0 .75em 32px;
  padding: 0;
}
+
/* Paragraphs */
p {
  margin: .75em 0; /* Most browser defaults are "1em 0". */
}
address {
  margin: .75em 0; /* You may want display:inline;margin:0; in HTML 5 */
  font-style: normal; /* The annoying browser default is "italic". */
}
+
/* Links */
a {
  text-decoration: underline;
}
a:link {
  color: #11C;
}
a:visited {
  color: #339;
}
a:hover, a:focus, a:active {
  color: #00F;
}
/* No dotted outline or halo around links when clicking them */
a:active {
  outline: none;
}
/* No border around images in links */
a img {
  border: none;
}
+
/* Misc inline elements */
/* These are default styles in virtually any browser, but you may want to
   change them for a specific project. */
em {
  font-style: italic;
}
strong {
  font-weight: bold;
}
/* Stopping superscript and subscript from augmenting the line's leading */
sup, sub {
  line-height: 0;
}
+
/* Forms */
form, fieldset {
  margin: 0;
  padding: 0;
  border: none;
}
input, button, select {
  vertical-align: middle; /* Not perfect,
  but best compromise for most browsers */
}
+
+
/* --- ADDITIONAL BASIC STYLES --- */
+
/* Make abbreviations more clearly visible */
abbr[title] {
  border-bottom: 1px dotted;
  cursor: help;
}
+
/* Make quotations more clearly visible */
blockquote {
  margin: .75em 0 .75em 20px;
  padding: 0 0 0 10px;
  border-left: solid 2px #ddd;
}
q, cite {
  font-style: italic;
}
q cite, q q {
  font-style: normal
}
+
/* Suppression des guillemets automatiques pour citations courtes */
q {
  quotes: none;
}
q:before, q:after {
  content: ""; /* Needed for Safari/Chrome */
}
+
/* Bring paragraphs inside lists or quotations closer */
blockquote p, li p {
  margin: .5em 0;
}
+
/* Basic styles for definition lists */
dl {
  margin: .75em 0;
}
dt {
  margin: .75em 0 0 0;
  font-weight: bold;
}
dd {
  margin: .25em 0 .25em 32px;
}
+
/* Simple styles for tables */
table {
  margin: 0;
  border: 1px solid gray; /* Set to "none" to suppress the table border */
  border-collapse: collapse; /* Default is "seperate" */
  border-spacing: 0; /*! No IE 6-7 support */
}
table td, table th {
  padding: 4px; /* Set to "0" for no white space around cell contents */
  border: 1px solid #ccc; /* Set to "none" to suppress cell borders */
  vertical-align: top; /* Default is "middle" */
}
+
/* HTML 5 semantic wrapper elements */
article, aside, dialog, figure, footer, header,
hgroup, menu, nav, section, menu {
  display: block;
}
diff --git a/css/style.css b/css/style.css
new file mode 100644
index 0000000..d71b50b
--- /dev/null
+++ b/css/style.css
@@ -0,0 +1,137 @@
table
  {
  width: 100%;
  border-collapse: collapse;
  background-color: white;
  color: black;
  font: 10pt verdana, arial;
  margin-bottom: 0%; /* %, px, em, ex ? */
  }
+
tr.subhead
  {
  background-color: #cccccc;
  }
+
th
  {
  padding: 0 4pt;
  }
+
th.alt
  {
  background-color: black;
  color: white;
  padding: 4pt 4pt 2pt;
  }
+
td
  {
  padding: 0 4pt;
  }
+
tr.alt
  {
  background-color: #eeeeee;
  }
+
h1
  {
  font: 24pt verdana, arial;
  margin: 0;
  }
+
h2
  {
  font: 18pt verdana, arial;
  margin: 0;
  }
+
h3
  {
  font: 12pt verdana, arial;
  margin: 0;
  }
+
th a
  {
  color: #00008b;
  font: 8pt verdana, arial;
  }
+
a
  {
  color: #00008b;
  text-decoration: none;
  }
+
a:hover
  {
  color: #00008b;
  text-decoration: underline;
  }
+
div.outer
  {
  width: 90%;
  margin: 15%;
  }
+
table.viewmenu td
  {
  background-color: #006699;
  color: white;
  padding: 0 6pt;
  }
+
table.viewmenu td.end
  {
  padding: 0;
  }
+
table.viewmenu a
  {
  color: white;
  font: 8pt verdana, arial;
  }
+
table.viewmenu a:hover
  {
  color: white;
  font: 8pt verdana, arial;
  }
+
a.tinylink
  {
  color: #00008b;
  font: 8pt verdana, arial;
  text-decoration: underline;
  }
+
a.link
  {
  color: #00008b;
  text-decoration: underline;
  }
+
div.buffer
  {
  padding-top: 7%;
  padding-bottom: 17%;
  }
+
.small
  {
  font: 8pt verdana, arial;
  }
+
table td
  {
  padding-right: 15pt;
  }
+
table td.nopad
  {
  padding-right: 5pt;
  }
+
diff --git a/css/wiki.css b/css/wiki.css
new file mode 100644
index 0000000..383ccc8
--- /dev/null
+++ b/css/wiki.css
@@ -0,0 +1,15 @@
#content {
  width: 650;
  padding: 25px;
  margin: auto;
  border: 1px solid #dedede;
}
#debug {
  height:200px;
  left:0;
  overflow-y:scroll;
  position:absolute;
  width:100%;
  border: 1px solid #cdcdcd;
  
}

commit 3fc9bbcee558380ad250a2888597ade0d6b44d96
Author: natan 
Date:   8 months ago

    Reposition debug display

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 984e7c6..51ff400 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -65,16 +65,18 @@ textarea#data {
 
 """
 
END_HTML = """
END_CONTENT = """
 

"""
END_HTML = """
 

 

[source code]

 """
 
 
 TOOLTIP_INCLUDE = ''
START_DEBUG = '[debug mode on]
'
END_DEBUG = '
'
START_DEBUG = '
[debug mode on]
'
END_DEBUG = '
'
 
 # Generate links
 def links(data,debp,mode=None):
@@ -340,6 +342,7 @@ class GitWiki:
     else:
         self.action_show()
 
    self.add_html(END_CONTENT)
     self.add_debug(END_DEBUG)
     self.add_html(self.debug_html)
     self.add_html(END_HTML)

commit 5575dca3ab01cd21fb3b7da1a5d52bdd82d4003c
Author: natan 
Date:   8 months ago

    Add preview action to form. Remove 'page_opt' save, distinction.

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 576bf33..984e7c6 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -43,6 +43,28 @@ START_HTML = """
 
 

 

 """
EDIT_HTML = """

  Editing 
  
          
  



%(data)s




"""
HIDE_EDIT_TEXTAREA = """

"""
+
 END_HTML = """
 

 

@@ -168,24 +190,28 @@ class GitWiki:
       page = self.page
       debp = self.debp
       data = ''
      try:
          fp = open('%s' % page)
          data = fp.read()
          fp.close()
      except:
          pass
      self.add_html("""
      

      Editing 
      
              
      

      

      
      %(data)s

      
      

      """ % { "page" : page, "debp" : debp, "data" : data })
      self.add_debug(str(form))
      if form.has_key("data"):
          data = form["data"].value
      else:
          try:
              fp = open('%s' % page)
              data = fp.read()
              fp.close()
          except:
              pass
+
      if form.has_key("preview"):
          # Show the POSTed data
          self.add_html(textile.textile(links(data,self.debp,'view')))
          self.add_html(EDIT_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "edit" })
          # Hide the text area, too.
          self.add_html(HIDE_EDIT_TEXTAREA)
      elif form.has_key("save"):
          self.save(form)
          # And redirect, after
      else:
          self.add_html(EDIT_HTML % { "page" : page, "debp" : debp, "data" : data, "action" : "preview" })
 
   @action('blame')
   def action_blame(self):
@@ -301,9 +327,7 @@ class GitWiki:
     self.git([git_location, 'stash','clear'])
 
     # Actions : no printing HTML gets done here
    if self.page_opt == 'save':
        self.save(form)
    elif self.page_opt == 'rename':
    if self.page_opt == 'rename':
         self.rename(form)
 
     self.add_links()

commit fc75345af5cc1a6d84437d9860f9dffb6b2a6e3a
Author: natan 
Date:   8 months ago

    Fix for 'r' param checking, + better string formatting in edit_action

diff --git a/src/gitwiki.py b/src/gitwiki.py
index 0dcb449..576bf33 100755
--- a/src/gitwiki.py
+++ b/src/gitwiki.py
@@ -98,8 +98,9 @@ class GitWiki:
 
   def set_page(self, form):
     if form.has_key("r"):
        if type(form['r'].value) == type([]):
            page_parts = form["r"].value[0].split(':')
        # This is happening for no good reason.
        if type(form['r']) == type([]):
            page_parts = form["r"][0].value.split(':')
         else:
             page_parts = form["r"].value.split(':')
         self.page = page_parts[0]
@@ -155,9 +156,9 @@ class GitWiki:
         self.git([git_location, 'push', git_push_dir])
 
   def git(self, run, debug=False):
      self.add_debug( '$ %s' % ' '.join(run))
       p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
       o,e = p.communicate()
      self.add_debug( '$ %s' % ' '.join(run))
       self.add_debug( o.replace('\n', '
') + e.replace('\n', '
') )
       self.add_debug( '
rcode=%d' % p.returncode)
       return o
@@ -173,16 +174,18 @@ class GitWiki:
           fp.close()
       except:
           pass
      self.add_html('
' % (page,debp))
      self.add_html('Editing ' % page)
      self.add_html('' % (page,debp))
      self.add_html('        ')
      self.add_html('')

      self.add_html('
' % (page,debp))
      self.add_html('' % (page,debp))
      self.add_html('%s
' % data)
      self.add_html('')
      self.add_html('')

      self.add_html("""
      

      Editing 
      
              
      

      

      
      %(data)s

      
      

      """ % { "page" : page, "debp" : debp, "data" : data })
 
   @action('blame')
   def action_blame(self):

commit dfc7f5c84bbef1b5299f7f438a1edbfa43de5ce8
Author: Robert Frank 
Date:   8 months ago

    moved index.edit.py to gitwiki.py

diff --git a/src/gitwiki.py b/src/gitwiki.py
new file mode 100755
index 0000000..0dcb449
--- /dev/null
+++ b/src/gitwiki.py
@@ -0,0 +1,324 @@
#!/usr/bin/python
+
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
import sys
import cgitb
import ConfigParser
+
cgitb.enable()
form = cgi.FieldStorage()
+
# Configuration - these should be made into constants, later
USER = os.environ['REMOTE_USER']
QUERY_STRING = os.environ['QUERY_STRING']
user = USER
+
config = ConfigParser.ConfigParser()
config.read('config.cfg')
+
git_location = config.get('gitwiki','git_location',0)
http_dir     = config.get('gitwiki','http_dir',0)
git_push_dir = config.get('gitwiki', 'git_push_dir', 0)
git_dir      = config.get('gitwiki', 'git_dir', 0)
git_config   = config.get('gitwiki', 'git_config', 0, {'user': user})
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
+
CONTENT_TYPE = "Content-Type: text/html\r\n\r\n"
START_HTML = """







 

"""
END_HTML = """




[source code]
"""
+
+
TOOLTIP_INCLUDE = ''
START_DEBUG = '[debug mode on]
'
END_DEBUG = '
'
+
# Generate links
def links(data,debp,mode=None):
    if not mode or mode == 'edit':
       mode = ''
    elif len(mode) > 1 and mode[0] != ':':
       mode = ':'+mode
    #           $text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % (mode,debp), data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % (mode,debp), data)
    return data
+
ACTIONS = {}
PAGES   = {}
+
def action(name):
   def fnrun(fn):
     ACTIONS[name] = fn
     return fn
   return fnrun
+
def page(name):
   def fnrun(fn):
     PAGES[name] = fn
     return fn
   return fnrun
+
class GitWiki:
  def __init__(self):
    self.debug = False
    self.debp = ''
    self.html = ''
    self.debug_html = ''
    self.page = 'Home'
    self.page_opt = 'blame'
+
  def set_debug(self):
    if QUERY_STRING.find('debug') > 0:
        self.debug = True
        self.debp = '&debug'
        self.add_debug(START_DEBUG)
+
  def set_page(self, form):
    if form.has_key("r"):
        if type(form['r'].value) == type([]):
            page_parts = form["r"].value[0].split(':')
        else:
            page_parts = form["r"].value.split(':')
        self.page = page_parts[0]
        if len(page_parts) > 1:
            self.page_opt = page_parts[1]
            if self.page_opt.find('&debug') > 0:
                self.page_opt = self.page_opt.split('&')[0]
+
  def add_html(self, data):
    self.html = '%s%s' % (self.html,data)
+
  def add_debug(self, data):
    if self.debug:
        self.debug_html += data
+
  def save(self, form):
    page = self.page
    if page.find('..') >= 0 or page.find('/') >= 0:
        self.add_html('Invalid filename')
    else:
        if form.has_key('data'):
            self.add_debug('saving %s, len(data) = %d' % (page,len(form['data'].value)))
            fp = open('%s' % page, 'w')
            fp.write(form['data'].value)
            fp.close()
        else:
            self.add_debug('no data found in form for save!')
        self.git([git_location, 'add', page])
        self.git([git_location, 'commit','-a','-m','changed page %s via website' % page])
        self.git([git_location, 'push', git_push_dir])
+
  def rename(self, form):
    page = self.page
    new_name = form['new_name'].value
    if new_name.find('..') >= 0 or new_name.find('/') >= 0:
        self.add_html('Invalid filename')
    else:
        for file in os.listdir('.'):
            if file.find('.') < 0:
                f=open(file)
                data = f.read()
                f.close()
                if data.find('[%s]'%page) > 0:
                    data = data.replace('[%s]'%page,'[%s]'%new_name)
                    f=open(file,'w')
                    f.write(data)
                    f.close()
                    self.git([git_location, 'add', file])
                if file == page:
                    self.git([git_location, 'mv', page, new_name])
        self.git([git_location, 'commit','-a','-m',
                  'renaming %s to %s via website' % (page,new_name)])
        self.git([git_location, 'push', git_push_dir])
+
  def git(self, run, debug=False):
      p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
      o,e = p.communicate()
      self.add_debug( '$ %s' % ' '.join(run))
      self.add_debug( o.replace('\n', '
') + e.replace('\n', '
') )
      self.add_debug( '
rcode=%d' % p.returncode)
      return o
+
  @action('edit')
  def action_edit(self):
      page = self.page
      debp = self.debp
      data = ''
      try:
          fp = open('%s' % page)
          data = fp.read()
          fp.close()
      except:
          pass
      self.add_html('
' % (page,debp))
      self.add_html('Editing ' % page)
      self.add_html('' % (page,debp))
      self.add_html('        ')
      self.add_html('')

      self.add_html('
' % (page,debp))
      self.add_html('' % (page,debp))
      self.add_html('%s
' % data)
      self.add_html('')
      self.add_html('')

+
  @action('blame')
  def action_blame(self):
      if not os.path.exists(self.page):
          self.add_html('File doesn\'t exist, create one here' % (self.page,self.debp))
          return
      data = self.git([git_location,'blame','-c',self.page], self.debug)
      lines = data.split('\r\n')
      data = ''
      blamery = {}
      for i,line in enumerate(lines):
          tabs = line.split('\t')
          if len(tabs) >= 4:
              k = tabs[3].find(')')
              if len(tabs[3][k+1:]) == 0 or tabs[3][-1] == '|':
                  data = data + tabs[3][k+1:]+'\n'
              else:
                  tag = 'thisisanendoflineforline-%s-'%i
                  data = data + tabs[3][k+1:]+'%s\n'%tag
                  blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
      blob = textile.textile(data)
      for tag in blamery:
         k = blob.find(tag)
         if k >= 0:
             j = max(blob.rfind('li>',0,k),
                     blob.rfind('h2>',0,k),
                     blob.rfind('h3>',0,k),
                     blob.rfind('h1>',0,k),
                     blob.rfind('
',0,k))
             if j >= 0:
                 blob = blob.replace(blob[j+3:k+len(tag)],
"""%s""" %                                    (blamery[tag][1], blamery[tag][2], blamery[tag][0], blob[j+3:k]) )
      self.add_html(links(blob, self.debp))
+
  @action('view')
  def action_show(self):
      try:
          fp = open('%s' % self.page)
          data = fp.read()
          fp.close()
      except:
          data = 'File doesn\'t exist, create one here' % (self.page,self.debp)
      self.add_html(textile.textile(links(data,self.debp,'view')))
+
  @page('log')
  def page_log(self):
    data = self.git([git_location,'log'])
    k = -2
    last = ''
    diffs = {}
    while True:
        k = data.find('commit', k+2)
        if k >= 0:
            j = data.find('\n',k)
            if j >= 0:
                commit = data[k+7:j]
                if len(commit) > 10:
                    if last != '':
                        diffs[last] = commit
                    last = commit
        else:
            break
    for a in diffs:
        b = diffs[a]
        data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
    self.add_html('
%s
' % data)
+
  @page('diff')
  def page_diff(self):
    if form.has_key('a') and form.has_key('b'):
        data = self.git([git_location,'diff',form['a'].value,form['b'].value])
    	data = re.sub(r'diff --git a/([A-Z]\w*) ', r'diff --git a/\1 ' % (self.debp), data)
        self.add_html(links(data.replace('\n','
'),self.debp))
+
  def add_links(self):
    page = self.page
    page_opt = self.page_opt
    debp = self.debp
+
    s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
    if page != 'Home':
        s = '| Home '+s
    linksopt = self.page_opt
    if self.page_opt == 'edit' or self.page_opt == 'blame' or self.page_opt == 'save' or self.page_opt == 'rename':
        linksopt = ''
    self.add_html(links(s,debp,linksopt))
+
  def run(self):
    self.set_debug()
    self.set_page(form)
+
    self.add_html(CONTENT_TYPE)
    self.add_html(START_HTML)
    self.add_html(TOOLTIP_INCLUDE)
+
    self.add_debug(':: user=%s'%user)
    self.add_debug( '$ cat %s' % git_config)
    if not os.path.exists(git_config):
        open(git_config).write("""[user]
        name = %s
        email = %s@theinternetneverlies.com""" % (user,user) )
    self.add_debug( open(git_config).read())
    self.add_debug( ':: page=%s, page_opt=%s
' % (self.page, self.page_opt))
+
    # an actual chdir
    self.add_debug( '$ cd %s' % (http_dir))
    os.chdir(http_dir)
+
    # git renew the directory. It should really just be git checkout and git
    # pull, forget the stashing
    self.git([git_location, 'stash'])
    self.git([git_location, 'pull', git_push_dir])
    self.git([git_location, 'stash','clear'])
+
    # Actions : no printing HTML gets done here
    if self.page_opt == 'save':
        self.save(form)
    elif self.page_opt == 'rename':
        self.rename(form)
+
    self.add_links()
+
    # Controller - basically, choose what to do and then execute and print html
    if PAGES.has_key(self.page):
        PAGES[self.page](self)
    elif ACTIONS.has_key( self.page_opt ):
        ACTIONS[self.page_opt](self)
    else:
        self.action_show()
+
    self.add_debug(END_DEBUG)
    self.add_html(self.debug_html)
    self.add_html(END_HTML)
    print self.html
+
#if __name__ == "__main__":
gw = GitWiki()
gw.run()
+

commit 9f649a3accd7ad5f410afc9eac5bcd1c5da97039
Author: Robert Frank 
Date:   8 months ago

    added config file

diff --git a/src/config.cfg b/src/config.cfg
new file mode 100644
index 0000000..662810c
--- /dev/null
+++ b/src/config.cfg
@@ -0,0 +1,8 @@
[gitwiki]
git_location=/usr/bin/git
base_dir=/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs
http_dir=%(base_dir)s/data/wigit
git_push_dir=/home/git/wigit/.git
git_dir=%(base_dir)s/data/wigit/.git
git_config=%(base_dir)s/%(user)s.gitconfig
+

commit 8c9ead8315bc1e95007fb3779132f2237ea56c33
Merge: 5734ac8... eb630ee...
Author: Robert Frank 
Date:   8 months ago

    Merge branch 'master' of bobfrank.org:/home/git/pygitwiki

commit 5734ac8ad456f950bc2dc90e0b76f9a50c563e2d
Author: Robert Frank 
Date:   8 months ago

    added some more changes

diff --git a/src/index.edit.py b/src/index.edit.py
index 615067f..5522122 100755
--- a/src/index.edit.py
+++ b/src/index.edit.py
@@ -1,3 +1,5 @@
#!/usr/bin/python
+
 import textile
 import cgi
 import subprocess
@@ -7,11 +9,30 @@ import base64
 import zlib
 import pickle
 import Cookie
import sys
import cgitb
import ConfigParser
 
cgitb.enable()
 form = cgi.FieldStorage()
 
print "Content-Type: text/html\n"
print """
# Configuration - these should be made into constants, later
USER = os.environ['REMOTE_USER']
QUERY_STRING = os.environ['QUERY_STRING']
user = USER
+
config = ConfigParser.ConfigParser()
config.read('config.cfg')
+
git_location = config.get('gitwiki','git_location',0)
http_dir     = config.get('gitwiki','http_dir',0)
git_push_dir = config.get('gitwiki', 'git_push_dir', 0)
git_dir      = config.get('gitwiki', 'git_dir', 0)
git_config   = config.get('gitwiki', 'git_config', 0, {'user': user})
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
+
CONTENT_TYPE = "Content-Type: text/html\r\n\r\n"
START_HTML = """
 
 
 
@@ -22,73 +43,99 @@ print """
 
 

 

 """
END_HTML = """




[source code]
"""
 
print ''
-
debug = False
debp = ''
if os.environ['QUERY_STRING'].find('debug') > 0:
    debug = True
    debp = '&debug'
    print '[debug mode on]
'
-
page = 'Home'
page_opt = 'blame'
if form.has_key("r"):
    page_parts = form["r"].value.split(':')
    page = page_parts[0]
    if len(page_parts) > 1:
        page_opt = page_parts[1]
        if page_opt.find('&debug') > 0:
            page_opt = page_opt.split('&')[0]
-
user = os.environ['REMOTE_USER']
git_dir = '/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit/.git'
git_config = '/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/%s.gitconfig' % user
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
 
if debug:
    print ':: user=%s'%user
    print '$ cat %s' % git_config
    print open(git_config).read()
    print ':: page=%s, page_opt=%s
' % (page, page_opt)
-
def git(run, debug=False):
    p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
    o,e = p.communicate()
    if debug:
        print '$ %s' % ' '.join(run)
        print o.replace('\n', '
'), e.replace('\n', '
'),
        print '
rcode=%d'%p.returncode
    return o
-
if debug:
    print '$ cd /var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit'
os.chdir("/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit")
-
git(['/usr/bin/git', 'stash'], debug)
git(['/usr/bin/git', 'pull','/home/git/wigit'], debug)
git(['/usr/bin/git', 'stash','clear'], debug)
-
if page_opt == 'save':
TOOLTIP_INCLUDE = ''
START_DEBUG = '[debug mode on]
'
END_DEBUG = '
'
+
# Generate links
def links(data,debp,mode=None):
    if not mode or mode == 'edit':
       mode = ''
    elif len(mode) > 1 and mode[0] != ':':
       mode = ':'+mode
    #           $text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % (mode,debp), data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % (mode,debp), data)
    return data
+
ACTIONS = {}
PAGES   = {}
+
def action(name):
   def fnrun(fn):
     ACTIONS[name] = fn
     return fn
   return fnrun
+
def page(name):
   def fnrun(fn):
     PAGES[name] = fn
     return fn
   return fnrun
+
class GitWiki:
  def __init__(self):
    self.debug = False
    self.debp = ''
    self.html = ''
    self.debug_html = ''
    self.page = 'Home'
    self.page_opt = 'blame'
+
  def set_debug(self):
    if QUERY_STRING.find('debug') > 0:
        self.debug = True
        self.debp = '&debug'
        self.add_debug(START_DEBUG)
+
  def set_page(self, form):
    if form.has_key("r"):
        if type(form['r'].value) == type([]):
            page_parts = form["r"].value[0].split(':')
        else:
            page_parts = form["r"].value.split(':')
        self.page = page_parts[0]
        if len(page_parts) > 1:
            self.page_opt = page_parts[1]
            if self.page_opt.find('&debug') > 0:
                self.page_opt = self.page_opt.split('&')[0]
+
  def add_html(self, data):
    self.html = '%s%s' % (self.html,data)
+
  def add_debug(self, data):
    if self.debug:
        self.debug_html += data
+
  def save(self, form):
    page = self.page
     if page.find('..') >= 0 or page.find('/') >= 0:
        print 'Invalid filename'
        self.add_html('Invalid filename')
     else:
         if form.has_key('data'):
            if debug:
                print 'saving %s, len(data) = %d' % (page,len(form['data'].value))
            self.add_debug('saving %s, len(data) = %d' % (page,len(form['data'].value)))
             fp = open('%s' % page, 'w')
             fp.write(form['data'].value)
             fp.close()
        elif debug:
            print 'no data found in form for save!'
        git(['/usr/bin/git', 'add', page], debug)
        git(['/usr/bin/git', 'commit','-a','-m','changed page %s via website' % page], debug)
        git(['/usr/bin/git', 'push', '/home/git/wigit/.git'], debug)
elif page_opt == 'rename':
        else:
            self.add_debug('no data found in form for save!')
        self.git([git_location, 'add', page])
        self.git([git_location, 'commit','-a','-m','changed page %s via website' % page])
        self.git([git_location, 'push', git_push_dir])
+
  def rename(self, form):
    page = self.page
     new_name = form['new_name'].value
     if new_name.find('..') >= 0 or new_name.find('/') >= 0:
        print 'Invalid filename'
        self.add_html('Invalid filename')
     else:
         for file in os.listdir('.'):
             if file.find('.') < 0:
@@ -100,59 +147,86 @@ elif page_opt == 'rename':
                     f=open(file,'w')
                     f.write(data)
                     f.close()
                    git(['/usr/bin/git', 'add', file], debug)
                    self.git([git_location, 'add', file])
                 if file == page:
                    git(['/usr/bin/git', 'mv', page, new_name], debug)
        git(['/usr/bin/git', 'commit','-a','-m','renaming %s to %s via website' % (page,new_name)], debug)
        git(['/usr/bin/git', 'push', '/home/git/wigit/.git'], debug)
                    self.git([git_location, 'mv', page, new_name])
        self.git([git_location, 'commit','-a','-m',
                  'renaming %s to %s via website' % (page,new_name)])
        self.git([git_location, 'push', git_push_dir])
 
if debug:
    print '
'
  def git(self, run, debug=False):
      p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
      o,e = p.communicate()
      self.add_debug( '$ %s' % ' '.join(run))
      self.add_debug( o.replace('\n', '
') + e.replace('\n', '
') )
      self.add_debug( '
rcode=%d' % p.returncode)
      return o
 
def links(data,mode=None):
    if not mode or mode == 'edit':
       mode = ''
    elif len(mode) > 1 and mode[0] != ':':
       mode = ':'+mode
    #		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % (mode,debp), data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % (mode,debp), data)
    return data
  @action('edit')
  def action_edit(self):
      page = self.page
      debp = self.debp
      data = ''
      try:
          fp = open('%s' % page)
          data = fp.read()
          fp.close()
      except:
          pass
      self.add_html('
' % (page,debp))
      self.add_html('Editing ' % page)
      self.add_html('' % (page,debp))
      self.add_html('        ')
      self.add_html('')

      self.add_html('
' % (page,debp))
      self.add_html('' % (page,debp))
      self.add_html('%s
' % data)
      self.add_html('')
      self.add_html('')

 
s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
if page != 'Home':
    s = '| Home '+s
linksopt = page_opt
if page_opt == 'edit' or page_opt == 'blame' or page_opt == 'save' or page_opt == 'rename':
    linksopt = ''
print links(s,linksopt)
-
if page_opt == 'edit':
    data = ''
    try:
        fp = open('%s' % page)
        data = fp.read()
        fp.close()
    except:
        data = ''
    print '
' % (page,debp)
    print 'Editing ' % page
    print '' % (page,debp)
    print '        '
    print ''

    print '
' % (page,debp)
    print '' % (page,debp)
    print '%s
' % data
    print ''
    print ''

elif page_opt == 'rename':
    new_name = form['new_name'].value
    print 'renaming from %s to %s
' % (page, new_name)
    page = new_name
    print 'finished renaming (including adjustments needed to other pages), please continue to %s' % (page,debp,page)
elif page == 'log':
    data = git(['/usr/bin/git','log'], debug)
  @action('blame')
  def action_blame(self):
      data = self.git([git_location,'blame','-c',self.page], self.debug)
      lines = data.split('\r\n')
      data = ''
      blamery = {}
      for i,line in enumerate(lines):
          tabs = line.split('\t')
          if len(tabs) >= 4:
              k = tabs[3].find(')')
              if len(tabs[3][k+1:]) == 0 or tabs[3][-1] == '|':
                  data = data + tabs[3][k+1:]+'\n'
              else:
                  tag = 'thisisanendoflineforline-%s-'%i
                  data = data + tabs[3][k+1:]+'%s\n'%tag
                  blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
      blob = textile.textile(data)
      for tag in blamery:
         k = blob.find(tag)
         if k >= 0:
             j = max(blob.rfind('li>',0,k),
                     blob.rfind('h2>',0,k),
                     blob.rfind('h3>',0,k),
                     blob.rfind('h1>',0,k),
                     blob.rfind('
',0,k))
             if j >= 0:
                 blob = blob.replace(blob[j+3:k+len(tag)],
"""%s""" %                                    (blamery[tag][1], blamery[tag][2], blamery[tag][0], blob[j+3:k]) )
      self.add_html(links(blob, self.debp))
+
  @action('view')
  def action_show(self):
      try:
          fp = open('%s' % self.page)
          data = fp.read()
          fp.close()
      except:
          data = 'File doesn\'t exist, create one here' % (self.page,self.debp)
      self.add_html(textile.textile(links(data,self.debp,'view')))
+
  @page('log')
  def page_log(self):
    data = self.git([git_location,'log'])
     k = -2
     last = ''
     diffs = {}
@@ -171,46 +245,76 @@ elif page == 'log':
     for a in diffs:
         b = diffs[a]
         data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
    print '
%s
' % data
elif page == 'diff':
    self.add_html('
%s
' % data)
+
  @page('diff')
  def page_diff(self):
     if form.has_key('a') and form.has_key('b'):
        data = git(['/usr/bin/git','diff',form['a'].value,form['b'].value], debug)
        print data.replace('\n','
')
elif page_opt == 'blame':
    data = git(['/usr/bin/git','blame','-c',page])
    lines = data.split('\r\n')
#    print '
'
    data = ''
    blamery = {}
    for i,line in enumerate(lines):
        tabs = line.split('\t')
        if len(tabs) >= 4:
#            print i+1,tabs
            k = tabs[3].find(')')
            if len(tabs[3][k+1:]) == 0 or tabs[3][-1] == '|':
                data = data + tabs[3][k+1:]+'\n'
            else:
                tag = ' /thisisanendoflineforline%s/ '%i
                data = data + tabs[3][k+1:]+'%s\n'%tag
                blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
#    print '
'
    blob = textile.textile(data)
    for tag in blamery:
       k = blob.find(tag)
       if k >= 0:
           j = max(blob.rfind('li>',0,k), blob.rfind('h2>',0,k), blob.rfind('h3>',0,k), blob.rfind('h1>',0,k), blob.rfind('
',0,k))
           if j >= 0:
               blob = blob.replace( blob[j+3:k+len(tag)], '%s' % (blamery[tag][1], blamery[tag][2], blamery[tag][0], blob[j+3:k]) )
    print links(blob)
else:
    try:
        fp = open('%s' % page)
        data = fp.read()
        fp.close()
    except:
        data = 'File doesn\'t exist, create one here' % (page,debp)
    print textile.textile(links(data,'view'))
print "
"
print "
"
print '

[source code]
'
        data = self.git([git_location,'diff',form['a'].value,form['b'].value])
        self.add_html(data.replace('\n','
'))
+
  def add_links(self):
    page = self.page
    page_opt = self.page_opt
    debp = self.debp
+
    s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
    if page != 'Home':
        s = '| Home '+s
    linksopt = self.page_opt
    if self.page_opt == 'edit' or self.page_opt == 'blame' or self.page_opt == 'save' or self.page_opt == 'rename':
        linksopt = ''
    self.add_html(links(s,debp,linksopt))
+
  def run(self):
    self.set_debug()
    self.set_page(form)
+
    self.add_html(CONTENT_TYPE)
    self.add_html(START_HTML)
    self.add_html(TOOLTIP_INCLUDE)
+
    self.add_debug(':: user=%s'%user)
    self.add_debug( '$ cat %s' % git_config)
    if not os.path.exists(git_config):
        open(git_config).write("""[user]
        name = %s
        email = %s@theinternetneverlies.com""" % (user,user) )
    self.add_debug( open(git_config).read())
    self.add_debug( ':: page=%s, page_opt=%s
' % (self.page, self.page_opt))
+
    # an actual chdir
    self.add_debug( '$ cd %s' % (http_dir))
    os.chdir(http_dir)
+
    # git renew the directory. It should really just be git checkout and git
    # pull, forget the stashing
    self.git([git_location, 'stash'])
    self.git([git_location, 'pull', git_push_dir])
    self.git([git_location, 'stash','clear'])
+
    # Actions : no printing HTML gets done here
    if self.page_opt == 'save':
        self.save(form)
    elif self.page_opt == 'rename':
        self.rename(form)
+
    self.add_links()
+
    # Controller - basically, choose what to do and then execute and print html
    if PAGES.has_key(self.page):
        PAGES[self.page](self)
    elif ACTIONS.has_key( self.page_opt ):
        ACTIONS[self.page_opt](self)
    else:
        self.action_show()
+
    self.add_debug(END_DEBUG)
    self.add_html(self.debug_html)
    self.add_html(END_HTML)
    print self.html
+
#if __name__ == "__main__":
gw = GitWiki()
gw.run()
 
diff --git a/src/source.py b/src/source.py
deleted file mode 100755
index 57bb9db..0000000
--- a/src/source.py
+++ /dev/null
@@ -1,310 +0,0 @@
#!/usr/bin/python
-
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
import sys
import cgitb
cgitb.enable()
-
form = cgi.FieldStorage()
-
# Configuration - these should be made into constants, later
USER = os.environ['REMOTE_USER']
QUERY_STRING = os.environ['QUERY_STRING']
user = USER
-
base_dir = '/var/repos/dontbiteme/'
http_dir = '/var/www/data/'
git_dir = '%s/.git' % (base_dir)
git_config = '%s/%s.gitconfig' % (base_dir, user)
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
-
-
CONTENT_TYPE = "Content-Type: text/html\n"
START_HTML = """







 

"""
END_HTML = """




[source code]

"""
-
-
TOOLTIP_INCLUDE = ''
START_DEBUG = '[debug mode on]
'
END_DEBUG = '
'
-
# Generate links
def links(data,debp,mode=None):
    if not mode or mode == 'edit':
       mode = ''
    elif len(mode) > 1 and mode[0] != ':':
       mode = ':'+mode
    #           $text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % (mode,debp), data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % (mode,debp), data)
    return data
-
-
class GitWiki():
  def __init__(self):
    self.debug = False
    self.debp = ''
    self.html = ''
    self.page = 'Home'
    self.page_opt = 'blame'
-
-
  def set_debug(self):
    if QUERY_STRING.find('debug') > 0:
        self.debug = True
        self.debp = '&debug'
        self.add_html(START_DEBUG)
-
  def set_page(self, form):
    if form.has_key("r"):
        page_parts = form["r"].value.split(':')
        page = page_parts[0]
        if len(page_parts) > 1:
            page_opt = page_parts[1]
            if page_opt.find('&debug') > 0:
                page_opt = page_opt.split('&')[0]
            self.page_opt = page_opt
        self.page = page
-
  def add_html(self, data):
    self.html += data
-
  def save(self, form):
    page = self.page
    if page.find('..') >= 0 or page.find('/') >= 0:
        self.add_html('Invalid filename')
    else:
        if form.has_key('data'):
            if self.debug:
                self.add_html('saving %s, len(data) = %d' % (page,len(form['data'].value)))
            fp = open('%s' % page, 'w')
            fp.write(form['data'].value)
            fp.close()
        elif self.debug:
            self.add_html('no data found in form for save!')
        self.git(['/usr/bin/git', 'add', page])
        self.git(['/usr/bin/git', 'commit','-a','-m','changed page %s via website' % page])
        self.git(['/usr/bin/git', 'push', git_dir])
-
  def rename(self, form):
    page = self.page
    new_name = form['new_name'].value
    if new_name.find('..') >= 0 or new_name.find('/') >= 0:
        self.add_html('Invalid filename')
    else:
        for file in os.listdir('.'):
            if file.find('.') < 0:
                f=open(file)
                data = f.read()
                f.close()
                if data.find('[%s]'%page) > 0:
                    data = data.replace('[%s]'%page,'[%s]'%new_name)
                    f=open(file,'w')
                    f.write(data)
                    f.close()
                    self.git(['/usr/bin/git', 'add', file])
                if file == page:
                    self.git(['/usr/bin/git', 'mv', page, new_name])
        self.git(['/usr/bin/git', 'commit','-a','-m',
                  'renaming %s to %s via website' % (page,new_name)])
        self.git(['/usr/bin/git', 'push', git_dir])
-
-
  def git(self, run, debug=False):
      p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
      o,e = p.communicate()
      if self.debug or debug:
          self.add_html( '$ %s' % ' '.join(run))
          self.add_html( o.replace('\n', '
'), e.replace('\n', '
'),)
          self.add_html( '
rcode=%d'%p.returncode)
      return o
-
  def action_edit(self):
      page = self.page
      debp = self.debp
      data = ''
      try:
          fp = open('%s' % page)
          data = fp.read()
          fp.close()
      except:
          data = ''
      self.add_html('
' % (page,debp))
      self.add_html('Editing ' % page)
      self.add_html('' % (page,debp))
      self.add_html('        ')
      self.add_html('')

      self.add_html('
' % (page,debp))
      self.add_html('%s
' % data)
      self.add_html('')
      self.add_html('')

-
  def action_rename(self):
      page = self.page
      new_name = form['new_name'].value
      self.add_html('renaming from %s to %s
' % (page, new_name))
      page = new_name
      self.add_html('finished renaming (including adjustments needed to other pages),' +
                  ' please continue to %s' % (page,debp,page))
-
  def action_blame(self):
      data = self.git(['/usr/bin/git','blame','-c',self.page], self.debug)
      lines = data.split('\r\n')
  #    print '
'
      data = ''
      blamery = {}
      for i,line in enumerate(lines):
          tabs = line.split('\t')
          if len(tabs) >= 4:
  #            print i+1,tabs
              k = tabs[3].find(')')
              if len(tabs[3][k+1:]) == 0:
                  data = data + tabs[3][k+1:]+'\n'
              else:
                  tag = 'thisisanendoflineforline-%s-'%i
                  data = data + tabs[3][k+1:]+'%s\n'%tag
                  blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
  #    print '
'
      blob = textile.textile(data)
      for tag in blamery:
         k = blob.find(tag)
         if k >= 0:
             j = max(blob.rfind('li>',0,k),
                     blob.rfind('h2>',0,k),
                     blob.rfind('h3>',0,k),
                     blob.rfind('h1>',0,k),
                     blob.rfind('
',0,k))
             if j >= 0:
                 blob = blob.replace(blob[j+3:k+len(tag)],"""
                                     
                                     onmouseover="Tip(\'User: %s
Date/Time:
                                     %s
Revision: %s\')"
                                     onmouseout="UnTip()">%s""" %
                                    (blamery[tag][1], blamery[tag][2], blamery[tag][0], blob[j+3:k]) )
      self.add_html(links(blob, self.debp))
-
  def action_show(self):
      try:
          fp = open('%s' % self.page)
          data = fp.read()
          fp.close()
      except:
          data = 'File doesn\'t exist, create one here' % (self.page,self.debp)
      self.add_html(textile.textile(links(data,self.debp,'view')))
-
-
  def add_links(self):
    page = self.page
    page_opt = self.page_opt
    debp = self.debp
-
    s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
    if page != 'Home':
        s = '| Home '+s
    linksopt = page_opt
    if page_opt == 'edit' or page_opt == 'blame' or page_opt == 'save' or page_opt == 'rename':
        linksopt = ''
    self.add_html(links(s,debp,linksopt))
-
def main():
    gw = GitWiki()
    gw.set_debug()
    gw.set_page(form)
-
    gw.add_html(CONTENT_TYPE)
    gw.add_html(START_HTML)
    gw.add_html(TOOLTIP_INCLUDE)
-
    if gw.debug:
        gw.add_html(':: user=%s'%user)
        gw.add_html( '$ cat %s' % git_config)
        gw.add_html( open(git_config).read())
        gw.add_html( ':: page=%s, page_opt=%s
' % (gw.page, gw.page_opt))
-
    if gw.debug:
        gw.add_html( '$ cd %s' % (http_dir))
-
-
    # an actual chdir
    os.chdir(http_dir)
-
    # git renew the directory. It should really just be git checkout and git
    # pull, forget the stashing
    gw.git(['/usr/bin/git', 'stash'])
    gw.git(['/usr/bin/git', 'pull', git_dir])
    gw.git(['/usr/bin/git', 'stash','clear'])
-
    # Actions : no printing HTML gets done here
    if gw.page_opt == 'save':
        gw.save(form)
    elif gw.page_opt == 'rename':
        gw.rename(form)
-
    if gw.debug:
        gw.add_html(END_DEBUG)
-
    gw.add_links()
-
    # Controller - basically, choose what to do and then execute and print html
    if gw.page_opt == 'edit':
        gw.action_edit()
    elif gw.page_opt == 'rename':
        gw.action_rename()
    elif gw.page == 'log':
        data = gw.git(['/usr/bin/git','log'])
        k = -2
        last = ''
        diffs = {}
        while True:
            k = data.find('commit', k+2)
            if k >= 0:
                j = data.find('\n',k)
                if j >= 0:
                    commit = data[k+7:j]
                    if len(commit) > 10:
                        if last != '':
                            diffs[last] = commit
                        last = commit
            else:
                break
        for a in diffs:
            b = diffs[a]
            data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
        gw.add_html('
%s
' % data)
    elif gw.page == 'diff':
        if form.has_key('a') and form.has_key('b'):
            data = gw.git(['/usr/bin/git','diff',form['a'].value,form['b'].value])
            gw.add_html(data.replace('\n','
'))
    elif gw.page_opt == 'blame':
        gw.action_blame()
    else:
        gw.action_show()
-
    gw.add_html(END_HTML)
    print gw.html
-
if __name__ == "__main__":
  main()

commit eb630ee4a670273144970f7087daee2cab4cfa06
Author: natan 
Date:   8 months ago

    Add initial setup notes to get it working.

diff --git a/README b/README
new file mode 100644
index 0000000..cb512ed
--- /dev/null
+++ b/README
@@ -0,0 +1,48 @@
# Installation Notes:
  # Apache Conf:
  Enable mod_rewrite
  Enable mod_cgi
  Enable mod_auth
+
  # site configuration:
  # Notice the AllowOverride All on the /var/www, that is so we can use
  # rewrite and auth config
      DocumentRoot /var/www
+
      
              Options Indexes FollowSymLinks MultiViews
              AllowOverride All
              Order allow,deny
              allow from all
      
+
      ScriptAlias /cgi-bin/ /usr/lib/cgi-bin/
      
              AllowOverride AuthConfig
              Options +ExecCGI -MultiViews +SymLinksIfOwnerMatch
              Order allow,deny
              Allow from all
      
+
  # .htaccess
      #
              RewriteEngine On
              RewriteBase /
              RewriteCond %{REMOTE_USER} ^([a-z0-9_]+)$
              RewriteCond %{REQUEST_FILENAME} !-f
              RewriteRule (.*) /cgi-bin/gitwiki.py?r=$1 [L]
      #
      AuthUserFile /var/.allowed_users
      AuthType Basic
      AuthName "dont bite me"
      Require valid-user
+
  # config.cfg
  [gitwiki]
  ; Location of per user config files.
  git_config: /var/www/data/%(user)s.gitconfig
  git_dir: /var/repos/repo_name/.git
  ; local checkout of git repo
  git_location: /var/www/data
  git_push_dir: /var/repos/repo_name
  http_dir: /var/www

commit 38c9e169514a755f02948c775ab1aebaf515600e
Author: natan 
Date:   8 months ago

    Add source.py for a bit.

diff --git a/src/source.py b/src/source.py
new file mode 100755
index 0000000..57bb9db
--- /dev/null
+++ b/src/source.py
@@ -0,0 +1,310 @@
#!/usr/bin/python
+
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
import sys
import cgitb
cgitb.enable()
+
form = cgi.FieldStorage()
+
# Configuration - these should be made into constants, later
USER = os.environ['REMOTE_USER']
QUERY_STRING = os.environ['QUERY_STRING']
user = USER
+
base_dir = '/var/repos/dontbiteme/'
http_dir = '/var/www/data/'
git_dir = '%s/.git' % (base_dir)
git_config = '%s/%s.gitconfig' % (base_dir, user)
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
+
+
CONTENT_TYPE = "Content-Type: text/html\n"
START_HTML = """







 

"""
END_HTML = """




[source code]
"""
+
+
TOOLTIP_INCLUDE = ''
START_DEBUG = '[debug mode on]
'
END_DEBUG = '
'
+
# Generate links
def links(data,debp,mode=None):
    if not mode or mode == 'edit':
       mode = ''
    elif len(mode) > 1 and mode[0] != ':':
       mode = ':'+mode
    #           $text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % (mode,debp), data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % (mode,debp), data)
    return data
+
+
class GitWiki():
  def __init__(self):
    self.debug = False
    self.debp = ''
    self.html = ''
    self.page = 'Home'
    self.page_opt = 'blame'
+
+
  def set_debug(self):
    if QUERY_STRING.find('debug') > 0:
        self.debug = True
        self.debp = '&debug'
        self.add_html(START_DEBUG)
+
  def set_page(self, form):
    if form.has_key("r"):
        page_parts = form["r"].value.split(':')
        page = page_parts[0]
        if len(page_parts) > 1:
            page_opt = page_parts[1]
            if page_opt.find('&debug') > 0:
                page_opt = page_opt.split('&')[0]
            self.page_opt = page_opt
        self.page = page
+
  def add_html(self, data):
    self.html += data
+
  def save(self, form):
    page = self.page
    if page.find('..') >= 0 or page.find('/') >= 0:
        self.add_html('Invalid filename')
    else:
        if form.has_key('data'):
            if self.debug:
                self.add_html('saving %s, len(data) = %d' % (page,len(form['data'].value)))
            fp = open('%s' % page, 'w')
            fp.write(form['data'].value)
            fp.close()
        elif self.debug:
            self.add_html('no data found in form for save!')
        self.git(['/usr/bin/git', 'add', page])
        self.git(['/usr/bin/git', 'commit','-a','-m','changed page %s via website' % page])
        self.git(['/usr/bin/git', 'push', git_dir])
+
  def rename(self, form):
    page = self.page
    new_name = form['new_name'].value
    if new_name.find('..') >= 0 or new_name.find('/') >= 0:
        self.add_html('Invalid filename')
    else:
        for file in os.listdir('.'):
            if file.find('.') < 0:
                f=open(file)
                data = f.read()
                f.close()
                if data.find('[%s]'%page) > 0:
                    data = data.replace('[%s]'%page,'[%s]'%new_name)
                    f=open(file,'w')
                    f.write(data)
                    f.close()
                    self.git(['/usr/bin/git', 'add', file])
                if file == page:
                    self.git(['/usr/bin/git', 'mv', page, new_name])
        self.git(['/usr/bin/git', 'commit','-a','-m',
                  'renaming %s to %s via website' % (page,new_name)])
        self.git(['/usr/bin/git', 'push', git_dir])
+
+
  def git(self, run, debug=False):
      p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
      o,e = p.communicate()
      if self.debug or debug:
          self.add_html( '$ %s' % ' '.join(run))
          self.add_html( o.replace('\n', '
'), e.replace('\n', '
'),)
          self.add_html( '
rcode=%d'%p.returncode)
      return o
+
  def action_edit(self):
      page = self.page
      debp = self.debp
      data = ''
      try:
          fp = open('%s' % page)
          data = fp.read()
          fp.close()
      except:
          data = ''
      self.add_html('
' % (page,debp))
      self.add_html('Editing ' % page)
      self.add_html('' % (page,debp))
      self.add_html('        ')
      self.add_html('')

      self.add_html('
' % (page,debp))
      self.add_html('%s
' % data)
      self.add_html('')
      self.add_html('')

+
  def action_rename(self):
      page = self.page
      new_name = form['new_name'].value
      self.add_html('renaming from %s to %s
' % (page, new_name))
      page = new_name
      self.add_html('finished renaming (including adjustments needed to other pages),' +
                  ' please continue to %s' % (page,debp,page))
+
  def action_blame(self):
      data = self.git(['/usr/bin/git','blame','-c',self.page], self.debug)
      lines = data.split('\r\n')
  #    print '
'
      data = ''
      blamery = {}
      for i,line in enumerate(lines):
          tabs = line.split('\t')
          if len(tabs) >= 4:
  #            print i+1,tabs
              k = tabs[3].find(')')
              if len(tabs[3][k+1:]) == 0:
                  data = data + tabs[3][k+1:]+'\n'
              else:
                  tag = 'thisisanendoflineforline-%s-'%i
                  data = data + tabs[3][k+1:]+'%s\n'%tag
                  blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
  #    print '
'
      blob = textile.textile(data)
      for tag in blamery:
         k = blob.find(tag)
         if k >= 0:
             j = max(blob.rfind('li>',0,k),
                     blob.rfind('h2>',0,k),
                     blob.rfind('h3>',0,k),
                     blob.rfind('h1>',0,k),
                     blob.rfind('
',0,k))
             if j >= 0:
                 blob = blob.replace(blob[j+3:k+len(tag)],"""
                                     
                                     onmouseover="Tip(\'User: %s
Date/Time:
                                     %s
Revision: %s\')"
                                     onmouseout="UnTip()">%s""" %
                                    (blamery[tag][1], blamery[tag][2], blamery[tag][0], blob[j+3:k]) )
      self.add_html(links(blob, self.debp))
+
  def action_show(self):
      try:
          fp = open('%s' % self.page)
          data = fp.read()
          fp.close()
      except:
          data = 'File doesn\'t exist, create one here' % (self.page,self.debp)
      self.add_html(textile.textile(links(data,self.debp,'view')))
+
+
  def add_links(self):
    page = self.page
    page_opt = self.page_opt
    debp = self.debp
+
    s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
    if page != 'Home':
        s = '| Home '+s
    linksopt = page_opt
    if page_opt == 'edit' or page_opt == 'blame' or page_opt == 'save' or page_opt == 'rename':
        linksopt = ''
    self.add_html(links(s,debp,linksopt))
+
def main():
    gw = GitWiki()
    gw.set_debug()
    gw.set_page(form)
+
    gw.add_html(CONTENT_TYPE)
    gw.add_html(START_HTML)
    gw.add_html(TOOLTIP_INCLUDE)
+
    if gw.debug:
        gw.add_html(':: user=%s'%user)
        gw.add_html( '$ cat %s' % git_config)
        gw.add_html( open(git_config).read())
        gw.add_html( ':: page=%s, page_opt=%s
' % (gw.page, gw.page_opt))
+
    if gw.debug:
        gw.add_html( '$ cd %s' % (http_dir))
+
+
    # an actual chdir
    os.chdir(http_dir)
+
    # git renew the directory. It should really just be git checkout and git
    # pull, forget the stashing
    gw.git(['/usr/bin/git', 'stash'])
    gw.git(['/usr/bin/git', 'pull', git_dir])
    gw.git(['/usr/bin/git', 'stash','clear'])
+
    # Actions : no printing HTML gets done here
    if gw.page_opt == 'save':
        gw.save(form)
    elif gw.page_opt == 'rename':
        gw.rename(form)
+
    if gw.debug:
        gw.add_html(END_DEBUG)
+
    gw.add_links()
+
    # Controller - basically, choose what to do and then execute and print html
    if gw.page_opt == 'edit':
        gw.action_edit()
    elif gw.page_opt == 'rename':
        gw.action_rename()
    elif gw.page == 'log':
        data = gw.git(['/usr/bin/git','log'])
        k = -2
        last = ''
        diffs = {}
        while True:
            k = data.find('commit', k+2)
            if k >= 0:
                j = data.find('\n',k)
                if j >= 0:
                    commit = data[k+7:j]
                    if len(commit) > 10:
                        if last != '':
                            diffs[last] = commit
                        last = commit
            else:
                break
        for a in diffs:
            b = diffs[a]
            data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
        gw.add_html('
%s
' % data)
    elif gw.page == 'diff':
        if form.has_key('a') and form.has_key('b'):
            data = gw.git(['/usr/bin/git','diff',form['a'].value,form['b'].value])
            gw.add_html(data.replace('\n','
'))
    elif gw.page_opt == 'blame':
        gw.action_blame()
    else:
        gw.action_show()
+
    gw.add_html(END_HTML)
    print gw.html
+
if __name__ == "__main__":
  main()

commit 470178cf68b9654fa134a26c9c97c40cdc3c240b
Author: Robert Frank 
Date:   8 months ago

    added blame view, etc.

diff --git a/src/index.edit.py b/src/index.edit.py
index 9c99cdb..615067f 100755
--- a/src/index.edit.py
+++ b/src/index.edit.py
@@ -11,8 +11,19 @@ import Cookie
 form = cgi.FieldStorage()
 
 print "Content-Type: text/html\n"
print """







 

"""
 
print ''
print ''
 
 debug = False
 debp = ''
@@ -22,7 +33,7 @@ if os.environ['QUERY_STRING'].find('debug') > 0:
     print '[debug mode on]
'
 
 page = 'Home'
page_opt = 'view'
page_opt = 'blame'
 if form.has_key("r"):
     page_parts = form["r"].value.split(':')
     page = page_parts[0]
@@ -44,11 +55,12 @@ if debug:
 
 def git(run, debug=False):
     p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
    o,e = p.communicate()
     if debug:
         print '$ %s' % ' '.join(run)
        o,e = p.communicate()
         print o.replace('\n', '
'), e.replace('\n', '
'),
         print '
rcode=%d'%p.returncode
    return o
 
 if debug:
     print '$ cd /var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit'
@@ -97,6 +109,25 @@ elif page_opt == 'rename':
 if debug:
     print '
'
 
def links(data,mode=None):
    if not mode or mode == 'edit':
       mode = ''
    elif len(mode) > 1 and mode[0] != ':':
       mode = ':'+mode
    #		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % (mode,debp), data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % (mode,debp), data)
    return data
+
s ='| [%s]  | log | edit |

\n' % (page,page,debp,page,debp)
if page != 'Home':
    s = '| Home '+s
linksopt = page_opt
if page_opt == 'edit' or page_opt == 'blame' or page_opt == 'save' or page_opt == 'rename':
    linksopt = ''
print links(s,linksopt)
+
 if page_opt == 'edit':
     data = ''
     try:
@@ -120,6 +151,57 @@ elif page_opt == 'rename':
     print 'renaming from %s to %s
' % (page, new_name)
     page = new_name
     print 'finished renaming (including adjustments needed to other pages), please continue to %s' % (page,debp,page)
elif page == 'log':
    data = git(['/usr/bin/git','log'], debug)
    k = -2
    last = ''
    diffs = {}
    while True:
        k = data.find('commit', k+2)
        if k >= 0:
            j = data.find('\n',k)
            if j >= 0:
                commit = data[k+7:j]
                if len(commit) > 10:
                    if last != '':
                        diffs[last] = commit
                    last = commit
        else:
            break
    for a in diffs:
        b = diffs[a]
        data = data.replace(a, '%s'%(a.upper(),b.upper(),a.upper()))
    print '
%s
' % data
elif page == 'diff':
    if form.has_key('a') and form.has_key('b'):
        data = git(['/usr/bin/git','diff',form['a'].value,form['b'].value], debug)
        print data.replace('\n','
')
elif page_opt == 'blame':
    data = git(['/usr/bin/git','blame','-c',page])
    lines = data.split('\r\n')
#    print '
'
    data = ''
    blamery = {}
    for i,line in enumerate(lines):
        tabs = line.split('\t')
        if len(tabs) >= 4:
#            print i+1,tabs
            k = tabs[3].find(')')
            if len(tabs[3][k+1:]) == 0 or tabs[3][-1] == '|':
                data = data + tabs[3][k+1:]+'\n'
            else:
                tag = ' /thisisanendoflineforline%s/ '%i
                data = data + tabs[3][k+1:]+'%s\n'%tag
                blamery[tag] = [tabs[0], tabs[1][1:].strip(), tabs[2]]
#    print '
'
    blob = textile.textile(data)
    for tag in blamery:
       k = blob.find(tag)
       if k >= 0:
           j = max(blob.rfind('li>',0,k), blob.rfind('h2>',0,k), blob.rfind('h3>',0,k), blob.rfind('h1>',0,k), blob.rfind('
',0,k))
           if j >= 0:
               blob = blob.replace( blob[j+3:k+len(tag)], '%s' % (blamery[tag][1], blamery[tag][2], blamery[tag][0], blob[j+3:k]) )
    print links(blob)
 else:
     try:
         fp = open('%s' % page)
@@ -127,15 +209,8 @@ else:
         fp.close()
     except:
         data = 'File doesn\'t exist, create one here' % (page,debp)
    #		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    if page != 'Home':
        data = '| Home | [%s] | edit |\n\n'%(page,page,debp)+data
    else:
        data = '| [%s] | edit | \n\n' % (page,page,debp) + data
 
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % debp, data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % debp, data)
    print textile.textile(links(data,'view'))
print "
"
print "
"
print '

[source code]
'
 
    print textile.textile(data)
print '

[source code]'

commit e3d7bce22151ee047b6d5c43cd72a026c2bbb634
Author: Robert Frank 
Date:   8 months ago

    added link to git.bobfrank.org

diff --git a/Home b/Home
index afd6dbb..110626f 100644
--- a/Home
+++ b/Home
@@ -1 +1,6 @@
PyGitWiki is currently being developed, and will be posted in git.bobfrank.org sometime before february 2010 
h1. PyGitWiki
+
+
PyGitWiki is a simple wiki based on the textile python module, and uses git to control history revisions

Currently the source is located at git.bobfrank.org
+

commit 5b37f28713fb1e7750c01c683f3c66ea19087a7d
Author: Robert Frank 
Date:   8 months ago

    adding source

diff --git a/src/index.edit.py b/src/index.edit.py
new file mode 100755
index 0000000..9c99cdb
--- /dev/null
+++ b/src/index.edit.py
@@ -0,0 +1,141 @@
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
+
form = cgi.FieldStorage()
+
print "Content-Type: text/html\n"
+
print ''
+
debug = False
debp = ''
if os.environ['QUERY_STRING'].find('debug') > 0:
    debug = True
    debp = '&debug'
    print '[debug mode on]
'
+
page = 'Home'
page_opt = 'view'
if form.has_key("r"):
    page_parts = form["r"].value.split(':')
    page = page_parts[0]
    if len(page_parts) > 1:
        page_opt = page_parts[1]
        if page_opt.find('&debug') > 0:
            page_opt = page_opt.split('&')[0]
+
user = os.environ['REMOTE_USER']
git_dir = '/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit/.git'
git_config = '/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/%s.gitconfig' % user
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
+
if debug:
    print ':: user=%s'%user
    print '$ cat %s' % git_config
    print open(git_config).read()
    print ':: page=%s, page_opt=%s
' % (page, page_opt)
+
def git(run, debug=False):
    p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
    if debug:
        print '$ %s' % ' '.join(run)
        o,e = p.communicate()
        print o.replace('\n', '
'), e.replace('\n', '
'),
        print '
rcode=%d'%p.returncode
+
if debug:
    print '$ cd /var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit'
os.chdir("/var/www/vhosts/theinternetneverlies.com/subdomains/but/httpdocs/data/wigit")
+
git(['/usr/bin/git', 'stash'], debug)
git(['/usr/bin/git', 'pull','/home/git/wigit'], debug)
git(['/usr/bin/git', 'stash','clear'], debug)
+
if page_opt == 'save':
    if page.find('..') >= 0 or page.find('/') >= 0:
        print 'Invalid filename'
    else:
        if form.has_key('data'):
            if debug:
                print 'saving %s, len(data) = %d' % (page,len(form['data'].value))
            fp = open('%s' % page, 'w')
            fp.write(form['data'].value)
            fp.close()
        elif debug:
            print 'no data found in form for save!'
        git(['/usr/bin/git', 'add', page], debug)
        git(['/usr/bin/git', 'commit','-a','-m','changed page %s via website' % page], debug)
        git(['/usr/bin/git', 'push', '/home/git/wigit/.git'], debug)
elif page_opt == 'rename':
    new_name = form['new_name'].value
    if new_name.find('..') >= 0 or new_name.find('/') >= 0:
        print 'Invalid filename'
    else:
        for file in os.listdir('.'):
            if file.find('.') < 0:
                f=open(file)
                data = f.read()
                f.close()
                if data.find('[%s]'%page) > 0:
                    data = data.replace('[%s]'%page,'[%s]'%new_name)
                    f=open(file,'w')
                    f.write(data)
                    f.close()
                    git(['/usr/bin/git', 'add', file], debug)
                if file == page:
                    git(['/usr/bin/git', 'mv', page, new_name], debug)
        git(['/usr/bin/git', 'commit','-a','-m','renaming %s to %s via website' % (page,new_name)], debug)
        git(['/usr/bin/git', 'push', '/home/git/wigit/.git'], debug)
+
if debug:
    print '
'
+
if page_opt == 'edit':
    data = ''
    try:
        fp = open('%s' % page)
        data = fp.read()
        fp.close()
    except:
        data = ''
    print '
' % (page,debp)
    print 'Editing ' % page
    print '' % (page,debp)
    print '        '
    print ''

    print '
' % (page,debp)
    print '' % (page,debp)
    print '%s
' % data
    print ''
    print ''

elif page_opt == 'rename':
    new_name = form['new_name'].value
    print 'renaming from %s to %s
' % (page, new_name)
    page = new_name
    print 'finished renaming (including adjustments needed to other pages), please continue to %s' % (page,debp,page)
else:
    try:
        fp = open('%s' % page)
        data = fp.read()
        fp.close()
    except:
        data = 'File doesn\'t exist, create one here' % (page,debp)
    #		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
    if page != 'Home':
        data = '| Home | [%s] | edit |\n\n'%(page,page,debp)+data
    else:
        data = '| [%s] | edit | \n\n' % (page,page,debp) + data
 
    #data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
    data = re.sub(r'\[([A-Z]\w+)\]', r'\1' % debp, data)
    data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2' % debp, data)
+
    print textile.textile(data)
print '

[source code]'
diff --git a/src/index.view.py b/src/index.view.py
new file mode 100755
index 0000000..7281cfd
--- /dev/null
+++ b/src/index.view.py
@@ -0,0 +1,57 @@
import textile
import cgi
import subprocess
import re
import os
import base64
import zlib
import pickle
import Cookie
+
form = cgi.FieldStorage()
+
view_only = True
print "Content-Type: text/html\n"
+
print ''
+
page = 'Home'
page_opt = 'view'
if form.has_key("r"):
    page_parts = form["r"].value.split(':')
    page = page_parts[0]
    if len(page_parts) > 1:
        page_opt = page_parts[1]
+
git_dir = '/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/httpdocs/data/.git'
git_config = '/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/gitconfig'
myenv = {'GIT_DIR': git_dir, 'GIT_CONFIG': git_config}
+
def git(run):
    p = subprocess.Popen(run, stdout=subprocess.PIPE, stderr=subprocess.PIPE, env=myenv)
+
os.chdir("/var/www/vhosts/bobfrank.org/subdomains/pygitwiki/httpdocs/data")
+
git(['/usr/bin/git', 'init'])
git(['/usr/bin/git', 'stash'])
git(['/usr/bin/git', 'pull','/home/git/pygitwiki.git'])
git(['/usr/bin/git', 'stash','clear'])
+
try:
    fp = open('%s' % page)
    data = fp.read()
    fp.close()
except:
    data = 'File doesn\'t exist, create one here' % (page)
#		$text = preg_replace('@([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)@', '$1$2', $text);
if page != 'Home':
    data = '| Home | [%s] | \n\n'%(page)+data
else:
    data = '| [%s] | \n\n' % (page) + data
+
#data = re.sub(r'([^:])(https?://([-\w\.]+)+(:\d+)?(/([%-\w/_\.]*(\?\S+)?)?)?)', r'\1\2', data)
data = re.sub(r'\[([A-Z]\w+)\]', r'\1', data)
data = re.sub(r'\[([A-Z]\w+)\|([\w\s]+)\]', r'\2', data)
+
print textile.textile(data)
print ''

commit ad5f39cb2b45f048154858002af9c63f39e8f763
Author: root 
Date:   8 months ago

    added home

diff --git a/Home b/Home
new file mode 100644
index 0000000..afd6dbb
--- /dev/null
+++ b/Home
@@ -0,0 +1 @@
PyGitWiki is currently being developed, and will be posted in git.bobfrank.org sometime before february 2010 










[source code]