Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Ark
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Package Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jan Paul Batrina
Ark
Commits
cb010aa1
Commit
cb010aa1
authored
Sep 25, 2020
by
Laurent Montel
😁
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix clazy warning
parent
7b1fe272
Changes
12
Hide whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
18 additions
and
18 deletions
+18
-18
autotests/kerfuffle/jsonparser.cpp
autotests/kerfuffle/jsonparser.cpp
+1
-1
kerfuffle/archive_kerfuffle.cpp
kerfuffle/archive_kerfuffle.cpp
+1
-1
kerfuffle/archive_kerfuffle.h
kerfuffle/archive_kerfuffle.h
+1
-1
kerfuffle/jobs.cpp
kerfuffle/jobs.cpp
+1
-1
kerfuffle/jobs.h
kerfuffle/jobs.h
+1
-1
kerfuffle/options.cpp
kerfuffle/options.cpp
+1
-1
kerfuffle/options.h
kerfuffle/options.h
+1
-1
part/archivemodel.cpp
part/archivemodel.cpp
+2
-2
part/archivemodel.h
part/archivemodel.h
+2
-2
part/part.cpp
part/part.cpp
+5
-5
plugins/libzipplugin/libzipplugin.cpp
plugins/libzipplugin/libzipplugin.cpp
+1
-1
plugins/libzipplugin/libzipplugin.h
plugins/libzipplugin/libzipplugin.h
+1
-1
No files found.
autotests/kerfuffle/jsonparser.cpp
View file @
cb010aa1
...
...
@@ -58,7 +58,7 @@ JSONParser::JSONArchive JSONParser::createJSONArchive(const QVariant &json)
for
(
const
QVariant
&
entry
:
jsonList
)
{
const
QVariantMap
entryMap
=
entry
.
toMap
();
if
(
!
entryMap
.
contains
(
Q
Latin1String
(
"fullPath"
)))
{
if
(
!
entryMap
.
contains
(
Q
StringLiteral
(
"fullPath"
)))
{
continue
;
}
...
...
kerfuffle/archive_kerfuffle.cpp
View file @
cb010aa1
...
...
@@ -452,7 +452,7 @@ CopyJob* Archive::copyFiles(const QVector<Archive::Entry*> &files, Archive::Entr
return
newJob
;
}
ExtractJob
*
Archive
::
extractFiles
(
const
QVector
<
Archive
::
Entry
*>
&
files
,
const
QString
&
destinationDir
,
const
ExtractionOptions
&
options
)
ExtractJob
*
Archive
::
extractFiles
(
const
QVector
<
Archive
::
Entry
*>
&
files
,
const
QString
&
destinationDir
,
ExtractionOptions
options
)
{
if
(
!
isValid
())
{
return
nullptr
;
...
...
kerfuffle/archive_kerfuffle.h
View file @
cb010aa1
...
...
@@ -197,7 +197,7 @@ public:
*/
CopyJob
*
copyFiles
(
const
QVector
<
Archive
::
Entry
*>
&
files
,
Archive
::
Entry
*
destination
,
const
CompressionOptions
&
options
=
CompressionOptions
());
ExtractJob
*
extractFiles
(
const
QVector
<
Archive
::
Entry
*>
&
files
,
const
QString
&
destinationDir
,
const
ExtractionOptions
&
options
=
ExtractionOptions
());
ExtractJob
*
extractFiles
(
const
QVector
<
Archive
::
Entry
*>
&
files
,
const
QString
&
destinationDir
,
ExtractionOptions
options
=
ExtractionOptions
());
PreviewJob
*
preview
(
Archive
::
Entry
*
entry
);
OpenJob
*
open
(
Archive
::
Entry
*
entry
);
...
...
kerfuffle/jobs.cpp
View file @
cb010aa1
...
...
@@ -503,7 +503,7 @@ bool CreateJob::doKill()
return
m_addJob
&&
m_addJob
->
kill
();
}
ExtractJob
::
ExtractJob
(
const
QVector
<
Archive
::
Entry
*>
&
entries
,
const
QString
&
destinationDir
,
const
ExtractionOptions
&
options
,
ReadOnlyArchiveInterface
*
interface
)
ExtractJob
::
ExtractJob
(
const
QVector
<
Archive
::
Entry
*>
&
entries
,
const
QString
&
destinationDir
,
ExtractionOptions
options
,
ReadOnlyArchiveInterface
*
interface
)
:
Job
(
interface
)
,
m_entries
(
entries
)
,
m_destinationDir
(
destinationDir
)
...
...
kerfuffle/jobs.h
View file @
cb010aa1
...
...
@@ -225,7 +225,7 @@ class KERFUFFLE_EXPORT ExtractJob : public Job
Q_OBJECT
public:
ExtractJob
(
const
QVector
<
Archive
::
Entry
*>
&
entries
,
const
QString
&
destinationDir
,
const
ExtractionOptions
&
options
,
ReadOnlyArchiveInterface
*
interface
);
ExtractJob
(
const
QVector
<
Archive
::
Entry
*>
&
entries
,
const
QString
&
destinationDir
,
ExtractionOptions
options
,
ReadOnlyArchiveInterface
*
interface
);
QString
destinationDirectory
()
const
;
ExtractionOptions
extractionOptions
()
const
;
...
...
kerfuffle/options.cpp
View file @
cb010aa1
...
...
@@ -148,7 +148,7 @@ QDebug operator<<(QDebug d, const CompressionOptions &options)
return
d
.
space
();
}
QDebug
operator
<<
(
QDebug
d
,
const
ExtractionOptions
&
options
)
QDebug
operator
<<
(
QDebug
d
,
ExtractionOptions
options
)
{
d
.
nospace
()
<<
"(encryption hint: "
<<
options
.
encryptedArchiveHint
();
d
.
nospace
()
<<
", preserve paths: "
<<
options
.
preservePaths
();
...
...
kerfuffle/options.h
View file @
cb010aa1
...
...
@@ -113,7 +113,7 @@ private:
};
QDebug
KERFUFFLE_EXPORT
operator
<<
(
QDebug
d
,
const
CompressionOptions
&
options
);
QDebug
KERFUFFLE_EXPORT
operator
<<
(
QDebug
d
,
const
ExtractionOptions
&
options
);
QDebug
KERFUFFLE_EXPORT
operator
<<
(
QDebug
d
,
ExtractionOptions
options
);
}
...
...
part/archivemodel.cpp
View file @
cb010aa1
...
...
@@ -628,13 +628,13 @@ KJob *ArchiveModel::loadArchive(const QString &path, const QString &mimeType, QO
return
loadJob
;
}
ExtractJob
*
ArchiveModel
::
extractFile
(
Archive
::
Entry
*
file
,
const
QString
&
destinationDir
,
const
Kerfuffle
::
ExtractionOptions
&
options
)
const
ExtractJob
*
ArchiveModel
::
extractFile
(
Archive
::
Entry
*
file
,
const
QString
&
destinationDir
,
Kerfuffle
::
ExtractionOptions
options
)
const
{
QVector
<
Archive
::
Entry
*>
files
({
file
});
return
extractFiles
(
files
,
destinationDir
,
options
);
}
ExtractJob
*
ArchiveModel
::
extractFiles
(
const
QVector
<
Archive
::
Entry
*>&
files
,
const
QString
&
destinationDir
,
const
Kerfuffle
::
ExtractionOptions
&
options
)
const
ExtractJob
*
ArchiveModel
::
extractFiles
(
const
QVector
<
Archive
::
Entry
*>&
files
,
const
QString
&
destinationDir
,
Kerfuffle
::
ExtractionOptions
options
)
const
{
Q_ASSERT
(
m_archive
);
ExtractJob
*
newJob
=
m_archive
->
extractFiles
(
files
,
destinationDir
,
options
);
...
...
part/archivemodel.h
View file @
cb010aa1
...
...
@@ -91,8 +91,8 @@ public:
Archive
::
Entry
*
entryForIndex
(
const
QModelIndex
&
index
);
Kerfuffle
::
ExtractJob
*
extractFile
(
Archive
::
Entry
*
file
,
const
QString
&
destinationDir
,
const
Kerfuffle
::
ExtractionOptions
&
options
=
Kerfuffle
::
ExtractionOptions
())
const
;
Kerfuffle
::
ExtractJob
*
extractFiles
(
const
QVector
<
Archive
::
Entry
*>&
files
,
const
QString
&
destinationDir
,
const
Kerfuffle
::
ExtractionOptions
&
options
=
Kerfuffle
::
ExtractionOptions
())
const
;
Kerfuffle
::
ExtractJob
*
extractFile
(
Archive
::
Entry
*
file
,
const
QString
&
destinationDir
,
Kerfuffle
::
ExtractionOptions
options
=
Kerfuffle
::
ExtractionOptions
())
const
;
Kerfuffle
::
ExtractJob
*
extractFiles
(
const
QVector
<
Archive
::
Entry
*>&
files
,
const
QString
&
destinationDir
,
Kerfuffle
::
ExtractionOptions
options
=
Kerfuffle
::
ExtractionOptions
())
const
;
Kerfuffle
::
PreviewJob
*
preview
(
Archive
::
Entry
*
file
)
const
;
Kerfuffle
::
OpenJob
*
open
(
Archive
::
Entry
*
file
)
const
;
...
...
part/part.cpp
View file @
cb010aa1
...
...
@@ -594,7 +594,7 @@ void Part::createArchive()
const
QString
fixedMimeType
=
arguments
().
metaData
()[
QStringLiteral
(
"fixedMimeType"
)];
m_model
->
createEmptyArchive
(
localFilePath
(),
fixedMimeType
,
m_model
);
if
(
arguments
().
metaData
().
contains
(
Q
Latin1String
(
"volumeSize"
)))
{
if
(
arguments
().
metaData
().
contains
(
Q
StringLiteral
(
"volumeSize"
)))
{
m_model
->
archive
()
->
setMultiVolume
(
true
);
}
...
...
@@ -750,16 +750,16 @@ QModelIndexList Part::getSelectedIndexes()
void
Part
::
readCompressionOptions
()
{
// Store options from CreateDialog if they are set.
if
(
!
m_compressionOptions
.
isCompressionLevelSet
()
&&
arguments
().
metaData
().
contains
(
Q
Latin1String
(
"compressionLevel"
)))
{
if
(
!
m_compressionOptions
.
isCompressionLevelSet
()
&&
arguments
().
metaData
().
contains
(
Q
StringLiteral
(
"compressionLevel"
)))
{
m_compressionOptions
.
setCompressionLevel
(
arguments
().
metaData
()[
QStringLiteral
(
"compressionLevel"
)].
toInt
());
}
if
(
m_compressionOptions
.
compressionMethod
().
isEmpty
()
&&
arguments
().
metaData
().
contains
(
Q
Latin1String
(
"compressionMethod"
)))
{
if
(
m_compressionOptions
.
compressionMethod
().
isEmpty
()
&&
arguments
().
metaData
().
contains
(
Q
StringLiteral
(
"compressionMethod"
)))
{
m_compressionOptions
.
setCompressionMethod
(
arguments
().
metaData
()[
QStringLiteral
(
"compressionMethod"
)]);
}
if
(
m_compressionOptions
.
encryptionMethod
().
isEmpty
()
&&
arguments
().
metaData
().
contains
(
Q
Latin1String
(
"encryptionMethod"
)))
{
if
(
m_compressionOptions
.
encryptionMethod
().
isEmpty
()
&&
arguments
().
metaData
().
contains
(
Q
StringLiteral
(
"encryptionMethod"
)))
{
m_compressionOptions
.
setEncryptionMethod
(
arguments
().
metaData
()[
QStringLiteral
(
"encryptionMethod"
)]);
}
if
(
!
m_compressionOptions
.
isVolumeSizeSet
()
&&
arguments
().
metaData
().
contains
(
Q
Latin1String
(
"volumeSize"
)))
{
if
(
!
m_compressionOptions
.
isVolumeSizeSet
()
&&
arguments
().
metaData
().
contains
(
Q
StringLiteral
(
"volumeSize"
)))
{
m_compressionOptions
.
setVolumeSize
(
arguments
().
metaData
()[
QStringLiteral
(
"volumeSize"
)].
toULong
());
}
...
...
plugins/libzipplugin/libzipplugin.cpp
View file @
cb010aa1
...
...
@@ -912,7 +912,7 @@ bool LibzipPlugin::copyFiles(const QVector<Archive::Entry*> &files, Archive::Ent
return
true
;
}
QString
LibzipPlugin
::
permissionsToString
(
const
mode_t
&
perm
)
QString
LibzipPlugin
::
permissionsToString
(
mode_t
perm
)
{
QString
modeval
;
if
((
perm
&
S_IFMT
)
==
S_IFDIR
)
{
...
...
plugins/libzipplugin/libzipplugin.h
View file @
cb010aa1
...
...
@@ -58,7 +58,7 @@ private:
bool
writeEntry
(
zip_t
*
archive
,
const
QString
&
entry
,
const
Archive
::
Entry
*
destination
,
const
CompressionOptions
&
options
,
bool
isDir
=
false
);
bool
emitEntryForIndex
(
zip_t
*
archive
,
qlonglong
index
);
void
emitProgress
(
double
percentage
);
QString
permissionsToString
(
const
mode_t
&
perm
);
QString
permissionsToString
(
mode_t
perm
);
static
void
progressCallback
(
zip_t
*
,
double
progress
,
void
*
that
);
QVector
<
Archive
::
Entry
*>
m_emittedEntries
;
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment