From d31fd79e8752ef08f0f31fe7c34fb0f656a4d369 Mon Sep 17 00:00:00 2001 From: Martchus Date: Fri, 23 Apr 2021 22:18:30 +0200 Subject: [PATCH] Adapt to changes in tagparser library --- cli/mainfeatures.cpp | 22 +++++++++++----------- gui/mainwindow.cpp | 2 +- gui/picturepreviewselection.cpp | 6 +++--- gui/tageditorwidget.cpp | 2 +- renamingutility/tageditorobject.cpp | 2 +- tests/cli.cpp | 2 +- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/cli/mainfeatures.cpp b/cli/mainfeatures.cpp index aebf50d..3a5b2e1 100644 --- a/cli/mainfeatures.cpp +++ b/cli/mainfeatures.cpp @@ -103,21 +103,21 @@ void generateFileInfo(const ArgumentOccurrence &, const Argument &inputFileArg, #if defined(TAGEDITOR_GUI_QTWIDGETS) || defined(TAGEDITOR_GUI_QTQUICK) try { // parse tags - MediaFileInfo inputFileInfo(inputFileArg.values().front()); + auto inputFileInfo = MediaFileInfo(std::string(inputFileArg.values().front())); inputFileInfo.setForceFullParse(validateArg.isPresent()); inputFileInfo.open(true); - Diagnostics diag; - AbortableProgressFeedback progress; // FIXME: actually use the progress object + auto diag = Diagnostics(); + auto progress = AbortableProgressFeedback(); // FIXME: actually use the progress object inputFileInfo.parseEverything(diag, progress); // generate and save info - Diagnostics diagReparsing; + auto diagReparsing = Diagnostics(); (outputFileArg.isPresent() ? cout : cerr) << "Saving file info for \"" << inputFileArg.values().front() << "\" ..." << endl; if (!outputFileArg.isPresent()) { cout << HtmlInfo::generateInfo(inputFileInfo, diag, diagReparsing).data() << endl; return; } - QFile file(fromNativeFileName(outputFileArg.values().front())); + auto file = QFile(fromNativeFileName(outputFileArg.values().front())); if (file.open(QFile::WriteOnly) && file.write(HtmlInfo::generateInfo(inputFileInfo, diag, diagReparsing)) && file.flush()) { cout << "File information has been saved to \"" << outputFileArg.values().front() << "\"." << endl; } else { @@ -152,7 +152,7 @@ void displayFileInfo(const ArgumentOccurrence &, const Argument &filesArg, const AbortableProgressFeedback progress; // FIXME: actually use the progress object try { // parse tags - fileInfo.setPath(file); + fileInfo.setPath(std::string(file)); fileInfo.open(true); fileInfo.parseContainerFormat(diag, progress); fileInfo.parseEverything(diag, progress); @@ -336,7 +336,7 @@ void displayTagInfo(const Argument &fieldsArg, const Argument &showUnsupportedAr AbortableProgressFeedback progress; // FIXME: actually use the progress object try { // parse tags - fileInfo.setPath(file); + fileInfo.setPath(std::string(file)); fileInfo.open(true); fileInfo.parseContainerFormat(diag, progress); fileInfo.parseTags(diag, progress); @@ -498,7 +498,7 @@ void setTagInfo(const SetTagInfoArgs &args) // set backup path if (args.backupDirArg.isPresent()) { - fileInfo.setBackupDirectory(args.backupDirArg.values().front()); + fileInfo.setBackupDirectory(std::string(args.backupDirArg.values().front())); } // iterate through all specified files @@ -510,7 +510,7 @@ void setTagInfo(const SetTagInfoArgs &args) try { // parse tags and tracks (tracks are relevent because track meta-data such as language can be changed as well) cout << TextAttribute::Bold << "Setting tag information for \"" << file << "\" ..." << Phrases::EndFlush; - fileInfo.setPath(file); + fileInfo.setPath(std::string(file)); fileInfo.parseContainerFormat(diag, parsingProgress); fileInfo.parseTags(diag, parsingProgress); fileInfo.parseTracks(diag, parsingProgress); @@ -808,7 +808,7 @@ void extractField( AbortableProgressFeedback progress; // FIXME: actually use the progress object try { // setup media file info - inputFileInfo.setPath(file); + inputFileInfo.setPath(std::string(file)); inputFileInfo.open(true); // extract either tag field or attachment @@ -949,7 +949,7 @@ void exportToJson(const ArgumentOccurrence &, const Argument &filesArg, const Ar for (const char *file : filesArg.values()) { try { // parse tags - fileInfo.setPath(file); + fileInfo.setPath(std::string(file)); fileInfo.open(true); fileInfo.parseContainerFormat(diag, progress); fileInfo.parseTags(diag, progress); diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp index 32de070..063c582 100644 --- a/gui/mainwindow.cpp +++ b/gui/mainwindow.cpp @@ -523,7 +523,7 @@ void MainWindow::showSaveAsDlg() const QString path = QFileDialog::getSaveFileName(this, tr("Save changes as - ") + QCoreApplication::applicationName(), m_ui->tagEditorWidget->currentDir()); if (!path.isEmpty()) { - m_ui->tagEditorWidget->fileInfo().setSaveFilePath(toNativeFileName(path).data()); + m_ui->tagEditorWidget->fileInfo().setSaveFilePath(std::string(toNativeFileName(path).data())); m_ui->tagEditorWidget->applyEntriesAndSaveChangings(); } } diff --git a/gui/picturepreviewselection.cpp b/gui/picturepreviewselection.cpp index 87d09be..3a76267 100644 --- a/gui/picturepreviewselection.cpp +++ b/gui/picturepreviewselection.cpp @@ -416,9 +416,9 @@ void PicturePreviewSelection::addOfSelectedType(const QString &path) assert(m_currentTypeIndex < m_values.size()); TagValue &selectedCover = m_values[m_currentTypeIndex]; try { - MediaFileInfo fileInfo(toNativeFileName(path).constData()); - Diagnostics diag; // FIXME: show diagnostic messages - AbortableProgressFeedback progress; // FIXME: actually use the progress object + auto fileInfo = MediaFileInfo(std::string_view(toNativeFileName(path).constData())); + auto diag = Diagnostics(); // FIXME: show diagnostic messages + auto progress = AbortableProgressFeedback(); // FIXME: actually use the progress object fileInfo.open(true); fileInfo.parseContainerFormat(diag, progress); diff --git a/gui/tageditorwidget.cpp b/gui/tageditorwidget.cpp index 8a8911f..739c969 100644 --- a/gui/tageditorwidget.cpp +++ b/gui/tageditorwidget.cpp @@ -823,7 +823,7 @@ bool TagEditorWidget::startParsing(const QString &path, bool forceRefresh) // set path of file info m_currentPath = path; m_fileInfo.setSaveFilePath(string()); - m_fileInfo.setPath(toNativeFileName(path).data()); + m_fileInfo.setPath(std::string(toNativeFileName(path).data())); // update file name and directory const QFileInfo fileInfo(path); m_lastDir = m_currentDir; diff --git a/renamingutility/tageditorobject.cpp b/renamingutility/tageditorobject.cpp index b4275eb..71ac978 100644 --- a/renamingutility/tageditorobject.cpp +++ b/renamingutility/tageditorobject.cpp @@ -145,7 +145,7 @@ TAGEDITOR_JS_VALUE TagEditorObject::parseFileInfo(const QString &fileName) { Diagnostics diag; AbortableProgressFeedback progress; // FIXME: actually use the progress object - MediaFileInfo fileInfo(toNativeFileName(fileName).data()); + MediaFileInfo fileInfo(std::string(toNativeFileName(fileName).data())); // add basic file information auto fileInfoObject = m_engine->newObject(); diff --git a/tests/cli.cpp b/tests/cli.cpp index 315f957..9da8fd1 100644 --- a/tests/cli.cpp +++ b/tests/cli.cpp @@ -902,7 +902,7 @@ void CliTests::testExtraction() TESTUTILS_ASSERT_EXEC(args1); Diagnostics diag; AbortableProgressFeedback progress; - MediaFileInfo extractedInfo("/tmp/extracted.jpeg"); + MediaFileInfo extractedInfo("/tmp/extracted.jpeg"sv); extractedInfo.open(true); extractedInfo.parseContainerFormat(diag, progress); CPPUNIT_ASSERT_EQUAL(static_cast(22771), extractedInfo.size());