Only need markdown and not GFM for .md files

This commit is contained in:
Kevin 2013-04-16 20:30:25 -07:00
parent d59e2e2816
commit f767b939ad
2 changed files with 4 additions and 4 deletions

View File

@ -70,7 +70,7 @@ def loaderRaw(var):
fn = var.group(1) fn = var.group(1)
return readfile(fn) return readfile(fn)
def loaderGFM(var): def loaderMD(var):
fn = var.group(1) fn = var.group(1)
db = shelve.open('build/GFM.dat') db = shelve.open('build/GFM.dat')
if db.has_key('files'): if db.has_key('files'):
@ -85,7 +85,7 @@ def loaderGFM(var):
return files[fn][filemd5] return files[fn][filemd5]
else: else:
url = 'https://api.github.com/markdown' url = 'https://api.github.com/markdown'
payload = {'text': file, 'mode': 'gfm', 'context': 'jonatkins/ingress-intel-total-conversion'} payload = {'text': file, 'mode': 'markdown'}
req = urllib2.Request(url) req = urllib2.Request(url)
req.add_header('Content-Type', 'application/json') req.add_header('Content-Type', 'application/json')
gfm = urllib2.urlopen(req, json.dumps(payload)).read().replace('\n', '').replace('\'', '\\\'') gfm = urllib2.urlopen(req, json.dumps(payload)).read().replace('\n', '').replace('\'', '\\\'')
@ -115,7 +115,7 @@ def doReplacements(script,updateUrl,downloadUrl):
script = re.sub('@@INCLUDERAW:([0-9a-zA-Z_./-]+)@@', loaderRaw, script) script = re.sub('@@INCLUDERAW:([0-9a-zA-Z_./-]+)@@', loaderRaw, script)
script = re.sub('@@INCLUDESTRING:([0-9a-zA-Z_./-]+)@@', loaderString, script) script = re.sub('@@INCLUDESTRING:([0-9a-zA-Z_./-]+)@@', loaderString, script)
script = re.sub('@@INCLUDEGFM:([0-9a-zA-Z_./-]+)@@', loaderGFM, script) script = re.sub('@@INCLUDEMD:([0-9a-zA-Z_./-]+)@@', loaderMD, script)
script = re.sub('@@INCLUDEIMAGE:([0-9a-zA-Z_./-]+)@@', loaderImage, script) script = re.sub('@@INCLUDEIMAGE:([0-9a-zA-Z_./-]+)@@', loaderImage, script)
script = script.replace('@@BUILDDATE@@', buildDate) script = script.replace('@@BUILDDATE@@', buildDate)

View File

@ -2,7 +2,7 @@
window.aboutIITC = function(){ window.aboutIITC = function(){
var v = '@@BUILDNAME@@-@@BUILDDATE@@'; var v = '@@BUILDNAME@@-@@BUILDDATE@@';
var attrib = '@@INCLUDEGFM:ATTRIBUTION.md@@'; var attrib = '@@INCLUDEMD:ATTRIBUTION.md@@';
var a = '' var a = ''
+ ' <div><b>About IITC</b></div> ' + ' <div><b>About IITC</b></div> '
+ ' <div>Ingress Intel Total Conversion</div> ' + ' <div>Ingress Intel Total Conversion</div> '