fix template for reflet input y/m, and add argument for fetch tools

diff --git a/config.py b/config.py
index ed53ed9..7b01386 100644 (file)
--- a/config.py
+++ b/config.py
@@ -6,5 +6,5 @@ config = {}
 #config["storage_dir"] = "~hylom/Sites/newsclip/db"
 config["template_dir"] = "~hylom/Sites/sfmstat/template"
 #config["webmaster"] = "http://hylom.net/"
-config["app_root"] = "http://localhost/~hylom/sfmstat/stat2.py"
-config["root_css"] = "http://localhost/~hylom/newsclip/stat.css"
+config["app_root"] = "/~hylom/sfmstat/stat2.py"
+config["root_css"] = "/~hylom/newsclip/stat.css"

diff --git a/fetch_analytics.py b/fetch_analytics.py
index c0b75de..7f66ac6 100755 (executable)
--- a/fetch_analytics.py
+++ b/fetch_analytics.py
@@ -22,9 +22,7 @@ def get_data_by_day(cli, year, month, day):
     return get_data_feed(cli, url, day_start.isoformat(), day_end.isoformat())
 
 def get_data_feed(cli, url, start_date, end_date):
-
     print url + " : " + start_date + " to " + end_date
-
     table_id = "ga:1443341" # sourceforge.jp
     max_results = 1000
     # url = "http://sourceforge.jp/magazine/10/04/20/1033216"
@@ -49,12 +47,17 @@ def get_data_feed(cli, url, start_date, end_date):
         result.append((path, date, pv, visits))
     return result
 
-
 def main():
     try:
         email = sys.argv[1]
+        start_y = sys.argv[2]
+        start_m = sys.argv[3]
+        start_d = sys.argv[4]
+        period = sys.argv[5]
     except IndexError:
-        sys.exit("%s username" % sys.argv[0])
+        sys.exit("""%s username year_start month_start day_start period
+ex) %s foobar@gmail.com 2010 9 30 60
+""" % (sys.argv[0],sys.argv[0]))
 
     passwd = getpass.getpass()
     cli = gdata.analytics.client.AnalyticsClient(source=APP_NAME)
@@ -67,10 +70,10 @@ def main():
     except gdata.client.Error:
         exit('Login Error')
 
-    start_date = datetime.date(2010, 8, 31)
-#    start_date = datetime.date(2010, 3, 1)
-    term = 60
-#    term = 10
+#    start_date = datetime.date(2010, 9, 30)
+#    term = 60
+    start_date = datetime.date(start_y, start_m, start_d)
+    term = period
 #    f = open("result.txt", "w")
 
     db = GACacheDB()

diff --git a/fetch_hatebu.py b/fetch_hatebu.py
index 4acc797..1c5296f 100755 (executable)
--- a/fetch_hatebu.py
+++ b/fetch_hatebu.py
@@ -4,16 +4,34 @@ import xmlrpclib
 import datetime
 import sqlite3
 import time
+import sys
+
 import databases
 # see http://d.hatena.ne.jp/keyword/%a4%cf%a4%c6%a4%ca%a5%d6%a5%c3%a5%af%a5%de%a1%bc%a5%af%b7%ef%bf%f4%bc%e8%c6%c0API?kid=146686
 
 
+def get_count(urls):    
+    uri = "http://b.hatena.ne.jp/xmlrpc"
+    server = xmlrpclib.ServerProxy(uri)
+    t = server.bookmark.getCount(*urls)
+    return t
 
+def main():
+    usage = """%s year_start month_start day_start
+ex) %s 2010 10 26"""
+    try:
+        start_y = sys.argv[1]
+        start_m = sys.argv[2]
+        start_d = sys.argv[3]
+    except IndexError:
+        sys.exit(usage % (sys.argv[0], sys.argv[0]))
 
-def hoge():
     DATABASE = "database/story_dat"
-    range_begin = datetime.datetime(2010, 9, 26)
-    range_end = datetime.datetime(2010, 10, 26)
+#    range_begin = datetime.datetime(2010, 10, 26)
+#    range_end = datetime.datetime(2010, 11, 26)
+    range_begin = datetime.datetime(start_y, start_m, start_d)
+    range_end = range_begin + datetime.timedelta(31) # 31 days
+
     begin_t = time.mktime(range_begin.timetuple())
     end_t = time.mktime(range_end.timetuple())
 
@@ -47,15 +65,5 @@ def hoge():
                 count = results[url]
                 db.add(id, count)
 
-def get_count(urls):    
-    uri = "http://b.hatena.ne.jp/xmlrpc"
-    server = xmlrpclib.ServerProxy(uri)
-    t = server.bookmark.getCount(*urls)
-    return t
-
-
-def main():
-    hoge()
-
 if __name__ == "__main__":
     main()

diff --git a/template/root.html b/template/root.html
index 9b5543d..567fb20 100644 (file)
--- a/template/root.html
+++ b/template/root.html
@@ -23,24 +23,24 @@
 <div class="range">
   <label>集計月：</label>
   <select name="start_y" id="start_y">
-    <option value="2008">2008</option>
-    <option value="2009">2009</option>
-    <option value="2010" selected="selected">2010</option>
+       % for y in range(2008, 2011):
+       % if y == int(year):
+    <option value="${y}" selected="selected">${y}</option>
+       % else:
+    <option value="${y}">${y}</option>
+       % endif
+       % endfor 
   </select>
   <label>年</label>
   <select name="start_m" id="start_m">
-    <option value="01">01</option>
-    <option value="02">02</option>
-    <option value="03">03</option>
-    <option value="04">04</option>
-    <option value="05">05</option>
-    <option value="06">06</option>
-    <option value="07">07</option>
-    <option value="08">08</option>
-    <option value="09">09</option>
-    <option value="10">10</option>
-    <option value="11">11</option>
-    <option value="12">12</option>
+       % for m in range(1, 13):
+       <% mm = "%02d" % m %>
+       % if m == int(month):
+    <option value="${mm}" selected="selected">${mm}</option>
+       % else:
+    <option value="${mm}">${mm}</option>
+       % endif
+       % endfor
   </select>
   <label>月</label>
 </div>