http://www.mediawiki.org/wiki/Special:Code/MediaWiki/100043
Revision: 100043
Author: ariel
Date: 2011-10-17 15:59:10 +0000 (Mon, 17 Oct 2011)
Log Message:
-----------
remove stray raise; use relative web paths in generated html
Modified Paths:
--------------
branches/ariel/xmldumps-backup/WikiDump.py
branches/ariel/xmldumps-backup/worker.py
Modified: branches/ariel/xmldumps-backup/WikiDump.py
===================================================================
--- branches/ariel/xmldumps-backup/WikiDump.py 2011-10-17 15:57:47 UTC (rev
100042)
+++ branches/ariel/xmldumps-backup/WikiDump.py 2011-10-17 15:59:10 UTC (rev
100043)
@@ -95,7 +95,6 @@
size = os.path.getsize(path)
return (timestamp, size)
except:
- raise
return(None, None)
fileAge = staticmethod(fileAge)
@@ -429,6 +428,16 @@
def webDir(self):
return "/".join((self.config.webRoot, self.dbName))
+
+ def webDirRelative(self):
+ webRootRelative = self.webDir()
+ i = webRootRelative.find("://")
+ if i >= 0:
+ webRootRelative = webRootRelative[i:]
+ i = webRootRelative.find("/")
+ if i >= 0:
+ webRootRelative = webRootRelative[i:]
+ return webRootRelative
# Actions!
Modified: branches/ariel/xmldumps-backup/worker.py
===================================================================
--- branches/ariel/xmldumps-backup/worker.py 2011-10-17 15:57:47 UTC (rev
100042)
+++ branches/ariel/xmldumps-backup/worker.py 2011-10-17 15:59:10 UTC (rev
100043)
@@ -897,6 +897,14 @@
dateString = self._wiki.date
return os.path.join(self._wiki.webDir(), dateString,
dumpFile.filename)
+
+ def webPathRelative(self, dumpFile, dateString = None):
+ """Given a DumpFilename object produce the url relative to the
docroot for the filename for the date of
+ the dump for the selected database."""
+ if (not dateString):
+ dateString = self._wiki.date
+ return os.path.join(self._wiki.webDirRelative(), dateString,
dumpFile.filename)
+
def dirCacheOutdated(self, date):
if not date:
date = self._wiki.date
@@ -1375,8 +1383,8 @@
if itemStatus == "in-progress":
return "<li class='file'>%s %s (written) </li>" %
(fileObj.filename, size)
elif itemStatus == "done":
- webpath = self.dumpDir.webPath(fileObj)
- return "<li class='file'><a href=\"%s\">%s</a> %s</li>"
% (webpath, fileObj.filename, size)
+ webpathRelative = self.dumpDir.webPathRelative(fileObj)
+ return "<li class='file'><a href=\"%s\">%s</a> %s</li>"
% (webpathRelative, fileObj.filename, size)
else:
return "<li class='missing'>%s</li>" % fileObj.filename
@@ -1423,7 +1431,7 @@
"status": self._reportStatusSummaryLine(done),
"previous": self._reportPreviousDump(done),
"items": html,
- "checksum": self.dumpDir.webPath(f),
+ "checksum": self.dumpDir.webPathRelative(f),
"index": self.wiki.config.index}
def _reportPreviousDump(self, done):
_______________________________________________
MediaWiki-CVS mailing list
MediaWiki-CVS@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
