From eff0324ae43e5ccf9827a1ff115fd5b523bcfc40 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A0=E9=AB=98=E5=BC=BA?= <zhangaoqiang001@live.com>
Date: Wed, 12 Jul 2017 15:45:57 +0800
Subject: [PATCH 1/2] fix iri validate error

i4x:course-v1:ccnu+ps01+201607018b77abb4cc284bab965c7326dcc36c4a
---
 xapi-bridge/converter.py | 36 ++++++++++++++++++------------------
 1 file changed, 18 insertions(+), 18 deletions(-)

diff --git a/xapi-bridge/converter.py b/xapi-bridge/converter.py
index 02e2781..2656430 100644
--- a/xapi-bridge/converter.py
+++ b/xapi-bridge/converter.py
@@ -65,7 +65,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -104,7 +104,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -126,14 +126,14 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Loaded Video" }
 				}
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -154,7 +154,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Played Video" }
 				}
@@ -166,7 +166,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -187,7 +187,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Paused Video" }
 				}
@@ -199,7 +199,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -220,7 +220,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Completed Video" }
 				}
@@ -232,7 +232,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -253,7 +253,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Video seek" }
 				}
@@ -267,7 +267,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -288,7 +288,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Video speed change" }
 				}
@@ -302,7 +302,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -323,7 +323,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Video transcript hidden" }
 				}
@@ -335,7 +335,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})
@@ -356,7 +356,7 @@ def to_xapi(evt):
 			},
 			'object': {
 				'objectType': 'Activity',
-				'id': 'i4x://' + evt['context']['course_id'] + event['id'],
+				'id': 'i4x:' + evt['context']['course_id'] + event['id'],
 				'definition': {
 					'name': {'en-US': "Video transcript shown" }
 				}
@@ -368,7 +368,7 @@ def to_xapi(evt):
 			},
 			'context': {
 				'contextActivities': {
-					'parent': [{'id': 'i4x://'+evt['context']['course_id']}]
+					'parent': [{'id': 'i4x:'+evt['context']['course_id']}]
 				}
 			}
 		})

From 99389092ecea529a0ced2f160225dd213316ec7a Mon Sep 17 00:00:00 2001
From: zhan <zhan@example.com>
Date: Wed, 12 Jul 2017 15:57:11 +0800
Subject: [PATCH 2/2] add utf-8

---
 .idea/edx-xapi-bridge.iml                      | 11 +++++++++++
 .idea/encodings.xml                            |  6 ++++++
 .idea/inspectionProfiles/profiles_settings.xml |  7 +++++++
 .idea/misc.xml                                 |  4 ++++
 .idea/modules.xml                              |  8 ++++++++
 .idea/vcs.xml                                  |  6 ++++++
 xapi-bridge/__main__.py                        |  1 +
 xapi-bridge/converter.py                       |  1 +
 8 files changed, 44 insertions(+)
 create mode 100644 .idea/edx-xapi-bridge.iml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/inspectionProfiles/profiles_settings.xml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml

diff --git a/.idea/edx-xapi-bridge.iml b/.idea/edx-xapi-bridge.iml
new file mode 100644
index 0000000..6711606
--- /dev/null
+++ b/.idea/edx-xapi-bridge.iml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="PYTHON_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+  <component name="TestRunnerService">
+    <option name="PROJECT_TEST_RUNNER" value="Unittests" />
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..97626ba
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="PROJECT" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/inspectionProfiles/profiles_settings.xml b/.idea/inspectionProfiles/profiles_settings.xml
new file mode 100644
index 0000000..c23ecac
--- /dev/null
+++ b/.idea/inspectionProfiles/profiles_settings.xml
@@ -0,0 +1,7 @@
+<component name="InspectionProjectProfileManager">
+  <settings>
+    <option name="useProjectProfile" value="false" />
+    <option name="USE_PROJECT_PROFILE" value="false" />
+    <version value="1.0" />
+  </settings>
+</component>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..1c9a037
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 2.7.13 (D:\python2.7\python.exe)" project-jdk-type="Python SDK" />
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..87a7f9d
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/edx-xapi-bridge.iml" filepath="$PROJECT_DIR$/.idea/edx-xapi-bridge.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..94a25f7
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/xapi-bridge/__main__.py b/xapi-bridge/__main__.py
index 4f6e020..3f8089c 100644
--- a/xapi-bridge/__main__.py
+++ b/xapi-bridge/__main__.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import sys, os, json, requests, threading
 from urlparse import urljoin
 from pyinotify import WatchManager, Notifier, EventsCodes, ProcessEvent
diff --git a/xapi-bridge/converter.py b/xapi-bridge/converter.py
index 2656430..b0c8857 100644
--- a/xapi-bridge/converter.py
+++ b/xapi-bridge/converter.py
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 import json, re, xml.etree.ElementTree as ET