resolved conflicts

1 files changed, 18 insertions, 2 deletions

diff --git a/dumpfm/dumpfm.py b/dumpfm/dumpfm.py
index a6138b4..5bffdbc 100644
--- a/dumpfm/dumpfm.py
+++ b/dumpfm/dumpfm.py
@@ -156,5 +156,21 @@ engine = create_engine('postgresql://{}@{}/{}'.format(
 Session = sessionmaker(bind=engine)
 
 session = Session()
-message_list = session.query(Message).filter_by(is_image=True).all()
-print len(message_list)
+message_list = session.query(Message).filter_by(is_image=True)
+count = 0
+import sys
+import re
+f = open("IDLIST2", "w")
+exp = re.compile(r'.*asdf.us/im/.*')
+exp2 = re.compile(r'.*favor.*', re.IGNORECASE)
+for message in message_list:
+    if exp.match(message.content):
+        session2 = Session()
+        favorites_count = 0
+        tags = session2.query(Tag).filter_by(message_id=message.message_id)
+        for tag in tags:
+            if exp2.match(tag.tag):
+                favorites_count += 1
+        session2.close()
+        f.write("%s\t%s\t%s\n" % ( message.message_id, message.content.encode('utf8'), favorites_count))
+