diff options
Diffstat (limited to 'src/multimedia/qmediastoragelocation.cpp')
| -rw-r--r-- | src/multimedia/qmediastoragelocation.cpp | 161 |
1 files changed, 51 insertions, 110 deletions
diff --git a/src/multimedia/qmediastoragelocation.cpp b/src/multimedia/qmediastoragelocation.cpp index c77ad5dba..61c4061f4 100644 --- a/src/multimedia/qmediastoragelocation.cpp +++ b/src/multimedia/qmediastoragelocation.cpp @@ -1,145 +1,86 @@ -/**************************************************************************** -** -** Copyright (C) 2016 The Qt Company Ltd. -** Contact: https://www.qt.io/licensing/ -** -** This file is part of the Qt Toolkit. -** -** $QT_BEGIN_LICENSE:LGPL$ -** Commercial License Usage -** Licensees holding valid commercial Qt licenses may use this file in -** accordance with the commercial license agreement provided with the -** Software or, alternatively, in accordance with the terms contained in -** a written agreement between you and The Qt Company. For licensing terms -** and conditions see https://www.qt.io/terms-conditions. For further -** information use the contact form at https://www.qt.io/contact-us. -** -** GNU Lesser General Public License Usage -** Alternatively, this file may be used under the terms of the GNU Lesser -** General Public License version 3 as published by the Free Software -** Foundation and appearing in the file LICENSE.LGPL3 included in the -** packaging of this file. Please review the following information to -** ensure the GNU Lesser General Public License version 3 requirements -** will be met: https://www.gnu.org/licenses/lgpl-3.0.html. -** -** GNU General Public License Usage -** Alternatively, this file may be used under the terms of the GNU -** General Public License version 2.0 or (at your option) the GNU General -** Public license version 3 or any later version approved by the KDE Free -** Qt Foundation. The licenses are as published by the Free Software -** Foundation and appearing in the file LICENSE.GPL2 and LICENSE.GPL3 -** included in the packaging of this file. Please review the following -** information to ensure the GNU General Public License requirements will -** be met: https://www.gnu.org/licenses/gpl-2.0.html and -** https://www.gnu.org/licenses/gpl-3.0.html. -** -** $QT_END_LICENSE$ -** -****************************************************************************/ +// Copyright (C) 2021 The Qt Company Ltd. +// SPDX-License-Identifier: LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only #include "qmediastoragelocation_p.h" #include <QStandardPaths> +#include <QUrl> QT_BEGIN_NAMESPACE -QMediaStorageLocation::QMediaStorageLocation() -{ -} - -void QMediaStorageLocation::addStorageLocation(MediaType type, const QString &location) -{ - m_customLocations[type].append(location); -} - -QDir QMediaStorageLocation::defaultLocation(MediaType type) const +QDir QMediaStorageLocation::defaultDirectory(QStandardPaths::StandardLocation type) { QStringList dirCandidates; - dirCandidates << m_customLocations.value(type); - - switch (type) { - case Movies: - dirCandidates << QStandardPaths::writableLocation(QStandardPaths::MoviesLocation); - break; - case Music: - dirCandidates << QStandardPaths::writableLocation(QStandardPaths::MusicLocation); - break; - case Pictures: - dirCandidates << QStandardPaths::writableLocation(QStandardPaths::PicturesLocation); - default: - break; - } +#if QT_CONFIG(mmrenderer) + dirCandidates << QLatin1String("shared/camera"); +#endif + dirCandidates << QStandardPaths::writableLocation(type); + dirCandidates << QStandardPaths::writableLocation(QStandardPaths::DocumentsLocation); dirCandidates << QDir::homePath(); dirCandidates << QDir::currentPath(); dirCandidates << QDir::tempPath(); - for (const QString &path : qAsConst(dirCandidates)) { - if (QFileInfo(path).isWritable()) - return QDir(path); + for (const QString &path : std::as_const(dirCandidates)) { + QDir dir(path); + if (dir.exists() && QFileInfo(path).isWritable()) + return dir; } return QDir(); } -QString QMediaStorageLocation::generateFileName(const QString &requestedName, - MediaType type, - const QString &prefix, - const QString &extension) const +static QString generateFileName(const QDir &dir, const QString &prefix, const QString &extension) { - if (requestedName.isEmpty()) - return generateFileName(prefix, defaultLocation(type), extension); + auto lastMediaIndex = 0; + const auto list = dir.entryList({ QStringLiteral("%1*.%2").arg(prefix, extension) }); + for (const QString &fileName : list) { + auto mediaIndex = QStringView{fileName}.mid(prefix.size(), fileName.size() - prefix.size() - extension.size() - 1).toInt(); + lastMediaIndex = qMax(lastMediaIndex, mediaIndex); + } - QString path = requestedName; + const QString name = QStringLiteral("%1%2.%3") + .arg(prefix) + .arg(lastMediaIndex + 1, 4, 10, QLatin1Char('0')) + .arg(extension); - if (QFileInfo(path).isRelative()) - path = defaultLocation(type).absoluteFilePath(path); + return dir.absoluteFilePath(name); +} - if (QFileInfo(path).isDir()) - return generateFileName(prefix, QDir(path), extension); - if (!path.endsWith(extension)) - path.append(QString(QLatin1String(".%1")).arg(extension)); +QString QMediaStorageLocation::generateFileName(const QString &requestedName, + QStandardPaths::StandardLocation type, + const QString &extension) +{ + using namespace Qt::StringLiterals; - return path; -} + if (QUrl(requestedName).scheme() == "content"_L1) + return requestedName; -QString QMediaStorageLocation::generateFileName(const QString &prefix, - const QDir &dir, - const QString &extension) const -{ - QMutexLocker lock(&m_mutex); - - const QString lastMediaKey = dir.absolutePath() + QLatin1Char(' ') + prefix + QLatin1Char(' ') + extension; - qint64 lastMediaIndex = m_lastUsedIndex.value(lastMediaKey, 0); - - if (lastMediaIndex == 0) { - // first run, find the maximum media number during the fist capture - const auto list = dir.entryList(QStringList() << QString(QLatin1String("%1*.%2")).arg(prefix).arg(extension)); - for (const QString &fileName : list) { - const qint64 mediaIndex = QStringView{fileName}.mid(prefix.length(), fileName.size() - prefix.length() - extension.length() - 1).toInt(); - lastMediaIndex = qMax(lastMediaIndex, mediaIndex); - } + auto prefix = "clip_"_L1; + switch (type) { + case QStandardPaths::PicturesLocation: prefix = "image_"_L1; break; + case QStandardPaths::MoviesLocation: prefix = "video_"_L1; break; + case QStandardPaths::MusicLocation: prefix = "record_"_L1; break; + default: break; } - // don't just rely on cached lastMediaIndex value, - // someone else may create a file after camera started - while (true) { - const QString name = QString(QLatin1String("%1%2.%3")).arg(prefix) - .arg(lastMediaIndex + 1, 8, 10, QLatin1Char('0')) - .arg(extension); + if (requestedName.isEmpty()) + return generateFileName(defaultDirectory(type), prefix, extension); - const QString path = dir.absoluteFilePath(name); - if (!QFileInfo::exists(path)) { - m_lastUsedIndex[lastMediaKey] = lastMediaIndex + 1; - return path; - } + QString path = requestedName; - lastMediaIndex++; - } + if (QFileInfo(path).isRelative() && QUrl(path).isRelative()) + path = defaultDirectory(type).absoluteFilePath(path); + + if (QFileInfo(path).isDir()) + return generateFileName(QDir(path), prefix, extension); - return QString(); + if (!path.endsWith(extension)) + path.append(QStringLiteral(".%1").arg(extension)); + + return path; } QT_END_NAMESPACE |