Katana_mirror/kde-workspace
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/kde-workspace.git synced 2025-02-23 18:32:50 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

kioslave: internal camera files handling fix

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
This commit is contained in:
Ivailo Monev 2021-07-15 01:20:06 +03:00
parent 207a123566
commit 8c758bcbdf
1 changed files with 18 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
kioslave/camera/kio_camera.cpp
View file

@ -228,27 +228,27 @@ void KameraProtocol::get(const KUrl &url)
}
#define GPHOTO_TEXT_FILE(xx) \
if (directory != "/" && !file.endsWith(#xx ".txt")) { \
CameraText xx; \
gpr = gp_camera_get_##xx(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
error(KIO::ERR_DOES_NOT_EXIST, url.path()); \
return; \
} \
QByteArray chunkDataBuffer = QByteArray::fromRawData(xx.text, strlen(xx.text)); \
data(chunkDataBuffer); \
processedSize(strlen(xx.text)); \
chunkDataBuffer.clear(); \
finished(); \
return; \
#define GPHOTO_TEXT_FILE(xx) \
if (directory == "/" && file == #xx ".txt") { \
CameraText xx; \
gpr = gp_camera_get_##xx(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
error(KIO::ERR_DOES_NOT_EXIST, url.path()); \
return; \
} \
QByteArray chunkDataBuffer = QByteArray::fromRawData(xx.text, strlen(xx.text)); \
data(chunkDataBuffer); \
processedSize(strlen(xx.text)); \
chunkDataBuffer.clear(); \
finished(); \
return; \
}
GPHOTO_TEXT_FILE(about);
GPHOTO_TEXT_FILE(manual);
GPHOTO_TEXT_FILE(summary);
#undef GPHOTO_TEXT_FILE
// emit info message
infoMessage(i18n("Retrieving data from camera <b>%1</b>", current_camera));
@ -476,14 +476,14 @@ void KameraProtocol::statRegular(const KUrl &xurl)
}
#define GPHOTO_TEXT_FILE(xx) \
if (directory != "/" && !file.endsWith(#xx".txt")) { \
if (directory == "/" && file == #xx".txt") { \
CameraText xx; \
gpr = gp_camera_get_about(m_camera, &xx, m_context); \
gpr = gp_camera_get_##xx(m_camera, &xx, m_context); \
if (gpr != GP_OK) { \
error(KIO::ERR_DOES_NOT_EXIST, xurl.fileName()); \
return; \
} \
translateTextToUDS(entry,#xx".txt",xx.text); \
translateTextToUDS(entry, #xx".txt", xx.text); \
statEntry(entry); \
finished(); \
return; \