From eb428adf7d5fedf947c00f30bf1f04462f2291e3 Mon Sep 17 00:00:00 2001
From: Zog
Date: Tue, 20 Feb 2018 08:31:43 +0100
Subject: Refs #5924; Fix some bugs revealed during imports

- The checksum computing for VehicleJourneyAtStops
- Offsets calculation in VehicleJourneys
---
 lib/tasks/imports.rake | 44 ++++++++++++++++++++++++++++++++------------
 1 file changed, 32 insertions(+), 12 deletions(-)

(limited to 'lib/tasks')

diff --git a/lib/tasks/imports.rake b/lib/tasks/imports.rake
index eca7e6849..6791bd877 100644
--- a/lib/tasks/imports.rake
+++ b/lib/tasks/imports.rake
@@ -37,9 +37,14 @@ namespace :import do
       end
     end
     puts "\e[33m***\e[0m Start importing"
-    importer.import(verbose: true)
-    puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + importer.status + "\e[0m"
-    importer_output_to_csv importer
+    begin
+      importer.import(verbose: true)
+    rescue Interrupt
+      raise
+    ensure
+      puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + (importer.status || "") + "\e[0m"
+      importer_output_to_csv importer
+    end
   end
 
   desc "import the given file with the corresponding importer in the given StopAreaReferential"
@@ -51,9 +56,14 @@ namespace :import do
       config.context = {stop_area_referential: referential}
     end
     puts "\e[33m***\e[0m Start importing"
-    importer.import(verbose: true)
-    puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + importer.status + "\e[0m"
-    importer_output_to_csv importer
+    begin
+      importer.import(verbose: true)
+    rescue Interrupt
+      raise
+    ensure
+      puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + (importer.status || "") + "\e[0m"
+      importer_output_to_csv importer
+    end
   end
 
   desc "import the given routes files"
@@ -67,9 +77,14 @@ namespace :import do
       config.context = {stop_area_referential: stop_area_referential, mapping_filepath: args[:mapping_filepath]}
     end
     puts "\e[33m***\e[0m Start importing"
-    importer.import(verbose: true)
-    puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + importer.status + "\e[0m"
-    importer_output_to_csv importer
+    begin
+      importer.import(verbose: true)
+    rescue Interrupt
+      raise
+    ensure
+      puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + (importer.status || "") + "\e[0m"
+      importer_output_to_csv importer
+    end
   end
 
   desc "import the given file with the corresponding importer in the given LineReferential"
@@ -81,8 +96,13 @@ namespace :import do
       config.context = {line_referential: referential}
     end
     puts "\e[33m***\e[0m Start importing"
-    importer.import(verbose: true)
-    puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + importer.status + "\e[0m"
-    importer_output_to_csv importer
+    begin
+      importer.import(verbose: true)
+    rescue Interrupt
+      raise
+    ensure
+      puts "\n\e[33m***\e[0m Import done, status: " + (importer.status == "success" ? "\e[32m" : "\e[31m" ) + (importer.status || "") + "\e[0m"
+      importer_output_to_csv importer
+    end
   end
 end
-- 
cgit v1.2.3