Changeset 30

Timestamp:

02/24/07 08:47:18 (5 years ago)

Author:

christian

Message:

Created a eclipse test environment, containing a trac env as well. Username for that is "admin" with password "admin". Please note that the python run path is hardcoded since pydev doesn't allow variable expansion yet.

Location:

sitemap-plugin/trunk

Files:

• .project (modified) (1 prop)
• .pydevproject (modified) (1 diff, 1 prop)
• .settings (added)
• .settings/org.eclipse.core.resources.prefs (added)
• .settings/org.eclipse.ltk.core.refactoring.prefs (added)
• .settings/org.eclipse.wst.sse.core.prefs (added)
• .settings/org.eclipse.wst.validation.prefs (added)
• env (added)
• env/README (added)
• env/VERSION (added)
• env/attachments (added)
• env/conf (added)
• env/conf/trac.ini (added)
• env/conf/trac.ini.sample (added)
• env/db (added)
• env/db/trac.db (added)
• env/htdocs (added)
• env/log (added)
• env/passwd.txt (added)
• env/plugins (added)
• env/plugins/sitemap.egg-link (added)
• env/templates (added)
• env/templates/README (added)
• env/templates/site_css.cs (added)
• env/templates/site_footer.cs (added)
• env/templates/site_header.cs (added)
• env/templates/site_newticket.cs (added)
• env/wiki-macros (added)
• src/setup.py (modified) (1 diff)
• src/sitemap/__init__.py (modified) (1 diff)
• src/sitemap/admin_ui.py (modified) (2 diffs)
• src/sitemap/api.py (modified) (4 diffs)
• src/sitemap/templates/sitemap_admin.cs (modified) (1 diff)
• src/sitemap/ticket.py (added)
• src/sitemap/wiki.py (modified) (3 diffs)
• src/tracd.py (added)

sitemap-plugin/trunk/.pydevproject

@@ -7 +7 @@
 <path>/Sitemap-Plugin/src</path>
 </pydev_pathproperty>
+<pydev_pathproperty name="org.python.pydev.PROJECT_EXTERNAL_SOURCE_PATH">
+<path/>
+</pydev_pathproperty>
 </pydev_project>

sitemap-plugin/trunk/src/setup.py

@@ -1 +1 @@
 #!/usr/bin/env python
 
-from setuptools import setup
+from setuptools import setup #@UnresolvedImport
 
 PACKAGE = 'sitemap'

sitemap-plugin/trunk/src/sitemap/__init__.py

@@ -1 +1 @@
 import api
 import wiki
+import ticket
 try:
     from admin_ui import *

sitemap-plugin/trunk/src/sitemap/admin_ui.py

@@ -1 +1 @@
 from pkg_resources import resource_filename #@UnresolvedImport
-from webadmin.web_ui import IAdminPageProvider
+from webadmin.web_ui import IAdminPageProvider #@UnresolvedImport
 from trac.web.chrome import ITemplateProvider
 from trac.core import implements
@@ -32 +32 @@
 
         if req.method == 'POST':
-            if page == 'sitemap':
-                if 'save' in req.args:
-                    for contributor in c.contributors:
-                        name, title = contributor.get_name() #@UnusedVariable
-                        contributor.set_configuration(
-                                                      self._get_field(req, name + '_priority', contributor.priority),
-                                                      self._get_field(req, name + '_frequency', contributor.frequency)
-                                                      )
-
+            if page == 'sitemap_admin':
+                if ('save' in req.args) | ('saveping' in req.args):
+                   self.env.log.debug('Saving new values')
+                   self.env.config.set('sitemap', 'confirmationpage', req.args['confirmationpage'])
+                   self.env.config.set('sitemap', 'base_url', req.args['base_url'])
+                   for contributor in c.contributors:
+                        contributor.set_configuration(req)
+                   self.env.config.save()
+                if 'saveping' in req.args:
+                   c.send_ping()
+                   
+        req.hdf['sitemap.confirmationpage'] = c.confirmationpage
+        req.hdf['sitemap.base_url'] = c.base_url
+        req.hdf['sitemap.base_url_trac'] = self.env.base_url
         req.hdf['sitemap.data'] = c.get_descriptions()
-        req.hdf['sitemap.url'] = c.path
+        req.hdf['sitemap.path'] = c.path
         req.hdf['sitemap.priorities'] = self.priorities
         req.hdf['sitemap.frequencies'] = self.frequencies

sitemap-plugin/trunk/src/sitemap/api.py

@@ -5 +5 @@
 from xml.sax.saxutils import escape
 from trac.web.api import IRequestHandler
+from trac.web.href import Href
 from trac.config import Option
 from trac.core import implements
@@ -61 +62 @@
         """
         
-    def set_configuration(self, priority, frequency):
+    def set_configuration(self, req):
         """Update config to new values"""
     
@@ -77 +78 @@
 
     contributors = ExtensionPoint(ISitemapContributor)
+    
+    base_url = Option('sitemap', 'base_url', '',
+       """Base URL (protocol, host, port) of your trac installation, as Google should use it""")
     
     confirmationpage = Option('sitemap', 'confirmationpage', '',
@@ -150 +154 @@
     def send_ping(self):
         """Ping Google sitemaps to indicate that an updated sitemap is available"""
+        href = Href(self.env.abs_href)
         url = 'http://www.google.com/webmasters/sitemaps/ping?' + \
-              urlencode({'sitemap' : self.env.abs_href(self.path)})
+              urlencode({'sitemap' : href})
+        self.env.log.info('Sending ping to Google: %s ' % url)
         urllib2.urlopen(url)
-        self.env.log.info('Sent ping to google: %s ' % url)
-        
+         

sitemap-plugin/trunk/src/sitemap/templates/sitemap_admin.cs

@@ -1 +1 @@
 <form class="mod" method="post">
 <h2>Google Sitemap&trade; settings</h2>
-<p>What ressources should be included in your sitemap located at <strong><?cs var:sitemap.url ?></strong>?</p>
+  <div class="field">
+   <label>Google page name:<br />
+    <input size="30" type="text" name="confirmationpage" value="<?cs var:sitemap.confirmationpage ?>" /> e.g. <em>googleeb3689b3689b3689.html</em>
+   </label>
+  </div>
+  <div class="field">
+   <label>Base url:<br />
+    <input size="60" type="text" name="base_url" value="<?cs var:sitemap.base_url ?>" style="width:100%" />
+   </label>
+  </div>
+<p>What ressources should be included in your sitemap located at <strong><?cs var:sitemap.path ?></strong>?</p>
 <table class="listing" id="sitemaplist" style="width:100%;margin-bottom:2em;">
         <colgroup>

sitemap-plugin/trunk/src/sitemap/wiki.py

@@ -45 +45 @@
         }
         
-    def set_configuration(self, priority, frequency):
+    def set_configuration(self, req):
         """Update config to new values"""
         
@@ -54 +54 @@
         wiki = WikiSystem(self.env)
         d = []
-        href = Href(req.base_url)
+        href = Href(self.env.base_url)
         for pagename in wiki.get_pages():
             page = WikiPage(self.env, pagename)
@@ -64 +64 @@
             entry_time = datetime.datetime.utcfromtimestamp(post_time)
             d.append(RessourceData(
-                                  href(req.href.wiki(pagename)),
+                                  href.wiki(pagename),
                                   entry_time.strftime("%Y-%m-%dT%H:%M:%SZ"),
                                   self.frequency,