Fix XML generation

histories/models.py

@@ -43,9 +43,9 @@ class HistoryEntry(models.Model):
     def to_xml(self, xml_root):
         entry = ET.Element('history')
         entry_url = ET.Element('url')
-        entry_url.text = self.search
+        entry_url.text = str(self.search)
         entry_ts = ET.Element('timestamp')
-        entry_ts.text = self.timestamp.timestamp()
+        entry_ts.text = str(self.timestamp.timestamp())
         entry.append(entry_url)
         entry.append(entry_ts)
         xml_root.append(entry)
@@ -107,11 +107,13 @@ class History(models.Model):
             output += str(entry) + '\n'
         return output
 
-    def play_histories(self):
+    async def play_histories(self):
         """ Actually plays the history.
         """
         self.played = True
-        runner = TorInstance(self.return_history())
+        runner = await TorInstance.create(
+            self.return_history(),
+            self.user.browser_fingerprint.serialize_headers())
         runner.run()
         self.save()
 
@@ -123,9 +125,9 @@ class History(models.Model):
             xml_root = ET.Element('root')
 
         hist_node = ET.Element("history", attrib={
-            'start-ts': self.start_ts,
-            'played': 1 if self.played else 0,
-            'user': self.user.pk,
+            'start-ts': str(self.start_ts),
+            'played': '1' if self.played else '0',
+            'user': str(self.user.pk),
         })
         xml_root.append(hist_node)
         for entry in self.historyentry_set.all():

profiles/models.py

@@ -97,7 +97,7 @@ class Website(models.Model):
             url = random.choice(self.notable_pages.all()).url
         elif rand <= 0.8:
             search_term_text = self.name + " " + \
-                    random.choice(self.keywords.all())
+                    str(random.choice(self.keywords.all()))
             url = user.search_engine.search_url(search_term_text)
         else:
             url = user.search_engine.search_url(self.name)

requirements.txt

@@ -16,3 +16,4 @@ stem==1.6.0
 pycurl==7.43.0.1
 rdflib==4.2.2
 git+https://github.com/tobast/RDFSerializer.git
+aiosocks==0.2.6