d3v1l/matrixion
1
0
Fork 0
mirror of https://github.com/Nheko-Reborn/nheko.git synced 2024-11-22 11:00:48 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix adding duplicate stickers and strip file extension

Browse source
This commit is contained in:
Nicolas Werner 2023-05-19 22:39:03 +02:00
parent ab5f176de0
commit 4bf725379a
No known key found for this signature in database
GPG key ID: C8D75E610773F2D9
3 changed files with 32 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
resources/qml/dialogs/ImagePackEditorDialog.qml
View file

@ -255,8 +255,13 @@ ApplicationWindow {
Layout.fillWidth: true Layout.fillWidth: true
Layout.columnSpan: 2 Layout.columnSpan: 2
label: qsTr("Shortcode") label: qsTr("Shortcode")
text: imagePack.data(imagePack.index(currentImageIndex, 0), SingleImagePackModel.ShortCode) property int bindingCounter: 0
onTextEdited: imagePack.setData(imagePack.index(currentImageIndex, 0), text, SingleImagePackModel.ShortCode) text: bindingCounter, imagePack.data(imagePack.index(currentImageIndex, 0), SingleImagePackModel.ShortCode)
onTextEdited: {
imagePack.setData(imagePack.index(currentImageIndex, 0), text, SingleImagePackModel.ShortCode);
// force text field to update in case the model disagreed with the new value.
bindingCounter++;
}
} }
MatrixTextField { MatrixTextField {

29
src/SingleImagePackModel.cpp
View file

@ -5,6 +5,7 @@
#include "SingleImagePackModel.h" #include "SingleImagePackModel.h"
#include <QFile> #include <QFile>
#include <QFileInfo>
#include <QMimeDatabase> #include <QMimeDatabase>
#include <mtx/responses/media.hpp> #include <mtx/responses/media.hpp>
@ -93,8 +94,7 @@ SingleImagePackModel::setData(const QModelIndex &index, const QVariant &value, i
auto newCode = value.toString().toStdString(); auto newCode = value.toString().toStdString();
// otherwise we delete this by accident // otherwise we delete this by accident
if (pack.images.count(newCode)) newCode = unconflictingShortcode(newCode);
return false;
auto tmp = img; auto tmp = img;
auto oldCode = shortcodes.at(index.row()); auto oldCode = shortcodes.at(index.row());
@ -336,11 +336,12 @@ SingleImagePackModel::addStickers(QList<QUrl> files)
info.mimetype = QMimeDatabase().mimeTypeForFile(f.toLocalFile()).name().toStdString(); info.mimetype = QMimeDatabase().mimeTypeForFile(f.toLocalFile()).name().toStdString();
auto filename = f.fileName().toStdString(); auto filename = f.fileName().toStdString();
auto basename = QFileInfo(file).baseName().toStdString();
http::client()->upload( http::client()->upload(
bytes.toStdString(), bytes.toStdString(),
QMimeDatabase().mimeTypeForFile(f.toLocalFile()).name().toStdString(), QMimeDatabase().mimeTypeForFile(f.toLocalFile()).name().toStdString(),
filename, filename,
[this, filename, info](const mtx::responses::ContentURI &uri, mtx::http::RequestErr e) { [this, basename, info](const mtx::responses::ContentURI &uri, mtx::http::RequestErr e) {
if (e) { if (e) {
ChatPage::instance()->showNotification( ChatPage::instance()->showNotification(
tr("Failed to upload image: %1") tr("Failed to upload image: %1")
@ -348,7 +349,7 @@ SingleImagePackModel::addStickers(QList<QUrl> files)
return; return;
} }
emit addImage(uri.content_uri, filename, info); emit addImage(uri.content_uri, basename, info);
}); });
} }
} }
@ -393,6 +394,20 @@ SingleImagePackModel::remove(int idx)
} }
} }
std::string
SingleImagePackModel::unconflictingShortcode(const std::string &shortcode)
{
if (pack.images.count(shortcode)) {
for (int i = 0; i < 64'000; i++) {
auto tempCode = shortcode + std::to_string(i);
if (!pack.images.count(tempCode)) {
return tempCode;
}
}
}
return shortcode;
}
void void
SingleImagePackModel::addImageCb(std::string uri, std::string filename, mtx::common::ImageInfo info) SingleImagePackModel::addImageCb(std::string uri, std::string filename, mtx::common::ImageInfo info)
{ {
@ -402,8 +417,10 @@ SingleImagePackModel::addImageCb(std::string uri, std::string filename, mtx::com
beginInsertRows( beginInsertRows(
QModelIndex(), static_cast<int>(shortcodes.size()), static_cast<int>(shortcodes.size())); QModelIndex(), static_cast<int>(shortcodes.size()), static_cast<int>(shortcodes.size()));
pack.images[filename] = img; auto shortcode = unconflictingShortcode(filename);
shortcodes.push_back(filename);
pack.images[shortcode] = img;
shortcodes.push_back(shortcode);
endInsertRows(); endInsertRows();

2
src/SingleImagePackModel.h
View file

@ -87,6 +87,8 @@ private slots:
void addImageCb(std::string uri, std::string filename, mtx::common::ImageInfo info); void addImageCb(std::string uri, std::string filename, mtx::common::ImageInfo info);
private: private:
std::string unconflictingShortcode(const std::string &shortcode);
std::string roomid_; std::string roomid_;
std::string statekey_, old_statekey_; std::string statekey_, old_statekey_;