From 586b3cd04e0f2048e085b9a997f76b93ed953f7a Mon Sep 17 00:00:00 2001 From: erri120 Date: Thu, 20 Aug 2020 17:40:46 +0200 Subject: Added Open Meta File context action to downloads --- src/downloadmanager.cpp | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'src/downloadmanager.cpp') diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index 4defd96b..ce60c8e1 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1091,6 +1091,29 @@ void DownloadManager::openFile(int index) return; } +void DownloadManager::openMetaFile(int index) { + if (index < 0 || index >= m_ActiveDownloads.size()) { + reportError(tr("OpenMetaFile: invalid download index %1").arg(index)); + return; + } + + auto path = QDir(m_OutputDirectory); + auto metaPath = getFilePath(index) + ".meta"; + if (path.exists(metaPath)) { + shell::Open(metaPath); + return; + } + + auto info = m_ActiveDownloads[index]; + info->m_FileInfo->repository = "Nexus"; + + if (path.exists(metaPath)) { + shell::Open(metaPath); + } else { + shell::Explore(m_OutputDirectory); + } +} + void DownloadManager::openInDownloadsFolder(int index) { if ((index < 0) || (index >= m_ActiveDownloads.size())) { -- cgit v1.3.1 From 5a857be1e4388eb2500fe476a283f3794ee86761 Mon Sep 17 00:00:00 2001 From: erri120 Date: Thu, 20 Aug 2020 17:56:57 +0200 Subject: Create meta file if it does not exist when trying to open it --- src/downloadmanager.cpp | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src/downloadmanager.cpp') diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index ce60c8e1..9e1b682b 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1097,21 +1097,25 @@ void DownloadManager::openMetaFile(int index) { return; } - auto path = QDir(m_OutputDirectory); - auto metaPath = getFilePath(index) + ".meta"; + const auto path = QDir(m_OutputDirectory); + const auto filePath = getFilePath(index); + const auto metaPath = filePath + ".meta"; + if (path.exists(metaPath)) { shell::Open(metaPath); return; } - - auto info = m_ActiveDownloads[index]; - info->m_FileInfo->repository = "Nexus"; + else { + QSettings metaFile(metaPath, QSettings::IniFormat); + metaFile.setValue("removed", false); + } if (path.exists(metaPath)) { shell::Open(metaPath); - } else { - shell::Explore(m_OutputDirectory); + return; } + + shell::Explore(filePath); } void DownloadManager::openInDownloadsFolder(int index) -- cgit v1.3.1 From 9a9a2c5c6e72ce5e1e9b02a1e37460d05855f5af Mon Sep 17 00:00:00 2001 From: erri120 Date: Thu, 20 Aug 2020 21:19:59 +0200 Subject: Removed error log localization --- src/downloadmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/downloadmanager.cpp') diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index 9e1b682b..51821dbe 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1093,7 +1093,7 @@ void DownloadManager::openFile(int index) void DownloadManager::openMetaFile(int index) { if (index < 0 || index >= m_ActiveDownloads.size()) { - reportError(tr("OpenMetaFile: invalid download index %1").arg(index)); + reportError("OpenMetaFile: invalid download index "+index); return; } -- cgit v1.3.1 From 321b1facdcb6ddc0a1e2b4ce6cdf4cc9ebe6c18b Mon Sep 17 00:00:00 2001 From: erri120 Date: Thu, 20 Aug 2020 19:37:45 +0000 Subject: Updating error logging --- src/downloadmanager.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/downloadmanager.cpp') diff --git a/src/downloadmanager.cpp b/src/downloadmanager.cpp index 51821dbe..3e6010db 100644 --- a/src/downloadmanager.cpp +++ b/src/downloadmanager.cpp @@ -1093,7 +1093,7 @@ void DownloadManager::openFile(int index) void DownloadManager::openMetaFile(int index) { if (index < 0 || index >= m_ActiveDownloads.size()) { - reportError("OpenMetaFile: invalid download index "+index); + log::error("OpenMetaFile: invalid download index {}", index); return; } -- cgit v1.3.1