Fix typo occured -> occurred
This commit is contained in:
parent
e74645e833
commit
a2ff0f418f
|
@ -218,7 +218,7 @@ void createBackupFile(const std::string &backupDir, const std::string &originalP
|
||||||
}
|
}
|
||||||
|
|
||||||
/*!
|
/*!
|
||||||
* \brief Handles a failure/abort which occured after the file has been modified.
|
* \brief Handles a failure/abort which occurred after the file has been modified.
|
||||||
*
|
*
|
||||||
* - Restores the backup file using restoreOriginalFileFromBackupFile() if one has been created.
|
* - Restores the backup file using restoreOriginalFileFromBackupFile() if one has been created.
|
||||||
* - Adds appropriate notifications to the specified \a fileInfo.
|
* - Adds appropriate notifications to the specified \a fileInfo.
|
||||||
|
@ -281,7 +281,7 @@ void handleFailureAfterFileModified(MediaFileInfo &fileInfo, const std::string &
|
||||||
const char *what = catchIoFailure();
|
const char *what = catchIoFailure();
|
||||||
if (!backupPath.empty()) {
|
if (!backupPath.empty()) {
|
||||||
// a temp/backup file has been created -> restore original file
|
// a temp/backup file has been created -> restore original file
|
||||||
diag.emplace_back(DiagLevel::Critical, "An IO error occured when rewriting the file to apply changed tag information.", context);
|
diag.emplace_back(DiagLevel::Critical, "An IO error occurred when rewriting the file to apply changed tag information.", context);
|
||||||
try {
|
try {
|
||||||
restoreOriginalFileFromBackupFile(fileInfo.path(), backupPath, outputStream, backupStream);
|
restoreOriginalFileFromBackupFile(fileInfo.path(), backupPath, outputStream, backupStream);
|
||||||
diag.emplace_back(DiagLevel::Information, "The original file has been restored.", context);
|
diag.emplace_back(DiagLevel::Information, "The original file has been restored.", context);
|
||||||
|
@ -289,7 +289,7 @@ void handleFailureAfterFileModified(MediaFileInfo &fileInfo, const std::string &
|
||||||
diag.emplace_back(DiagLevel::Critical, catchIoFailure(), context);
|
diag.emplace_back(DiagLevel::Critical, catchIoFailure(), context);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
diag.emplace_back(DiagLevel::Critical, "An IO error occured when applying tag information.", context);
|
diag.emplace_back(DiagLevel::Critical, "An IO error occurred when applying tag information.", context);
|
||||||
}
|
}
|
||||||
throwIoFailure(what);
|
throwIoFailure(what);
|
||||||
}
|
}
|
||||||
|
|
|
@ -208,7 +208,7 @@ void EbmlElement::internalParse(Diagnostics &diag)
|
||||||
m_nextSibling.reset();
|
m_nextSibling.reset();
|
||||||
}
|
}
|
||||||
|
|
||||||
// no critical errors occured
|
// no critical errors occurred
|
||||||
// -> add a warning if bytes have been skipped
|
// -> add a warning if bytes have been skipped
|
||||||
if (skipped) {
|
if (skipped) {
|
||||||
diag.emplace_back(DiagLevel::Warning, argsToString(skipped, " bytes have been skipped"), parsingContext());
|
diag.emplace_back(DiagLevel::Warning, argsToString(skipped, " bytes have been skipped"), parsingContext());
|
||||||
|
@ -217,7 +217,7 @@ void EbmlElement::internalParse(Diagnostics &diag)
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// critical errors occured and skipping some bytes wasn't successful
|
// critical errors occurred and skipping some bytes wasn't successful
|
||||||
throw InvalidDataException();
|
throw InvalidDataException();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1478,7 +1478,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
|
||||||
throw;
|
throw;
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
const char *what = catchIoFailure();
|
const char *what = catchIoFailure();
|
||||||
diag.emplace_back(DiagLevel::Critical, "An IO error occured when parsing the original file.", context);
|
diag.emplace_back(DiagLevel::Critical, "An IO error occurred when parsing the original file.", context);
|
||||||
throwIoFailure(what);
|
throwIoFailure(what);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -1856,7 +1856,7 @@ void MatroskaContainer::internalMakeFile(Diagnostics &diag, AbortableProgressFee
|
||||||
// flush output stream
|
// flush output stream
|
||||||
outputStream.flush();
|
outputStream.flush();
|
||||||
|
|
||||||
// handle errors (which might have been occured after renaming/creating backup file)
|
// handle errors (which might have been occurred after renaming/creating backup file)
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
BackupHelper::handleFailureAfterFileModified(fileInfo(), backupPath, outputStream, backupStream, diag, context);
|
BackupHelper::handleFailureAfterFileModified(fileInfo(), backupPath, outputStream, backupStream, diag, context);
|
||||||
}
|
}
|
||||||
|
|
|
@ -36,9 +36,9 @@ DECLARE_ENUM_CLASS(TagType, unsigned int);
|
||||||
*/
|
*/
|
||||||
enum class ParsingStatus : byte {
|
enum class ParsingStatus : byte {
|
||||||
NotParsedYet, /**< the part has not been parsed yet */
|
NotParsedYet, /**< the part has not been parsed yet */
|
||||||
Ok, /**< the part has been parsed and no critical errors occured */
|
Ok, /**< the part has been parsed and no critical errors occurred */
|
||||||
NotSupported, /**< tried to parse the part, but the format is not supported */
|
NotSupported, /**< tried to parse the part, but the format is not supported */
|
||||||
CriticalFailure /**< tried to parse the part, but critical errors occured */
|
CriticalFailure /**< tried to parse the part, but critical errors occurred */
|
||||||
};
|
};
|
||||||
|
|
||||||
class TAG_PARSER_EXPORT MediaFileInfo : public BasicFileInfo {
|
class TAG_PARSER_EXPORT MediaFileInfo : public BasicFileInfo {
|
||||||
|
|
|
@ -859,7 +859,7 @@ calculatePadding:
|
||||||
// flush output stream
|
// flush output stream
|
||||||
outputStream.flush();
|
outputStream.flush();
|
||||||
|
|
||||||
// handle errors (which might have been occured after renaming/creating backup file)
|
// handle errors (which might have been occurred after renaming/creating backup file)
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
BackupHelper::handleFailureAfterFileModified(fileInfo(), backupPath, outputStream, backupStream, diag, context);
|
BackupHelper::handleFailureAfterFileModified(fileInfo(), backupPath, outputStream, backupStream, diag, context);
|
||||||
}
|
}
|
||||||
|
|
|
@ -218,7 +218,7 @@ void OggIterator::ignore(size_t count)
|
||||||
* This allows to omit parts of a file which is useful to
|
* This allows to omit parts of a file which is useful to
|
||||||
* - find the last page faster by skipping pages in the middle (last page is required for calculating
|
* - find the last page faster by skipping pages in the middle (last page is required for calculating
|
||||||
* the files duration).
|
* the files duration).
|
||||||
* - recover parsing after after an error occured.
|
* - recover parsing after after an error occurred.
|
||||||
*
|
*
|
||||||
* Regardless of the current iterator position, this method will assume the page at \a offset comes after
|
* Regardless of the current iterator position, this method will assume the page at \a offset comes after
|
||||||
* the last known page. Hence \a offset must be greather than OggPage::startOffset() + OggPage::totalSize() of the
|
* the last known page. Hence \a offset must be greather than OggPage::startOffset() + OggPage::totalSize() of the
|
||||||
|
|
|
@ -124,6 +124,7 @@ inform "Creating further testfiles with mkvmerge"
|
||||||
--default-track '1:yes' \
|
--default-track '1:yes' \
|
||||||
\( 'mtx-test-data/mkv/tags.mkv' \) \
|
\( 'mtx-test-data/mkv/tags.mkv' \) \
|
||||||
--global-tags "$srcdir/testfiles/mkv/nested-tags.xml" \
|
--global-tags "$srcdir/testfiles/mkv/nested-tags.xml" \
|
||||||
--track-order '0:0,0:1'
|
--track-order '0:0,0:1' \
|
||||||
|
|| inform "Skipping already existing mkv/nested-tags.mkv"
|
||||||
|
|
||||||
success "All testfiles downloaded/converted!"
|
success "All testfiles downloaded/converted!"
|
||||||
|
|
|
@ -396,7 +396,7 @@ void UtilitiesTests::testBackupFile()
|
||||||
catchIoFailure();
|
catchIoFailure();
|
||||||
}
|
}
|
||||||
CPPUNIT_ASSERT(diag.level() >= DiagLevel::Critical);
|
CPPUNIT_ASSERT(diag.level() >= DiagLevel::Critical);
|
||||||
CPPUNIT_ASSERT_EQUAL("An IO error occured when rewriting the file to apply changed tag information."s, diag.front().message());
|
CPPUNIT_ASSERT_EQUAL("An IO error occurred when rewriting the file to apply changed tag information."s, diag.front().message());
|
||||||
CPPUNIT_ASSERT_EQUAL("The original file has been restored."s, diag.back().message());
|
CPPUNIT_ASSERT_EQUAL("The original file has been restored."s, diag.back().message());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -92,7 +92,7 @@ template <class StreamType> void VorbisCommentField::internalParse(StreamType &s
|
||||||
throw InvalidDataException();
|
throw InvalidDataException();
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
catchIoFailure();
|
catchIoFailure();
|
||||||
diag.emplace_back(DiagLevel::Critical, "An IO error occured when reading the METADATA_BLOCK_PICTURE struct.", context);
|
diag.emplace_back(DiagLevel::Critical, "An IO error occurred when reading the METADATA_BLOCK_PICTURE struct.", context);
|
||||||
throw Failure();
|
throw Failure();
|
||||||
}
|
}
|
||||||
} else if (id().size() + 1 < size) {
|
} else if (id().size() + 1 < size) {
|
||||||
|
@ -196,7 +196,7 @@ bool VorbisCommentField::make(BinaryWriter &writer, VorbisCommentFlags flags, Di
|
||||||
throw;
|
throw;
|
||||||
} catch (...) {
|
} catch (...) {
|
||||||
catchIoFailure();
|
catchIoFailure();
|
||||||
diag.emplace_back(DiagLevel::Critical, "An IO error occured when writing the METADATA_BLOCK_PICTURE struct.", context);
|
diag.emplace_back(DiagLevel::Critical, "An IO error occurred when writing the METADATA_BLOCK_PICTURE struct.", context);
|
||||||
throw Failure();
|
throw Failure();
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
Loading…
Reference in New Issue