ardour/livetrax
13
0
Fork 0
Code

Update session-archive error-code to work as documented

Browse Source 
* return > 0 if file is not an archive
 * return < 0 if extraction failed
 * return 0 on success.
This commit is contained in:
Robin Gareus 2021-03-11 19:40:41 +01:00
parent 93121e8aa3
commit 1832228601
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
libs/ardour/find_session.cc
View File

@ -208,14 +208,14 @@ inflate_session (const std::string& zipfile, const std::string& target_dir, stri
if (files.size () == 0) { if (files.size () == 0) {
error << _("Archive is empty") << endmsg; error << _("Archive is empty") << endmsg;
return 2; return -2;
} }
/* session archives are expected to be named after the archive */ /* session archives are expected to be named after the archive */
std::string bn = Glib::path_get_dirname (files.front()); std::string bn = Glib::path_get_dirname (files.front());
if (bn.empty ()) { if (bn.empty ()) {
error << _("Archive does not contain a session folder") << endmsg; error << _("Archive does not contain a session folder") << endmsg;
return 3; return -3;
} }
size_t sep = bn.find_first_of ('/'); size_t sep = bn.find_first_of ('/');
@ -226,13 +226,13 @@ inflate_session (const std::string& zipfile, const std::string& target_dir, stri
if (bn.empty ()) { if (bn.empty ()) {
error << _("Archive does not contain a valid session structure") << endmsg; error << _("Archive does not contain a valid session structure") << endmsg;
return 4; return -4;
} }
string sn = bn + "/" + bn + statefile_suffix; string sn = bn + "/" + bn + statefile_suffix;
if (std::find (files.begin(), files.end(), sn) == files.end()) { if (std::find (files.begin(), files.end(), sn) == files.end()) {
error << _("Archive does not contain a session file") << endmsg; error << _("Archive does not contain a session file") << endmsg;
return 5; return -5;
} }
/* check if target folder exists */ /* check if target folder exists */
@ -251,11 +251,11 @@ inflate_session (const std::string& zipfile, const std::string& target_dir, stri
} catch (...) { } catch (...) {
error << _("Error reading file-archive") << endmsg; error << _("Error reading file-archive") << endmsg;
return 6; return -6;
} }
error << _("Error extracting file-archive") << endmsg; error << _("Error extracting file-archive") << endmsg;
return -2; return -7;
} }
string inflate_error (int e) { string inflate_error (int e) {
@ -264,20 +264,20 @@ string inflate_error (int e) {
return _("No Error"); return _("No Error");
case 1: case 1:
return string_compose (_("File extension is not %1"), session_archive_suffix); return string_compose (_("File extension is not %1"), session_archive_suffix);
case 2: case -2:
return _("Archive is empty"); return _("Archive is empty");
case 3: case -3:
return _("Archive does not contain a session folder"); return _("Archive does not contain a session folder");
case 4: case -4:
return _("Archive does not contain a valid session structure"); return _("Archive does not contain a valid session structure");
case 5: case -5:
return _("Archive does not contain a session file"); return _("Archive does not contain a session file");
case 6: case -6:
return _("Error reading file-archive"); return _("Error reading file-archive");
case -7:
return _("Error extracting file-archive");
case -1: case -1:
return _("Destination folder already exists."); return _("Destination folder already exists.");
case -2:
return _("Error extracting file-archive");
default: default:
assert (0); assert (0);
break; break;