@@ -37,32 +37,27 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
37
37
38
38
if ( !QFileInfo::exists ( zipFilename ) )
39
39
{
40
- QString err = QObject::tr ( " Error zip file does not exist: '%1'" ).arg ( zipFilename );
41
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
40
+ QgsMessageLog::logMessage ( QObject::tr ( " Error zip file does not exist: '%1'" ).arg ( zipFilename ) );
42
41
return false ;
43
42
}
44
43
else if ( zipFilename.isEmpty () )
45
44
{
46
- QString err = QObject::tr ( " Error zip filename is empty" );
47
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
45
+ QgsMessageLog::logMessage ( QObject::tr ( " Error zip filename is empty" ) );
48
46
return false ;
49
47
}
50
48
else if ( !QDir ( dir ).exists ( dir ) )
51
49
{
52
- QString err = QObject::tr ( " Error output dir does not exist: '%1'" ).arg ( dir );
53
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
50
+ QgsMessageLog::logMessage ( QObject::tr ( " Error output dir does not exist: '%1'" ).arg ( dir ) );
54
51
return false ;
55
52
}
56
53
else if ( !QFileInfo ( dir ).isDir () )
57
54
{
58
- QString err = QObject::tr ( " Error output dir is not a directory: '%1'" ).arg ( dir );
59
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
55
+ QgsMessageLog::logMessage ( QObject::tr ( " Error output dir is not a directory: '%1'" ).arg ( dir ) );
60
56
return false ;
61
57
}
62
58
else if ( !QFileInfo ( dir ).isWritable () )
63
59
{
64
- QString err = QObject::tr ( " Error output dir is not writable: '%1'" ).arg ( dir );
65
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
60
+ QgsMessageLog::logMessage ( QObject::tr ( " Error output dir is not writable: '%1'" ).arg ( dir ) );
66
61
return false ;
67
62
}
68
63
@@ -93,13 +88,13 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
93
88
if ( !newFile.absoluteDir ().exists () )
94
89
{
95
90
if ( !QDir ( dir ).mkpath ( newFile.absolutePath () ) )
96
- QgsMessageLog::logMessage ( QStringLiteral ( " Failed to create a subdirectory %1/%2" ).arg ( dir ).arg ( fileName ) );
91
+ QgsMessageLog::logMessage ( QObject::tr ( " Failed to create a subdirectory %1/%2" ).arg ( dir ).arg ( fileName ) );
97
92
}
98
93
99
94
QFile outFile ( newFile.absoluteFilePath () );
100
95
if ( !outFile.open ( QIODevice::WriteOnly | QIODevice::Truncate ) )
101
96
{
102
- QgsMessageLog::logMessage ( QStringLiteral ( " Could not write to %1" ).arg ( newFile.absoluteFilePath () ) );
97
+ QgsMessageLog::logMessage ( QObject::tr ( " Could not write to %1" ).arg ( newFile.absoluteFilePath () ) );
103
98
}
104
99
else
105
100
{
@@ -111,26 +106,23 @@ bool QgsZipUtils::unzip( const QString &zipFilename, const QString &dir, QString
111
106
else
112
107
{
113
108
zip_fclose ( file );
114
- QString err = QObject::tr ( " Error reading file: '%1'" ).arg ( zip_strerror ( z ) );
115
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
109
+ QgsMessageLog::logMessage ( QObject::tr ( " Error reading file: '%1'" ).arg ( zip_strerror ( z ) ) );
116
110
return false ;
117
111
}
118
112
}
119
113
}
120
114
else
121
115
{
122
116
zip_close ( z );
123
- QString err = QObject::tr ( " Error getting files: '%1'" ).arg ( zip_strerror ( z ) );
124
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
117
+ QgsMessageLog::logMessage ( QObject::tr ( " Error getting files: '%1'" ).arg ( zip_strerror ( z ) ) );
125
118
return false ;
126
119
}
127
120
128
121
zip_close ( z );
129
122
}
130
123
else
131
124
{
132
- QString err = QObject::tr ( " Error opening zip archive: '%1' (Error code: %2)" ).arg ( z ? zip_strerror ( z ) : zipFilename, rc );
133
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
125
+ QgsMessageLog::logMessage ( QObject::tr ( " Error opening zip archive: '%1' (Error code: %2)" ).arg ( z ? zip_strerror ( z ) : zipFilename, rc ) );
134
126
return false ;
135
127
}
136
128
@@ -141,8 +133,7 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
141
133
{
142
134
if ( zipFilename.isEmpty () )
143
135
{
144
- QString err = QObject::tr ( " Error zip filename is empty" );
145
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
136
+ QgsMessageLog::logMessage ( QObject::tr ( " Error zip filename is empty" ) );
146
137
return false ;
147
138
}
148
139
@@ -157,8 +148,7 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
157
148
QFileInfo fileInfo ( file );
158
149
if ( !fileInfo.exists () )
159
150
{
160
- QString err = QObject::tr ( " Error input file does not exist: '%1'" ).arg ( file );
161
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
151
+ QgsMessageLog::logMessage ( QObject::tr ( " Error input file does not exist: '%1'" ).arg ( file ) );
162
152
zip_close ( z );
163
153
return false ;
164
154
}
@@ -175,16 +165,14 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
175
165
#endif
176
166
if ( rc == -1 )
177
167
{
178
- QString err = QObject::tr ( " Error adding file '%1': %2" ).arg ( file, zip_strerror ( z ) );
179
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
168
+ QgsMessageLog::logMessage ( QObject::tr ( " Error adding file '%1': %2" ).arg ( file, zip_strerror ( z ) ) );
180
169
zip_close ( z );
181
170
return false ;
182
171
}
183
172
}
184
173
else
185
174
{
186
- QString err = QObject::tr ( " Error creating data source '%1': %2" ).arg ( file, zip_strerror ( z ) );
187
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
175
+ QgsMessageLog::logMessage ( QObject::tr ( " Error creating data source '%1': %2" ).arg ( file, zip_strerror ( z ) ) );
188
176
zip_close ( z );
189
177
return false ;
190
178
}
@@ -194,8 +182,7 @@ bool QgsZipUtils::zip( const QString &zipFilename, const QStringList &files )
194
182
}
195
183
else
196
184
{
197
- QString err = QObject::tr ( " Error creating zip archive '%1': %2" ).arg ( zipFilename, zip_strerror ( z ) );
198
- QgsMessageLog::logMessage ( err, QStringLiteral ( " QgsZipUtils" ) );
185
+ QgsMessageLog::logMessage ( QObject::tr ( " Error creating zip archive '%1': %2" ).arg ( zipFilename, zip_strerror ( z ) ) );
199
186
return false ;
200
187
}
201
188
0 commit comments