gpesquero/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

Detailed exceptions description while creating gps track file.

Browse source
This commit is contained in:
vng 2016-04-01 17:19:17 +03:00
parent f18d1ed152
commit c229cdeba2
2 changed files with 13 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
map/gps_track.cpp
View file

@ -154,9 +154,9 @@ void GpsTrack::InitStorageIfNeed()
{
m_storage = make_unique<GpsTrackStorage>(m_filePath, m_maxItemCount);
}
catch (RootException & e)
catch (RootException const & e)
{
LOG(LINFO, ("Storage has not been created:", e.Msg()));
LOG(LWARNING, ("Track storage creation error:", e.Msg()));
}
}
@ -203,9 +203,9 @@ void GpsTrack::InitCollection(hours duration)
m_collection->Add(points, evictedIds);
}
}
catch (RootException & e)
catch (RootException const & e)
{
LOG(LINFO, ("Storage has caused exception:", e.Msg()));
LOG(LWARNING, ("Track storage exception:", e.Msg()));
m_collection->Clear();
m_storage.reset();
}
@ -266,9 +266,9 @@ void GpsTrack::UpdateStorage(bool needClear, vector<location::GpsInfo> const & p
m_storage->Append(points);
}
catch (RootException & e)
catch (RootException const & e)
{
LOG(LINFO, ("Storage has caused exception:", e.Msg()));
LOG(LWARNING, ("Track storage exception:", e.Msg()));
m_storage.reset();
}
}

13
map/gps_track_storage.cpp
View file

@ -116,23 +116,24 @@ GpsTrackStorage::GpsTrackStorage(string const & filePath, size_t maxItemCount)
{
uint32_t version = 0;
if (!ReadVersion(m_stream, version))
MYTHROW(OpenException, ("File:", m_filePath));
MYTHROW(OpenException, ("Read version error.", m_filePath));
if (version == kCurrentVersion)
{
// Seek to end to get file size
m_stream.seekp(0, ios::end);
if (!m_stream.good())
MYTHROW(OpenException, ("File:", m_filePath));
MYTHROW(OpenException, ("Seek to the end error.", m_filePath));
size_t const fileSize = m_stream.tellp();
m_itemCount = GetItemCount(fileSize);
// Set write position after last item position
m_stream.seekp(GetItemOffset(m_itemCount), ios::beg);
size_t const offset = GetItemOffset(m_itemCount);
m_stream.seekp(offset, ios::beg);
if (!m_stream.good())
MYTHROW(OpenException, ("File:", m_filePath));
MYTHROW(OpenException, ("Seek to the offset error:", offset, m_filePath));
}
else
{
@ -148,10 +149,10 @@ GpsTrackStorage::GpsTrackStorage(string const & filePath, size_t maxItemCount)
m_stream.open(m_filePath, ios::in | ios::out | ios::binary | ios::trunc);
if (!m_stream)
MYTHROW(OpenException, ("File:", m_filePath));
MYTHROW(OpenException, ("Open file error.", m_filePath));
if (!WriteVersion(m_stream, kCurrentVersion))
MYTHROW(OpenException, ("File:", m_filePath));
MYTHROW(OpenException, ("Write version error.", m_filePath));
m_itemCount = 0;
}