Skip to content

Commit e61d5ae

Browse files
setvisiblesetvisible
committed
Merge branch 'improve-ui' into develop
2 parents 904de48 + ba143e0 commit e61d5ae

File tree

84 files changed

+5589
-7409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+5589
-7409
lines changed

‎installer/windows/NSIS/i18n/sources/nl.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,5 +8,5 @@
88
"DESC_LauncherSession": "Launcher (required)",
99
"DESC_StartMenuGroupSession": "Start Menu Shortcut",
1010
"DESC_DesktopShortcutSession": "Desktop Shortcut",
11-
"DESC_VisitWebSite": "Visit our website:"
11+
"DESC_VisitWebSite": "Bezoek onze website:"
1212
}

‎src/constants.h‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ const std::chrono::milliseconds TIMEOUT_STATUSBAR_LONG(5000);
3434
const int DIALOG_WIDTH = 600;
3535

3636
const int DEFAULT_TIMEOUT_SECS = 30; // ref.: QNetworkConfigurationPrivate::DefaultTimeout
37-
const int DEFAULT_CONCURRENT_FRAGMENTS = 20;
38-
39-
const int MAX_CONNECTION_SEGMENTS = 10;
4037

4138
const std::chrono::milliseconds TIMEOUT_COUNT_DOWN(1000);
4239
const std::chrono::milliseconds TIMEOUT_INFO(150);
@@ -192,7 +189,6 @@ const QLatin1StringView REGISTRY_STREAM_SHORTCUT ("StreamShortcutEnabled");
192189

193190
// Tab Network
194191
const QLatin1StringView REGISTRY_MAX_SIMULTANEOUS ("MaxSimultaneous");
195-
const QLatin1StringView REGISTRY_CONCURRENT_FRAG ("ConcurrentFragments");
196192
const QLatin1StringView REGISTRY_CUSTOM_BATCH ("CustomBatchEnabled");
197193
const QLatin1StringView REGISTRY_CUSTOM_BATCH_BL ("CustomBatchButtonLabel");
198194
const QLatin1StringView REGISTRY_CUSTOM_BATCH_RGE ("CustomBatchRange");

‎src/core/abstractdownloaditem.cpp‎

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,20 +159,6 @@ void AbstractDownloadItem::setErrorMessage(const QString &message)
159159
m_errorMessage = message;
160160
}
161161

162-
/******************************************************************************
163-
******************************************************************************/
164-
int AbstractDownloadItem::maxConnectionSegments() const
165-
{
166-
return m_maxConnectionSegments;
167-
}
168-
169-
void AbstractDownloadItem::setMaxConnectionSegments(int connectionSegments)
170-
{
171-
if (connectionSegments > 0 && connectionSegments <= MAX_CONNECTION_SEGMENTS) {
172-
m_maxConnectionSegments = connectionSegments;
173-
}
174-
}
175-
176162
/******************************************************************************
177163
******************************************************************************/
178164
int AbstractDownloadItem::maxConnections() const
@@ -357,6 +343,11 @@ void AbstractDownloadItem::rename(const QString &newName)
357343
Q_UNUSED(newName)
358344
}
359345

346+
void AbstractDownloadItem::moveToTrash()
347+
{
348+
// do nothing
349+
}
350+
360351
/******************************************************************************
361352
******************************************************************************/
362353
void AbstractDownloadItem::updateInfo(qsizetype bytesReceived, qsizetype bytesTotal)

‎src/core/abstractdownloaditem.h‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,6 @@ class AbstractDownloadItem : public QObject, public IDownloadItem
5252
QString errorMessage() const;
5353
void setErrorMessage(const QString &message);
5454

55-
int maxConnectionSegments() const override;
56-
void setMaxConnectionSegments(int connectionSegments);
57-
5855
int maxConnections() const override;
5956
void setMaxConnections(int connections);
6057

@@ -82,6 +79,7 @@ class AbstractDownloadItem : public QObject, public IDownloadItem
8279
void finish();
8380

8481
virtual void rename(const QString &newName);
82+
virtual void moveToTrash();
8583

8684
signals:
8785
void changed();

‎src/core/downloadengine.cpp‎

Lines changed: 17 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -158,6 +158,23 @@ void DownloadEngine::updateItems(const QList<IDownloadItem *> &items)
158158
}
159159
}
160160

161+
void DownloadEngine::movetoTrash(const QList<IDownloadItem*> &items)
162+
{
163+
if (items.isEmpty()) {
164+
return;
165+
}
166+
/* Then, move to trash */
167+
for (auto item : items) {
168+
cancel(item); // stop the reply first
169+
m_items.removeAll(item);
170+
auto downloadItem = dynamic_cast<AbstractDownloadItem*>(item);
171+
if (downloadItem) {
172+
downloadItem->moveToTrash();
173+
}
174+
}
175+
removeItems(items);
176+
}
177+
161178
/******************************************************************************
162179
******************************************************************************/
163180
const IDownloadItem* DownloadEngine::clientForRow(qsizetype row) const
@@ -199,22 +216,12 @@ static inline QList<IDownloadItem*> filter(const QList<IDownloadItem*> &items,
199216
return list;
200217
}
201218

202-
QList<IDownloadItem*> DownloadEngine::waitingJobs() const
203-
{
204-
return filter(m_items, {IDownloadItem::Idle});
205-
}
206-
207219
QList<IDownloadItem*> DownloadEngine::completedJobs() const
208220
{
209221
return filter(m_items, {IDownloadItem::Completed,
210222
IDownloadItem::Seeding});
211223
}
212224

213-
QList<IDownloadItem*> DownloadEngine::pausedJobs() const
214-
{
215-
return filter(m_items, {IDownloadItem::Paused});
216-
}
217-
218225
QList<IDownloadItem*> DownloadEngine::failedJobs() const
219226
{
220227
return filter(m_items, {IDownloadItem::Stopped,
@@ -452,28 +459,6 @@ void DownloadEngine::moveCurrentBottom()
452459
moveDownTo(targetIndex);
453460
}
454461

455-
/******************************************************************************
456-
******************************************************************************/
457-
void DownloadEngine::oneMoreSegment()
458-
{
459-
for (auto item : selection()) {
460-
auto downloadItem = dynamic_cast<AbstractDownloadItem*>(item);
461-
auto segments = downloadItem->maxConnectionSegments();
462-
segments++;
463-
downloadItem->setMaxConnectionSegments(segments);
464-
}
465-
}
466-
467-
void DownloadEngine::oneFewerSegment()
468-
{
469-
for (auto item : selection()) {
470-
auto downloadItem = dynamic_cast<AbstractDownloadItem*>(item);
471-
auto segments = downloadItem->maxConnectionSegments();
472-
segments--;
473-
downloadItem->setMaxConnectionSegments(segments);
474-
}
475-
}
476-
477462
/******************************************************************************
478463
******************************************************************************/
479464
/*!

‎src/core/downloadengine.h‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,7 @@ class DownloadEngine : public QObject
5252

5353
/* Statistics */
5454
QList<IDownloadItem *> downloadItems() const;
55-
QList<IDownloadItem *> waitingJobs() const;
5655
QList<IDownloadItem *> completedJobs() const;
57-
QList<IDownloadItem *> pausedJobs() const;
5856
QList<IDownloadItem *> failedJobs() const;
5957
QList<IDownloadItem *> runningJobs() const;
6058

@@ -84,9 +82,8 @@ class DownloadEngine : public QObject
8482
void moveCurrentDown();
8583
void moveCurrentBottom();
8684

87-
/* Segments */
88-
void oneMoreSegment();
89-
void oneFewerSegment();
85+
/* Misc */
86+
void movetoTrash(const QList<IDownloadItem *> &items);
9087

9188
/* Utility */
9289
virtual IDownloadItem* createItem(const QUrl &url);

‎src/core/downloaditem.cpp‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,19 @@ void DownloadItem::rename(const QString &newName)
150150
emit renamed(oldFileName, newFileName, success);
151151
}
152152

153+
void DownloadItem::moveToTrash()
154+
{
155+
stop();
156+
auto fileName = localFullFileName();
157+
if (!QFile::exists(fileName)) {
158+
return;
159+
}
160+
if (!QFile::moveToTrash(fileName)) {
161+
/// \todo if not moved, do something else, like rename 'myfile' to '~myfile'?
162+
}
163+
emit changed();
164+
}
165+
153166
/******************************************************************************
154167
******************************************************************************/
155168
void DownloadItem::onMetaDataChanged()

‎src/core/downloaditem.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -54,6 +54,7 @@ class DownloadItem : public AbstractDownloadItem
5454
void stop() override;
5555

5656
void rename(const QString &newName) override;
57+
void moveToTrash() override;
5758

5859
private slots:
5960
void onMetaDataChanged();

‎src/core/idownloaditem.h‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ class IDownloadItem
5050
virtual qreal speed() const = 0; /*!< Returns the speed in byte per second */
5151
virtual int progress() const = 0; /*!< Return a value between 0 and 100, or -1 if undefined */
5252

53-
virtual int maxConnectionSegments() const = 0;
5453
virtual int maxConnections() const = 0;
5554
virtual QString log() const = 0;
5655

‎src/core/mask.cpp‎

Lines changed: 27 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -183,11 +183,9 @@ QString Mask::interpret(const QUrl &url, const QString &customFileName, const QS
183183
if (!url.isValid()) {
184184
return {};
185185
}
186-
auto decodedMask = QString("%0.%1").arg(NAME, EXT);
187-
if (mask.isEmpty()) {
186+
auto decodedMask = mask; //.trimmed();
187+
if (decodedMask.isEmpty()) {
188188
decodedMask = QString("%0/%1/%2.%3").arg(URL, SUBDIRS, NAME, EXT);
189-
} else {
190-
decodedMask = mask;
191189
}
192190

193191
auto host = url.host();
@@ -199,10 +197,6 @@ QString Mask::interpret(const QUrl &url, const QString &customFileName, const QS
199197
auto basename = fi.completeBaseName();
200198
auto suffix = fi.suffix();
201199

202-
if (!customFileName.isEmpty()) {
203-
basename = customFileName;
204-
}
205-
206200
auto subdirs = path;
207201
subdirs.chop(filename.count());
208202
if (subdirs.startsWith(QChar('/'))) {
@@ -223,6 +217,25 @@ QString Mask::interpret(const QUrl &url, const QString &customFileName, const QS
223217
// Renaming Tags
224218
decodedMask.replace(QChar('\\'), QChar('/'));
225219

220+
// BUGFIX
221+
if (!customFileName.isEmpty()) {
222+
QString temp = "";
223+
auto parts = decodedMask.split(QChar('/'));
224+
for (QString part : parts) {
225+
if (part.contains(NAME)) {
226+
if (part.contains(EXT)) {
227+
part = customFileName;
228+
part.append(".").append(suffix);
229+
} else {
230+
part = customFileName;
231+
}
232+
}
233+
temp.append(part).append(QChar('/'));
234+
}
235+
temp.removeLast();
236+
decodedMask = temp;
237+
}
238+
226239
decodedMask.replace( NAME , basename );
227240
decodedMask.replace( EXT , suffix );
228241
decodedMask.replace( URL , host );
@@ -233,9 +246,12 @@ QString Mask::interpret(const QUrl &url, const QString &customFileName, const QS
233246
decodedMask.replace( QSTRING , query );
234247

235248
/* Remove the trailing '.' and duplicated '/' */
236-
decodedMask.replace(QRegularExpression("/+"), "/");
237-
decodedMask.replace(QRegularExpression("^/"), "");
238-
decodedMask.replace(QRegularExpression("[/\\.]*$"), "");
249+
static QRegularExpression reDuplicateSlash("/+");
250+
static QRegularExpression reLeadingSlash("^/");
251+
static QRegularExpression reTrailingSlashAndDot("[/\\.]*$");
252+
decodedMask.replace(reDuplicateSlash, "/");
253+
decodedMask.replace(reLeadingSlash, "");
254+
decodedMask.replace(reTrailingSlashAndDot, "");
239255

240256
/* Replace reserved characters */
241257
cleanNameForWindows(decodedMask);

0 commit comments

Comments
 (0)