From 9735885c8a2f129c7060fe4573a5a548d8c85f9c Mon Sep 17 00:00:00 2001
From: vng <viktor.govako@gmail.com>
Date: Sat, 9 Jan 2021 20:45:08 +0300
Subject: [PATCH] [generator] Print informative log instead of regular crash.
 Signed-off-by: vng <viktor.govako@gmail.com>

---
 coding/csv_reader.cpp                      | 6 ++++--
 generator/cross_mwm_osm_ways_collector.cpp | 9 +++------
 generator/descriptions_section_builder.cpp | 9 +++++----
 generator/wiki_url_dumper.cpp              | 7 ++++---
 4 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/coding/csv_reader.cpp b/coding/csv_reader.cpp
index 663dd3b9e5..df33fab406 100644
--- a/coding/csv_reader.cpp
+++ b/coding/csv_reader.cpp
@@ -92,9 +92,11 @@ std::optional<std::string> CSVReader::ReaderWrapper::ReadLine()
 }
 
 CSVReader::DefaultReader::DefaultReader(std::string const & filename)
+: m_stream(filename)
 {
-  m_stream.exceptions(std::ios::failbit | std::ios::badbit);
-  m_stream.open(filename);
+  if (!m_stream)
+    LOG(LERROR, ("Can't open file ", filename));
+
   m_stream.exceptions(std::ios::badbit);
 }
 
diff --git a/generator/cross_mwm_osm_ways_collector.cpp b/generator/cross_mwm_osm_ways_collector.cpp
index 7faf490740..b73217b369 100644
--- a/generator/cross_mwm_osm_ways_collector.cpp
+++ b/generator/cross_mwm_osm_ways_collector.cpp
@@ -181,18 +181,15 @@ void CrossMwmOsmWaysCollector::CrossMwmInfo::Dump(CrossMwmInfo const & info, std
 std::set<CrossMwmOsmWaysCollector::CrossMwmInfo>
 CrossMwmOsmWaysCollector::CrossMwmInfo::LoadFromFileToSet(std::string const & path)
 {
-  if (!Platform::IsFileExistsByFullPath(path))
+  std::ifstream input(path);
+  if (!input)
   {
     LOG(LWARNING, ("No info about cross mwm ways:", path));
     return {};
   }
-
-  std::set<CrossMwmInfo> result;
-  std::ifstream input;
-  input.exceptions(std::fstream::failbit | std::fstream::badbit);
-  input.open(path);
   input.exceptions(std::fstream::badbit);
 
+  std::set<CrossMwmInfo> result;
   uint64_t osmId;
   size_t segmentsNumber;
   while (input >> osmId >> segmentsNumber)
diff --git a/generator/descriptions_section_builder.cpp b/generator/descriptions_section_builder.cpp
index fb1c403d77..30218ba958 100644
--- a/generator/descriptions_section_builder.cpp
+++ b/generator/descriptions_section_builder.cpp
@@ -36,12 +36,13 @@ WikidataHelper::WikidataHelper(std::string const & mwmPath, std::string const &
 {
   std::string const osmIdsToFeatureIdsPath = m_mwmPath + OSM2FEATURE_FILE_EXTENSION;
   if (!ParseFeatureIdToOsmIdMapping(osmIdsToFeatureIdsPath, m_featureIdToOsmId))
-    LOG(LCRITICAL, ("Error parse OsmIdToFeatureId mapping."));
+    LOG(LCRITICAL, ("Mapping parse error for file ", osmIdsToFeatureIdsPath));
 
-  std::ifstream stream;
-  stream.exceptions(std::fstream::failbit | std::fstream::badbit);
-  stream.open(m_idToWikidataPath);
+  std::ifstream stream(m_idToWikidataPath);
+  if (!stream)
+    LOG(LERROR, ("File ", m_idToWikidataPath, " not found. Consider skipping Descriptions stage."));
   stream.exceptions(std::fstream::badbit);
+
   uint64_t id;
   std::string wikidataId;
   while (stream)
diff --git a/generator/wiki_url_dumper.cpp b/generator/wiki_url_dumper.cpp
index 8dd3c8a0bf..378c2c7091 100644
--- a/generator/wiki_url_dumper.cpp
+++ b/generator/wiki_url_dumper.cpp
@@ -71,10 +71,11 @@ void WikiUrlDumper::DumpOne(std::string const & path, std::ostream & stream)
 WikiDataFilter::WikiDataFilter(std::string const & path, std::vector<std::string> const & dataFiles)
   :  m_path(path), m_dataFiles(dataFiles)
 {
-  std::ifstream stream;
-  stream.exceptions(std::fstream::failbit | std::fstream::badbit);
-  stream.open(m_path);
+  std::ifstream stream(m_path);
+  if (!stream)
+    LOG(LERROR, ("File ", m_path, " not found. Consider skipping Descriptions stage."));
   stream.exceptions(std::fstream::badbit);
+
   uint64_t id;
   std::string wikidata;
   while (stream)