Change newlines to breaks

Fix migration naming

Author: hoffmabc

db/migrations/migration3.py db/migrations/migration4.pydb/migrations/migration3.py renamed to db/migrations/migration4.py

@@ -536,8 +536,8 @@ def accept_order_confirmation(self, notification_listener, confirmation_json=Non
             # Send SMTP notification
             notification = SMTPNotification(self.db)
             notification.send("[OpenBazaar] Order Confirmed and Shipped",
-                              "You have received an order confirmation.\n\n"
-                              "Order: %s\nVendor: %s\nTitle: %s\n" % (contract_hash, vendor_guid, title))
+                              "You have received an order confirmation.<br><br>"
+                              "Order: %s<br>Vendor: %s<br>Title: %s<br>" % (contract_hash, vendor_guid, title))
 
             return True
         except Exception, e:
@@ -834,11 +834,11 @@ def await_funding(self, notification_listener, libbitcoin_client, proofSig, is_p
 
             try:
                 notification = SMTPNotification(self.db)
-                notification.send("[OpenBazaar] Order Received", "Order #%s\n"
-                                                                 "Buyer: %s\n"
-                                                                 "BTC Address: %s\n"
-                                                                 "Title: %s\n"
-                                                                 "Description: %s\n"
+                notification.send("[OpenBazaar] Order Received", "Order #%s<br>"
+                                                                 "Buyer: %s<br>"
+                                                                 "BTC Address: %s<br>"
+                                                                 "Title: %s<br>"
+                                                                 "Description: %s<br>"
                                   % (order_id, buyer, payment_address, title, description))
             except Exception as e:
                 self.log.info("Error with SMTP notification: %s" % e.message)
@@ -896,9 +896,9 @@ def payment_received(self):
                                               order_id, title, image_hash)
 
             notification = SMTPNotification(self.db)
-            notification.send("[OpenBazaar] Purchase Payment Received", "Your payment was received.\n\n"
-                                                                        "Order: %s\n"
-                                                                        "Vendor: %s\n"
+            notification.send("[OpenBazaar] Purchase Payment Received", "Your payment was received.<br><br>"
+                                                                        "Order: %s<br>"
+                                                                        "Vendor: %s<br>"
                                                                         "Title: %s"
                               % (order_id, vendor_guid, title))
 
@@ -1113,8 +1113,8 @@ def process_refund(self, refund_json, blockchain, notification_listener):
         notification_listener.notify(buyer_guid, handle, "refund", order_id, title, image_hash)
 
         notification = SMTPNotification(self.db)
-        notification.send("[OpenBazaar] Refund Received", "You received a refund.\n\n"
-                                                          "Order: %s\nTitle: %s"
+        notification.send("[OpenBazaar] Refund Received", "You received a refund.<br><br>"
+                                                          "Order: %s<br>Title: %s"
                           % (order_id, title))
 
     def verify(self, sender_key):

market/contracts.py

@@ -162,9 +162,9 @@ def rpc_follow(self, sender, proto, signature):
             # Send SMTP notification
             notification = SMTPNotification(self.db)
             notification.send("[OpenBazaar] %s is now following you!" % m.name,
-                              "You have a new follower:\n\nName: %s\nGUID: %s\nHandle: %s" % (m.name,
-                                                                                              f.guid.encode('hex'),
-                                                                                              m.handle))
+                              "You have a new follower:<br><br>Name: %s<br>GUID: <a href=\"ob://%s\">%s</a><br>"
+                              "Handle: %s" %
+                              (m.name, f.guid.encode('hex'), f.guid.encode('hex'), m.handle))
 
             return ["True", m.SerializeToString(), self.signing_key.sign(m.SerializeToString())[:64]]
         except Exception:
@@ -324,8 +324,9 @@ def rpc_dispute_open(self, sender, pubkey, encrypted):
             self.router.addContact(sender)
             self.log.info("Contract dispute opened by %s" % sender)
             return ["True"]
-        except Exception:
+        except Exception as e:
             self.log.error("unable to parse disputed contract from %s" % sender)
+            self.log.error("Exception: %s" % e.message)
             return ["False"]
 
     def rpc_dispute_close(self, sender, pubkey, encrypted):

market/protocol.py

@@ -0,0 +1,33 @@
+import sqlite3
+from protos import objects
+
+
+def migrate(database_path):
+    print "migrating to db version 3"
+    conn = sqlite3.connect(database_path)
+    conn.text_factory = str
+    cursor = conn.cursor()
+    # read followers from db
+    cursor.execute('''SELECT serializedFollowers FROM followers WHERE id=1''')
+    followers = cursor.fetchone()
+
+    # delete follower table
+    cursor.execute('''DROP TABLE followers''')
+
+    # create new table
+    cursor.execute('''CREATE TABLE followers(guid TEXT UNIQUE, serializedFollower TEXT)''')
+    cursor.execute('''CREATE INDEX index_followers ON followers(serializedFollower);''')
+
+    # write followers back into db
+
+    if followers is not None:
+        f = objects.Followers()
+        f.ParseFromString(followers[0])
+        for follower in f.followers:
+            cursor.execute('''INSERT INTO followers(guid, serializedFollower) VALUES (?,?)''',
+                           (follower.guid.encode("hex"), follower.SerializeToString().encode("hex"),))
+
+    # update version
+    cursor.execute('''PRAGMA user_version = 3''')
+    conn.commit()
+    conn.close()