Merge branch 'dev' into live

[dylansserver.git] / publish_notes.py

diff --git a/publish_notes.py b/publish_notes.py
index 8663f9c..3c955c3 100755 (executable)
--- a/publish_notes.py
+++ b/publish_notes.py
@@ -8,7 +8,7 @@ import MySQLdb as db
 import ConfigParser
 
 config = ConfigParser.RawConfigParser()
-config.read('/etc/dylanstestserver.ini')
+config.read('/etc/dylansserver.ini')
 domain = config.get('database', 'domain')
 user = config.get('database', 'user')
 password = config.get('database', 'password').replace('"', '')
@@ -25,17 +25,17 @@ for row in results:
     existing_titles.append(row[0])
 
 for note in notes:
+    if note[:1] == '.': continue
     if note == 'index.php' or note == 'notes.php': continue
     url = note[:note.index('.')]
     f = open(os.path.join(NOTES_DIRECTORY, note))
     title = str(f.readline()[:-1])
+    date_posted = time.strptime(str(f.readline()[:-1]), "%Y/%m/%d %I:%M%p")
     text = ''.join(f.readlines()) #converts list to single string
     if title in existing_titles: continue
-    mtime = time.localtime(os.path.getmtime(os.path.join(NOTES_DIRECTORY, note)))
-    date_posted = "%s-%s-%s" % (str(mtime.tm_year)[2:], mtime.tm_mon, mtime.tm_mday)
     sql = "INSERT INTO notes (date_posted, url, title, text)\
              VALUES(\"%s\", \"%s\", \"%s\", \"%s\")"\
-             % (date_posted, url, title, db.escape_string(text))
+             % (time.strftime("%Y/%m/%d %I:%M:00", date_posted), url, title, db.escape_string(text))
 
     #print sql
     cursor.execute(sql)