diff --git a/junbi.cgi b/junbi.cgi index d92b396..5eab878 100755 --- a/junbi.cgi +++ b/junbi.cgi @@ -32,6 +32,9 @@ except: pass + with open("foo.txt", "w") as f: + f.write(str((intent, date, period, machine_name))) + if date: d = datetime.strptime(date, "%Y-%m-%d") date = Date(d.year, d.month, d.day) @@ -52,6 +55,7 @@ else: return 52+ tday -cday # }}} + def machine(date, period): # {{{ import urllib2 import lxml.html @@ -99,14 +103,23 @@ if tmp: day = re.sub('/', u'月', days[i].text) day = re.sub('\(', u'日(', day) - line += day + tmp = day + tmp line += tmp if line == "": - line = choice(( - u"なにもありません。平和でなによりです", - u"異常ありません. よかった", - u"報告事項なしです。", + if period != "": + day = re.sub('/', u'月', days[0].text) + day = re.sub('\(', u'日(', day) + day2 = re.sub('/', u'月', days[-1].text) + day2 = re.sub('\(', u'日(', day2) + day = day + u"から" + day2 + + else: + day = _formatdate(date) + line = day + choice(( + "なにもありません。平和でなによりです", + "異常ありません. よかった", + "報告事項なしです。", )) return line @@ -135,7 +148,6 @@ s = choice(( "全部成功です。やったー!", "問題ありません。ラッキー!", - "全弾命中です!提督!" )) else: s = "データがまだ無いようです" @@ -168,10 +180,12 @@ ("b", "m", 6), ("b", "m", 6), ("b", "m", 6), ("b", "m", 6), - ("b", "m", 6), ("b", "m", 6), + ("j", "m", 6), ("j", "m", 6), ][int(name)-1] # }}} def location(name): #{{{ + name = name[3:] + if int(name) > 63: return "" @@ -206,6 +220,7 @@ import re import locale + name = name[3:] logdir = "/var/log/httpd/" logfiles = [fname for fname in os.listdir(logdir) if fname.startswith("access_log-")] @@ -275,6 +290,8 @@ return s #}}} +def slack(context): + pass ## ## vvv main sequence vvv @@ -282,8 +299,6 @@ get_parameters() -with open("foo.txt", "w") as f: - f.write(str((intent, date, period, machine_name))) answer = "" if intent == "ondotoriIntent": answer += ondotori(date, period) @@ -293,6 +308,8 @@ answer += location(machine_name) elif intent == "logIntent": answer += log(machine_name) +elif intent == "slackIntent": + answer += slack(context) if answer == "": answer = choice(( @@ -311,7 +328,7 @@ "parameters": { "text": answer, }, - "lifespan": 5 + "lifespan": 1 } ]} d = json.dumps(output, ensure_ascii=False)