Moved validation into generator.js

fossasia · Mar 16, 2016 · be6ba58 · be6ba58 · joerx · Mar 16, 2016
1 parent 86bfc5c
commit be6ba58
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 23 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -6,9 +6,7 @@ before_script:
   - nvm install 4.4
   - nvm alias default 4.4
   - npm install
-  - python scraper.py
 script:
-  - node check-uniq-session_id.js
   - sh build.sh
 env:
   - secure: "MA928kGtPidi9F5ciZOogrQnNTZKWPESFq9ew9Mw0wVLu9evcJlFa5WoYXkmOn72hM8qEwoD66R7zb9b+0QS8uHop9QvjG1cjpslzorjE08BU0aMlsx98STPVWB5l8aNOPGE3qhFJmOWm6c+B8lNph61nTMR/4oQ+3+kFvMj4SX9QJ3zZ+VxP/Be5uMkpwySbH9t4rByI4dcvOnwpnsxeuxE7HktNUbuJeAh5nuWuWUgfDrvG2FGgp85zZBQtBTUVAb7ggLNJbdNz6hKOjrVYefqa0bOsoFjbyAtb2vNmfHSsg/xUfBQ/4SSsfYU5jv/uuyp+mdbEb0TLejMNjOCUsIq6bIUe2XgQHJhhHrEtZsUVQEC/1bckxgDFYbmDJcbOQt9j+QAppPkhAoq71IzOnycpmM5zGEZUoOxRIay//Dyg3QyPOJ0Jswce6zKuy8DV5K9aInGBscyY/6Q6Zab7vn0cOYhKEVMSzpKlz4TxGvQm8FGUOqaFFBoxoZlmjzyIeWYqiKRwt7FJgXKEyjbFn8uwt1lZze535eytVgW4Rx4g5QkW6HCQcsQQe0Shqkfb8feDICCw5xPLwUvutrU9/s9HCN/wxpE8nUHhGsODyUl41hCkvocL608wDutgJjhBrQod3wu81Bn8O+ZM/C0XUgvH5LAMxpaMVxg9lMs2Ns="
diff --git a/build.sh b/build.sh
@@ -5,6 +5,8 @@ set -e
 git config --global user.name "Travis CI"
 git config --global user.email "noreply+travis@fossasia.org"
 
+python scraper.py
+
 # don't continue if no changes
 if git diff-index --quiet HEAD; then
   exit 0

diff --git a/check-uniq-session_id.js b/check-uniq-session_id.js
diff --git a/schedule/generator.js b/schedule/generator.js
@@ -99,5 +99,18 @@ function transformData(sessions, speakers) {
   return {tracks, days}
 }
 
+function validateSessions(sessionsData) {
+  var ids = sessionsData.map(s => s.session_id)
+  var dups = ids.filter((sid, idx) => ids.indexOf(sid) !== idx)
+  if (dups.length > 0) {
+    console.error('Duplicate session ids: %s', dups.join(', '))
+  }
+  return false
+}
+
+if (!validateSessions(sessionsData.sessions)) {
+  process.exit(1)
+}
+
 const data = transformData(sessionsData, speakersData)
-process.stdout.write(tpl(data))
+// process.stdout.write(tpl(data))