Move old radio and attachment diagnostics out of debug
This commit is contained in:
1 parent
5dea9394bf
commit
5b78ec04f6
2 files changed
+25
-25
No files matched your search
@@ -40,7 +40,7 @@ void MediaBlockReader::initFromAttrs(const QString& mediaDir,
|
||||
for (const auto& v : bl) m_blocks.append(v.toInt());
|
||||
m_complete = (m_blocks.size() == totalBlocks);
|
||||
}
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "MediaBlockReader: mode=%s complete=%d path=%s blocks=%d/%d",
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_MEDIA, "MediaBlockReader: mode=%s complete=%d path=%s blocks=%d/%d",
|
||||
m_mode == SINGLE_FILE ? "single" : "frag", m_complete,
|
||||
qPrintable(debugPath()), m_blocks.size(), totalBlocks);
|
||||
}
|
||||
@@ -53,7 +53,7 @@ MediaBlockReader MediaBlockReader::fromLegacyFile(const QString& filePath) {
|
||||
QFileInfo fi(filePath);
|
||||
r.m_fileSize = fi.size();
|
||||
r.m_complete = fi.exists() && r.m_fileSize > 0;
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "MediaBlockReader: legacy file=%s size=%lld valid=%d",
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_MEDIA, "MediaBlockReader: legacy file=%s size=%lld valid=%d",
|
||||
qPrintable(filePath), (long long)r.m_fileSize, r.m_valid);
|
||||
return r;
|
||||
}
|
||||
@@ -72,14 +72,14 @@ QString MediaBlockReader::blockFilePath(int n) const {
|
||||
|
||||
QByteArray MediaBlockReader::readAll() {
|
||||
if (!m_valid || !m_complete || m_mode == NONE) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "MediaBlockReader::readAll: invalid/incomplete");
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "MediaBlockReader::readAll: invalid/incomplete");
|
||||
return {};
|
||||
}
|
||||
|
||||
if (m_mode == SINGLE_FILE) {
|
||||
QFile f(m_filePath);
|
||||
if (!f.open(QIODevice::ReadOnly)) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "MediaBlockReader::readAll: cannot open %s", qPrintable(m_filePath));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "MediaBlockReader::readAll: cannot open %s", qPrintable(m_filePath));
|
||||
return {};
|
||||
}
|
||||
QByteArray data = f.readAll();
|
||||
@@ -94,7 +94,7 @@ QByteArray MediaBlockReader::readAll() {
|
||||
QString path = blockFilePath(n);
|
||||
QFile f(path);
|
||||
if (!f.open(QIODevice::ReadOnly)) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "MediaBlockReader::readAll: cannot open block %d: %s", n, qPrintable(path));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "MediaBlockReader::readAll: cannot open block %d: %s", n, qPrintable(path));
|
||||
return {};
|
||||
}
|
||||
qint64 sz = blockSizeForN(n);
|
||||
@@ -168,7 +168,7 @@ bool MediaBlockReader::saveToFile(const QString& destPath) {
|
||||
QFile f(destPath);
|
||||
if (!f.open(QIODevice::WriteOnly)) return false;
|
||||
f.write(data);
|
||||
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "MediaBlockReader: saved to %s (%lld bytes)", qPrintable(destPath), (long long)data.size());
|
||||
DEBUG_INFO(DEBUG_CATEGORY_MEDIA, "MediaBlockReader: saved to %s (%lld bytes)", qPrintable(destPath), (long long)data.size());
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -180,7 +180,7 @@ QString MediaBlockReader::assembleAndCleanup() {
|
||||
|
||||
QFile af(assembledPath);
|
||||
if (!af.open(QIODevice::WriteOnly)) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "MediaBlockReader::assemble: cannot create %s", qPrintable(assembledPath));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "MediaBlockReader::assemble: cannot create %s", qPrintable(assembledPath));
|
||||
return {};
|
||||
}
|
||||
|
||||
@@ -200,7 +200,7 @@ QString MediaBlockReader::assembleAndCleanup() {
|
||||
m_filePath = assembledPath;
|
||||
m_fileSize = m_totalSize;
|
||||
m_blocks.clear();
|
||||
DEBUG_INFO(DEBUG_CATEGORY_DEBUG, "MediaBlockReader: assembled %s", qPrintable(assembledPath));
|
||||
DEBUG_INFO(DEBUG_CATEGORY_MEDIA, "MediaBlockReader: assembled %s", qPrintable(assembledPath));
|
||||
return assembledPath;
|
||||
}
|
||||
|
||||
@@ -238,13 +238,13 @@ MediaBlockInfo media_split_to_blocks(const QString& srcFile,
|
||||
MediaBlockInfo info;
|
||||
QFileInfo fi(srcFile);
|
||||
if (!fi.exists()) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "media_split_to_blocks: src not found: %s", qPrintable(srcFile));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "media_split_to_blocks: src not found: %s", qPrintable(srcFile));
|
||||
return info;
|
||||
}
|
||||
|
||||
info.fileSize = fi.size();
|
||||
if (info.fileSize == 0) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "media_split_to_blocks: empty file: %s", qPrintable(srcFile));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "media_split_to_blocks: empty file: %s", qPrintable(srcFile));
|
||||
return info;
|
||||
}
|
||||
|
||||
@@ -262,7 +262,7 @@ MediaBlockInfo media_split_to_blocks(const QString& srcFile,
|
||||
|
||||
QFile src(srcFile);
|
||||
if (!src.open(QIODevice::ReadOnly)) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "media_split_to_blocks: cannot open src: %s", qPrintable(srcFile));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "media_split_to_blocks: cannot open src: %s", qPrintable(srcFile));
|
||||
return info;
|
||||
}
|
||||
|
||||
@@ -273,7 +273,7 @@ MediaBlockInfo media_split_to_blocks(const QString& srcFile,
|
||||
.arg(mediaDir, info.dt).arg(n).arg(info.basename, info.suffix, info.ext);
|
||||
QFile dst(path);
|
||||
if (!dst.open(QIODevice::WriteOnly)) {
|
||||
DEBUG_WARN(DEBUG_CATEGORY_DEBUG, "media_split_to_blocks: cannot create block %d: %s", n, qPrintable(path));
|
||||
DEBUG_WARN(DEBUG_CATEGORY_MEDIA, "media_split_to_blocks: cannot create block %d: %s", n, qPrintable(path));
|
||||
src.close(); return info;
|
||||
}
|
||||
dst.write(src.read(chunk));
|
||||
@@ -284,7 +284,7 @@ MediaBlockInfo media_split_to_blocks(const QString& srcFile,
|
||||
|
||||
if (removeSrc) QFile::remove(srcFile);
|
||||
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_DEBUG, "media_split_to_blocks: %s -> %d blocks (%lld bytes each) in %s",
|
||||
DEBUG_DEBUG(DEBUG_CATEGORY_MEDIA, "media_split_to_blocks: %s -> %d blocks (%lld bytes each) in %s",
|
||||
qPrintable(fi.fileName()), info.numBlocks, (long long)info.blockSize, qPrintable(mediaDir));
|
||||
return info;
|
||||
}
|
||||
Reference in new issue
Block a user