diff --git a/Modules/samba/CMakeLists.txt b/Modules/samba/CMakeLists.txt --- a/Modules/samba/CMakeLists.txt +++ b/Modules/samba/CMakeLists.txt @@ -2,27 +2,27 @@ # KI18N Translation Domain for this library add_definitions(-DTRANSLATION_DOMAIN=\"kcmsamba\") -set(kcm_samba_PART_SRCS - main.cpp - ksmbstatus.cpp - kcmsambaimports.cpp - kcmsambalog.cpp - kcmsambastatistics.cpp ) - - -add_library(kcm_samba MODULE ${kcm_samba_PART_SRCS}) - +set(kcm_samba_PART_SRCS + smbmountmodel.cpp + ksambasharemodel.cpp +) -target_link_libraries(kcm_samba +# Intermediate lib for use in testing. +add_library(kcm_samba_static STATIC ${kcm_samba_PART_SRCS}) +target_link_libraries(kcm_samba_static + KF5::KIOCore + KF5::Solid + KF5::I18n KF5::I18n KF5::KCMUtils - KF5::KIOCore - KF5::KIOWidgets ) -install(TARGETS kcm_samba DESTINATION ${PLUGIN_INSTALL_DIR} ) - +add_library(kcm_samba MODULE main.cpp) +target_link_libraries(kcm_samba + kcm_samba_static +) -########### install files ############### +install(TARGETS kcm_samba DESTINATION ${PLUGIN_INSTALL_DIR}) +install(FILES smbstatus.desktop DESTINATION ${SERVICES_INSTALL_DIR}) -install( FILES smbstatus.desktop DESTINATION ${SERVICES_INSTALL_DIR} ) +add_subdirectory(autotests) diff --git a/Modules/samba/autotests/CMakeLists.txt b/Modules/samba/autotests/CMakeLists.txt new file mode 100644 --- /dev/null +++ b/Modules/samba/autotests/CMakeLists.txt @@ -0,0 +1,18 @@ +if(NOT BUILD_TESTING) + return() +endif() + +remove_definitions(-DQT_NO_CAST_FROM_ASCII) + +find_package(Qt5Test ${QT_MIN_VERSION} CONFIG REQUIRED) + +include(ECMAddTests) + +ecm_add_tests( + ksambasharemodeltest + smbmountmodeltest + LINK_LIBRARIES + Qt5::Core + Qt5::Test + kcm_samba_static +) diff --git a/Modules/samba/autotests/ksambasharemodeltest.cpp b/Modules/samba/autotests/ksambasharemodeltest.cpp new file mode 100644 --- /dev/null +++ b/Modules/samba/autotests/ksambasharemodeltest.cpp @@ -0,0 +1,23 @@ +/* + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + +#include +#include + +#include "../ksambasharemodel.h" + +class KSambaShareModelTest : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void testModel() + { + QAbstractItemModelTester tester(new KSambaShareModel, QAbstractItemModelTester::FailureReportingMode::QtTest); + } +}; + +QTEST_GUILESS_MAIN(KSambaShareModelTest) + +#include "ksambasharemodeltest.moc" diff --git a/Modules/samba/autotests/smbmountmodeltest.cpp b/Modules/samba/autotests/smbmountmodeltest.cpp new file mode 100644 --- /dev/null +++ b/Modules/samba/autotests/smbmountmodeltest.cpp @@ -0,0 +1,23 @@ +/* + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + +#include +#include + +#include "../smbmountmodel.h" + +class SmbMountModelTest : public QObject +{ + Q_OBJECT +private Q_SLOTS: + void testModel() + { + QAbstractItemModelTester tester(new SmbMountModel); + } +}; + +QTEST_GUILESS_MAIN(SmbMountModelTest) + +#include "smbmountmodeltest.moc" diff --git a/Modules/samba/kcmsambaimports.h b/Modules/samba/kcmsambaimports.h deleted file mode 100644 --- a/Modules/samba/kcmsambaimports.h +++ /dev/null @@ -1,50 +0,0 @@ -/* - * kcmsambaimports.h - * - * Copyright (c) 2000 Alexander Neundorf - * - * Requires the Qt widget libraries, available at no cost at - * https://www.qt.io/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#ifndef kcmsambaimports_h_included -#define kcmsambaimports_h_included - -#include -#include - -#include - -class ImportsView : public QWidget { -Q_OBJECT -public: - explicit ImportsView(QWidget *parent, KConfig *config=0); - virtual ~ImportsView() { - } - void saveSettings() { - } - void loadSettings() { - } -private: - KConfig *configFile; - QTreeWidget list; - QTimer timer; -private Q_SLOTS: - void updateList(); -}; - -#endif // main_included diff --git a/Modules/samba/kcmsambaimports.cpp b/Modules/samba/kcmsambaimports.cpp deleted file mode 100644 --- a/Modules/samba/kcmsambaimports.cpp +++ /dev/null @@ -1,87 +0,0 @@ -/* - * kcmsambaimports.cpp - * - * Copyright (c) 2000 Alexander Neundorf - * - * Requires the Qt widget libraries, available at no cost at - * https://www.qt.io/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include "kcmsambaimports.h" - -#include -#include - -#include - -#include - -ImportsView::ImportsView(QWidget * parent, KConfig *config) : - QWidget(parent), configFile(config), list(this) { - QBoxLayout *topLayout = new QVBoxLayout(this); - topLayout->addWidget(&list); - - list.setAllColumnsShowFocus(true); - list.setMinimumSize(425, 200); - list.setHeaderLabels(QStringList() << i18n("Type") << i18n("Resource") << i18n("Mounted Under")); - - this->setWhatsThis(i18n("This list shows the Samba and NFS shared" - " resources mounted on your system from other hosts. The \"Type\"" - " column tells you whether the mounted resource is a Samba or an NFS" - " type of resource. The \"Resource\" column shows the descriptive name" - " of the shared resource. Finally, the third column, which is labeled" - " \"Mounted under\" shows the location on your system where the shared" - " resource is mounted.") ); - - timer.start(10000); - QObject::connect(&timer, &QTimer::timeout, this, &ImportsView::updateList); - updateList(); -} - -void ImportsView::updateList() { - list.clear(); - char *e; - char buf[250]; - QByteArray s(""), strSource, strMount; - QString strType; - FILE *f=popen("mount", "r"); - if (f==nullptr) - return; - do { - e=fgets(buf, 250, f); - if (e) { - s=buf; - if ((s.contains(" nfs ")) || (s.contains(" smbfs "))) { - strSource=s.left(s.indexOf(" on /")); - strMount=s.mid(s.indexOf(" on /")+4, s.length()); - if ((s.contains(" nfs ")) || (s.contains("/remote on "))) - strType=QStringLiteral("NFS"); - else if (s.contains(" smbfs ")) - strType=QStringLiteral("SMB"); - int pos(strMount.indexOf(" type ")); - if (pos==-1) - pos=strMount.indexOf(" read/"); - strMount=strMount.left(pos); - QTreeWidgetItem *item = new QTreeWidgetItem(&list); - item->setText(0, strType); - item->setText(1, QString::fromUtf8(strSource)); - item->setText(2, QString::fromUtf8(strMount)); - }; - }; - } while (!feof(f)); - pclose(f); -} - diff --git a/Modules/samba/kcmsambalog.h b/Modules/samba/kcmsambalog.h deleted file mode 100644 --- a/Modules/samba/kcmsambalog.h +++ /dev/null @@ -1,82 +0,0 @@ -/* - * kcmsambalog.h - * - * Copyright (c) 2000 Alexander Neundorf - * - * Requires the Qt widget libraries, available at no cost at - * https://www.qt.io/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef kcmsambalog_h_included -#define kcmsambalog_h_included - -#include -#include -#include -#include - -#include -#include - -#define LOGGROUPNAME "SambaLogFileSettings" - -class LogView : public QWidget { -Q_OBJECT -public: - explicit LogView(QWidget *parent=0, KConfig *config=0); - virtual ~LogView() { - } - void saveSettings(); - void loadSettings(); -private: - KConfig *configFile; - int filesCount, connectionsCount; - KUrlRequester logFileName; - QLabel label; - QTreeWidget viewHistory; - QCheckBox showConnOpen, showConnClose, showFileOpen, showFileClose; - QPushButton updateButton; -private Q_SLOTS: - void updateList(); -Q_SIGNALS: - void contentsChanged(QTreeWidget *list, int nrOfFiles, int nrOfConnections); -}; - -class QTreeWidgetItemX : public QTreeWidgetItem { -public: - //a faster constructor saves a lot time - QTreeWidgetItemX(QTreeWidget *parent, const char *c0, const char *c1 = 0, const char *c2 = 0, const char *c3 = 0, const char *c4 = 0, const char *c5 = 0, const char *c6 = 0, const char *c7 = 0) : - QTreeWidgetItem(parent) { - setText( 0, QString::fromLatin1(c0)); - setText( 1, QString::fromLatin1(c1)); - setText( 2, QString::fromLatin1(c2)); - setText( 3, QString::fromLatin1(c3)); - if (c4==0) - return; - setText( 4, QString::fromLatin1(c4)); - if (c5==0) - return; - setText( 5, QString::fromLatin1(c5)); - if (c6==0) - return; - setText( 6, QString::fromLatin1(c6)); - if (c7==0) - return; - setText( 7, QString::fromLatin1(c7)); - } -}; - -#endif // main_included diff --git a/Modules/samba/kcmsambalog.cpp b/Modules/samba/kcmsambalog.cpp deleted file mode 100644 --- a/Modules/samba/kcmsambalog.cpp +++ /dev/null @@ -1,232 +0,0 @@ -/* - * kcmsambalog.cpp - * - * Copyright (c) 2000 Alexander Neundorf - * - * Requires the Qt widget libraries, available at no cost at - * https://www.qt.io/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include "kcmsambalog.h" - -#define LOG_SCREEN_XY_OFFSET 10 - -LogView::LogView(QWidget *parent, KConfig *config) : - QWidget(parent), configFile(config), filesCount(0), connectionsCount(0), logFileName(QUrl::fromLocalFile(QStringLiteral("/var/log/samba/log.smbd")), this), label(i18n("Samba log file: "), this), viewHistory(this), showConnOpen(i18n("Show opened connections"), this), showConnClose(i18n("Show closed connections"), this), - showFileOpen(i18n("Show opened files"), this), showFileClose(i18n("Show closed files"), this), updateButton(i18n("&Update"), this) { - label.setTextInteractionFlags(Qt::TextSelectableByMouse); - label.setBuddy( &logFileName); - QVBoxLayout *mainLayout=new QVBoxLayout(this); - QHBoxLayout *leLayout=new QHBoxLayout(); - mainLayout->addItem(leLayout); - leLayout->addWidget(&label); - leLayout->addWidget(&logFileName, 1); - mainLayout->addWidget(&viewHistory, 1); - QGridLayout *subLayout=new QGridLayout(); - mainLayout->addItem(subLayout); - subLayout->addWidget(&showConnOpen, 0, 0); - subLayout->addWidget(&showConnClose, 1, 0); - subLayout->addWidget(&showFileOpen, 0, 1); - subLayout->addWidget(&showFileClose, 1, 1); - mainLayout->addWidget(&updateButton, 0, Qt::AlignLeft); - - logFileName.setWhatsThis(i18n("This page presents the contents of" - " your samba log file in a friendly layout. Check that the correct log" - " file for your computer is listed here. If you need to, correct the name" - " or location of the log file, and then click the \"Update\" button.") ); - - showConnOpen.setWhatsThis(i18n("Check this option if you want to" - " view the details for connections opened to your computer.") ); - - showConnClose.setWhatsThis(i18n("Check this option if you want to" - " view the events when connections to your computer were closed.") ); - - showFileOpen.setWhatsThis(i18n("Check this option if you want to" - " see the files which were opened on your computer by remote users." - " Note that file open/close events are not logged unless the samba" - " log level is set to at least 2 (you cannot set the log level" - " using this module).") ); - - showFileClose.setWhatsThis(i18n("Check this option if you want to" - " see the events when files opened by remote users were closed." - " Note that file open/close events are not logged unless the samba" - " log level is set to at least 2 (you cannot set the log level" - " using this module).") ); - - updateButton.setWhatsThis(i18n("Click here to refresh the information" - " on this page. The log file (shown above) will be read to obtain the" - " events logged by samba.") ); - - viewHistory.setAllColumnsShowFocus(true); - viewHistory.setFocusPolicy(Qt::ClickFocus); - - QStringList headers; - headers << i18n("Date & Time") << i18n("Event") << i18n("Service/File") - << i18n("Host/User") << i18n("Date & Time") << i18n("Event") - << i18n("Service/File") << i18n("Host/User"); - viewHistory.setHeaderLabels(headers); - - viewHistory.setWhatsThis(i18n("

This list shows details of the events" - " logged by samba. Note that events at the file level are not logged" - " unless you have configured the log level for samba to 2 or greater.

" - " As with many other lists in KDE, you can click on a column heading" - " to sort on that column. Click again to change the sorting direction" - " from ascending to descending or vice versa.

" - " If the list is empty, try clicking the \"Update\" button. The samba" - " log file will be read and the list refreshed.

") ); - - showConnOpen.setChecked(true); - showConnClose.setChecked(true); - showFileOpen.setChecked(false); - showFileClose.setChecked(false); - - connect(&updateButton, &QPushButton::clicked, this, &LogView::updateList); - emit contentsChanged(&viewHistory, 0, 0); - - label.setMinimumSize(label.sizeHint()); - logFileName.setMinimumSize(250, logFileName.sizeHint().height()); - viewHistory.setMinimumSize(425, 200); - showConnOpen.setMinimumSize(showConnOpen.sizeHint()); - showConnClose.setMinimumSize(showConnClose.sizeHint()); - showFileOpen.setMinimumSize(showFileOpen.sizeHint()); - showFileClose.setMinimumSize(showFileClose.sizeHint()); - updateButton.setFixedSize(updateButton.sizeHint()); -} - -void LogView::loadSettings() { - if (configFile==0) - return; - KConfigGroup group = configFile->group(LOGGROUPNAME); - logFileName.setUrl(QUrl::fromLocalFile(group.readPathEntry("SambaLogFile", QStringLiteral("/var/log/samba/log.smbd")))); - - showConnOpen.setChecked(group.readEntry("ShowConnectionOpen", true)); - showConnClose.setChecked(group.readEntry("ShowConnectionClose", false)); - showFileOpen.setChecked(group.readEntry("ShowFileOpen", true)); - showFileClose.setChecked(group.readEntry("ShowFileClose", false)); -} - -void LogView::saveSettings() { - if (configFile==0) - return; - KConfigGroup group = configFile->group(LOGGROUPNAME); - group.writePathEntry("SambaLogFile", logFileName.url().path()); - - group.writeEntry("ShowConnectionOpen", showConnOpen.isChecked()); - group.writeEntry("ShowConnectionClose", showConnClose.isChecked()); - group.writeEntry("ShowFileOpen", showFileOpen.isChecked()); - group.writeEntry("ShowFileClose", showFileClose.isChecked()); -} - -#define CONN_OPEN " connect to service " -#define CONN_CLOSE " closed connection to service " -#define FILE_OPEN " opened file " -#define FILE_CLOSE " closed file " - -//caution ! high optimized code :-) -void LogView::updateList() { - QFile logFile(logFileName.url().path()); - if (logFile.open(QIODevice::ReadOnly)) { - QApplication::setOverrideCursor(Qt::WaitCursor); - viewHistory.clear(); - filesCount=0; - connectionsCount=0; - - int connOpenLen(strlen(CONN_OPEN)); - int connCloseLen(strlen(CONN_CLOSE)); - int fileOpenLen(strlen(FILE_OPEN)); - int fileCloseLen(strlen(FILE_CLOSE)); - - char buf[400]; - char *c1, *c2, *c3, *c4, *c, time[25]; - int timeRead(0); - - while (!logFile.atEnd()) { - logFile.readLine(buf, sizeof(buf)); - timeRead=0; - if (buf[0]=='[') { - if (strlen(buf)>11) - if (buf[5]=='/') { - buf[20]='\0'; - strncpy(time, buf+1, sizeof(time)); - time[sizeof(time)-1] = '\0'; - timeRead=1; - }; - }; - if (timeRead==0) { - c1=nullptr; - c2=nullptr; - c3=nullptr; - c4=nullptr; - if (showConnOpen.isChecked()) - c1=strstr(buf, CONN_OPEN); - if (!c1) { - if (showConnClose.isChecked()) - c2=strstr(buf, CONN_CLOSE); - if (!c2) { - if (showFileOpen.isChecked()) - c3=strstr(buf, FILE_OPEN); - if (!c3) { - if (showFileClose.isChecked()) - c4=strstr(buf, FILE_CLOSE); - if (!c4) - continue; - }; - }; - }; - if (c1) { - c=strstr(buf, " as user"); - *c='\0'; - *c1='\0'; - new QTreeWidgetItemX(&viewHistory,time,I18N_NOOP("CONNECTION OPENED"),c1+connOpenLen,buf+2); - connectionsCount++; - } else if (c2) { - *c2='\0'; - new QTreeWidgetItemX(&viewHistory,time,I18N_NOOP("CONNECTION CLOSED"),c2+connCloseLen,buf+2); - } else if (c3) { - c=strstr(buf, " read="); - *c='\0'; - *c3='\0'; - new QTreeWidgetItemX(&viewHistory,time,I18N_NOOP(" FILE OPENED"),c3+fileOpenLen,buf+2); - filesCount++; - } else if (c4) { - c=strstr(buf, " (numopen="); - *c='\0'; - *c4='\0'; - new QTreeWidgetItemX(&viewHistory,time,I18N_NOOP(" FILE CLOSED"),c4+fileCloseLen,buf+2); - }; - }; - }; - logFile.close(); - emit contentsChanged(&viewHistory, filesCount, connectionsCount); - QApplication::restoreOverrideCursor(); - } else { - QString tmp = i18n("Could not open file %1", logFileName.url().path()); - KMessageBox::error(this, tmp); - }; -} - diff --git a/Modules/samba/kcmsambastatistics.h b/Modules/samba/kcmsambastatistics.h deleted file mode 100644 --- a/Modules/samba/kcmsambastatistics.h +++ /dev/null @@ -1,113 +0,0 @@ -/* - * kcmsambastatistics.h - * - * Copyright (c) 2000 Alexander Neundorf - * - * Requires the Qt widget libraries, available at no cost at - * https://www.qt.io/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef kcmsambastatistics_h_included -#define kcmsambastatistics_h_included - -#include -#include - -class QTreeWidget; -class QLabel; -class QComboBox; -class QCheckBox; -class QLineEdit; -class QPushButton; - -class KConfig; - -class SmallLogItem { -public: - SmallLogItem() : - name(QLatin1String("")), count(0) { - } - SmallLogItem(const QString &n) : - name(n), count(1) { - } - QString name; - int count; -}; - -class LogItem { -public: - LogItem() : - name(QLatin1String("")), accessed(), count(0) { - } - LogItem(const QString &n, const QString &a) : - name(n), accessed(), count(1) { - accessed.append(new SmallLogItem(a)); - } - ~LogItem() { - qDeleteAll(accessed); - accessed.clear(); - } - QString name; - QList accessed; - int count; - SmallLogItem* itemInList(const QString &name); - void addItem(const QString &host); -}; - -class SambaLog { -public: - ~SambaLog() { - qDeleteAll(items); - items.clear(); - } - QList items; - void addItem(const QString &share, const QString &host); - void printItems(); -private: - LogItem* itemInList(const QString &name); -}; - -class StatisticsView : public QWidget { -Q_OBJECT -public: - explicit StatisticsView(QWidget *parent=0, KConfig *config=0); - virtual ~StatisticsView() { - } - void saveSettings() { - } - void loadSettings() { - } -public Q_SLOTS: - void setListInfo(QTreeWidget *list, int nrOfFiles, int nrOfConnections); -private: - KConfig *configFile; - QTreeWidget* dataList; - QTreeWidget* viewStatistics; - QLabel* connectionsL, *filesL; - QComboBox* eventCb; - QLabel* eventL; - QLineEdit* serviceLe; - QLabel* serviceL; - QLineEdit* hostLe; - QLabel* hostL; - QPushButton* calcButton, *clearButton; - QCheckBox* expandedInfoCb, *expandedUserCb; - int connectionsCount, filesCount, calcCount; -private Q_SLOTS: - void clearStatistics(); - void calculate(); -}; -#endif // main_included diff --git a/Modules/samba/kcmsambastatistics.cpp b/Modules/samba/kcmsambastatistics.cpp deleted file mode 100644 --- a/Modules/samba/kcmsambastatistics.cpp +++ /dev/null @@ -1,302 +0,0 @@ -/* - * kcmsambastatistics.cpp - * - * Copyright (c) 2000 Alexander Neundorf - * - * Requires the Qt widget libraries, available at no cost at - * https://www.qt.io/ - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#include "kcmsambastatistics.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include - -StatisticsView::StatisticsView(QWidget *parent, KConfig *config) : - QWidget(parent), configFile(config), dataList(0), connectionsCount(0), filesCount(0), calcCount(0) { - viewStatistics = new QTreeWidget( this ); - connectionsL = new QLabel( i18n( "Connections: 0" ), this ); - connectionsL->setTextInteractionFlags(Qt::TextSelectableByMouse); - filesL = new QLabel( i18n( "File accesses: 0" ), this ); - filesL->setTextInteractionFlags(Qt::TextSelectableByMouse); - eventCb = new QComboBox( this ); - eventL = new QLabel( i18n( "Event: " ), this ); - eventL->setTextInteractionFlags(Qt::TextSelectableByMouse); - eventL->setBuddy(eventCb); - serviceLe = new QLineEdit( this ); - serviceL = new QLabel( i18n( "Service/File:" ), this ); - serviceL->setTextInteractionFlags(Qt::TextSelectableByMouse); - serviceL->setBuddy(serviceLe); - hostLe = new QLineEdit( this ); - hostL = new QLabel( i18n( "Host/User:" ), this ); - hostL->setTextInteractionFlags(Qt::TextSelectableByMouse); - hostL->setBuddy(hostLe); - calcButton = new QPushButton( i18n( "&Search" ), this ); - clearButton = new QPushButton( i18n( "Clear Results" ), this ); - expandedInfoCb = new QCheckBox( i18n( "Show expanded service info" ), this ); - expandedUserCb = new QCheckBox( i18n( "Show expanded host info" ), this ); - - viewStatistics->setAllColumnsShowFocus(true); - viewStatistics->setFocusPolicy(Qt::ClickFocus); - - QStringList headers; - headers << i18n("Nr") << i18n("Event") << i18n("Service/File") << i18n("Host/User") << i18n("Hits"); //i18n("Percentage"),100); - viewStatistics->setHeaderLabels(headers); - - eventCb->setEditable(false); - eventCb->addItem(i18n("Connection")); - eventCb->addItem(i18n("File Access")); - - expandedInfoCb->setChecked(false); - expandedUserCb->setChecked(false); - clearStatistics(); - serviceLe->setText(QStringLiteral("*")); - hostLe->setText(QStringLiteral("*")); - - viewStatistics->setMinimumSize(375, 200); - connectionsL->setMinimumSize(connectionsL->sizeHint()); - filesL->setMinimumSize(filesL->sizeHint()); - eventL->setMinimumSize(eventL->sizeHint()); - eventCb->setMinimumSize(eventCb->sizeHint()); - hostL->setMinimumSize(hostL->sizeHint()); - hostLe->setMinimumSize(120, hostLe->sizeHint().height()); - serviceL->setMinimumSize(serviceL->sizeHint()); - serviceLe->setMinimumSize(120, serviceLe->sizeHint().height()); - calcButton->setMinimumSize(calcButton->sizeHint()); - clearButton->setMinimumSize(clearButton->sizeHint()); - expandedInfoCb->setMinimumSize(expandedInfoCb->sizeHint()); - expandedUserCb->setMinimumSize(expandedUserCb->sizeHint()); - - QVBoxLayout *topLayout=new QVBoxLayout(this); - topLayout->addWidget(viewStatistics, 1); - QGridLayout *subLayout=new QGridLayout(); - topLayout->addItem(subLayout); - subLayout->setColumnStretch(1, 1); - subLayout->setColumnStretch(2, 1); - - QHBoxLayout *twoButtonsLayout=new QHBoxLayout; - twoButtonsLayout->addWidget(calcButton, 1); - twoButtonsLayout->addWidget(clearButton, 1); - - subLayout->addWidget(connectionsL, 0, 0); - subLayout->addWidget(filesL, 0, 1); - subLayout->addWidget(eventL, 1, 0); - subLayout->addWidget(serviceL, 1, 1); - subLayout->addWidget(hostL, 1, 2); - subLayout->addWidget(eventCb, 2, 0); - subLayout->addWidget(serviceLe, 2, 1); - subLayout->addWidget(hostLe, 2, 2); - subLayout->addLayout(twoButtonsLayout, 3, 0); - subLayout->addWidget(expandedInfoCb, 3, 1); - subLayout->addWidget(expandedUserCb, 3, 2); - - connect(clearButton, &QPushButton::clicked, this, &StatisticsView::clearStatistics); - connect(calcButton, &QPushButton::clicked, this, &StatisticsView::calculate); - setListInfo(0, 0, 0); -} - -void StatisticsView::setListInfo(QTreeWidget *list, int nrOfFiles, int nrOfConnections) { - dataList=list; - filesCount=nrOfFiles; - connectionsCount=nrOfConnections; - connectionsL->setText(i18n("Connections: %1", connectionsCount)); - filesL->setText(i18n("File accesses: %1", filesCount)); - clearStatistics(); -} - -void StatisticsView::calculate() { - if (dataList==0) - return; - QApplication::setOverrideCursor(Qt::WaitCursor); - int connCount(0); - if (eventCb->currentText()==i18n("Connection")) - connCount=1; - //something has to be counted exactly - if ((expandedInfoCb->isChecked()) || (expandedUserCb->isChecked())) { - SambaLog sLog; - QRegExp rService(serviceLe->text(), Qt::CaseInsensitive, QRegExp::Wildcard); - QRegExp rHost(hostLe->text(), Qt::CaseInsensitive, QRegExp::Wildcard); - QString item2, item3; - for (int i = 0; i < dataList->topLevelItemCount(); ++i) - { - QTreeWidgetItem *item = dataList->topLevelItem(i); - if (connCount) { - if ((QString(item->text(1)).contains(i18n("CONNECTION OPENED"))) && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost))) { - if (expandedInfoCb->isChecked()) - item2=item->text(2); - else - item2=serviceLe->text(); - if (expandedUserCb->isChecked()) - item3=item->text(3); - else - item3=hostLe->text(); - sLog.addItem(item2, item3); - //count++; - } - } else { - if ((QString(item->text(1)).contains(i18n("FILE OPENED"))) && (QString(item->text(2)).contains(rService)) && (QString(item->text(3)).contains(rHost))) { - if (expandedInfoCb->isChecked()) - item2=item->text(2); - else - item2=serviceLe->text(); - if (expandedUserCb->isChecked()) - item3=item->text(3); - else - item3=hostLe->text(); - sLog.addItem(item2, item3); - - } - } - } - - foreach (const LogItem *tmpItem, sLog.items) - { - if (!tmpItem) - { - continue; - } - - foreach (const SmallLogItem *tmpStr, tmpItem->accessed) { - if (!tmpStr) - { - continue; - } - - calcCount++; - const QString number = QString::asprintf("%6d", calcCount); - const QString hits = QString::asprintf("%7d", tmpStr->count); - QTreeWidgetItem *item = new QTreeWidgetItem(viewStatistics); - item->setText(0, number); - item->setText(1, eventCb->currentText()); - item->setText(2, tmpItem->name); - item->setText(3, tmpStr->name); - item->setText(4, hits); - } - } - } - //no expanded info needed - else { - calcCount++; - int count(0); - QRegExp rService(serviceLe->text(), Qt::CaseInsensitive, QRegExp::Wildcard); - QRegExp rHost(hostLe->text(), Qt::CaseInsensitive, QRegExp::Wildcard); - for (int i = 0; i < dataList->topLevelItemCount(); ++i) - { - QTreeWidgetItem *item = dataList->topLevelItem(i); - if (connCount) { - if ((item->text(1).contains(i18n("CONNECTION OPENED"))) && (item->text(2).contains(rService)) && (item->text(3).contains(rHost))) - count++; - } else { - if ((item->text(1).contains(i18n("FILE OPENED"))) && (item->text(2).contains(rService)) && (item->text(3).contains(rHost))) - count++; - } - } - const QString number = QString::asprintf("%6d", calcCount); - const QString hits = QString::asprintf("%7d", count); - QTreeWidgetItem *item = new QTreeWidgetItem(viewStatistics); - item->setText(0, number); - item->setText(1, eventCb->currentText()); - item->setText(2, serviceLe->text()); - item->setText(3, hostLe->text()); - item->setText(4, hits); - }; - QApplication::restoreOverrideCursor(); -} - -void StatisticsView::clearStatistics() { - viewStatistics->clear(); - calcCount=0; -} - -void SambaLog::printItems() { - //qDebug() << "****** printing items: ******"; - foreach (const LogItem *tmpItem, items) - { - if (!tmpItem) - { - continue; - } - - //qDebug() << "SERVICE: " << tmpItem->name; - foreach (const SmallLogItem *tmpLog, tmpItem->accessed) { - if (!tmpLog) - { - continue; - } - //qDebug() << " accessed by: " << tmpLog->name << " " << tmpLog->count; - } - } - - //qDebug() << "------ end of printing ------"; -} - -LogItem* SambaLog::itemInList(const QString &name) { - foreach (LogItem *tmpItem, items) - { - if (!tmpItem) - { - continue; - } - - if (tmpItem->name==name) - { - return tmpItem; - } - } - - return nullptr; -} - -void SambaLog::addItem(const QString &share, const QString &user) { - //cout<<" adding connection: -"<count++; - tmp->addItem(user); - } else { - items.append(new LogItem(share,user)); - } -} - -SmallLogItem* LogItem::itemInList(const QString &name) { - foreach (SmallLogItem *tmpLog, accessed) { - if (tmpLog && tmpLog->name==name) { - return tmpLog; - } - } - return 0; -} - -void LogItem::addItem(const QString &host) { - SmallLogItem* tmp(itemInList(host)); - if (tmp!=0) - tmp->count++; - else - accessed.append(new SmallLogItem(host)); -} - diff --git a/Modules/samba/ksambasharemodel.h b/Modules/samba/ksambasharemodel.h new file mode 100644 --- /dev/null +++ b/Modules/samba/ksambasharemodel.h @@ -0,0 +1,43 @@ +/* + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + +#ifndef KSAMBASHAREMODEL_H +#define KSAMBASHAREMODEL_H + +#include +#include + +/** + * Model of ksamabasharedata. Implementing properties + * as columns rather than roles. + */ +class KSambaShareModel : public QAbstractListModel +{ +Q_OBJECT +public: + enum class ColumnRole { + Name, + Path, + Comment, + ColumnCount, // End marker + }; + + explicit KSambaShareModel(QObject *parent = nullptr); + ~KSambaShareModel() override; + + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; + bool hasChildren(const QModelIndex &parent) const override; + +public slots: + void reloadData(); + +private: + QList m_list; +}; + +#endif // KSAMBASHAREMODEL_H diff --git a/Modules/samba/ksambasharemodel.cpp b/Modules/samba/ksambasharemodel.cpp new file mode 100644 --- /dev/null +++ b/Modules/samba/ksambasharemodel.cpp @@ -0,0 +1,92 @@ +/* + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + +#include "ksambasharemodel.h" + +#include +#include + +KSambaShareModel::KSambaShareModel(QObject *parent) + : QAbstractListModel(parent) +{ + connect(KSambaShare::instance(), &KSambaShare::changed, + this, &KSambaShareModel::reloadData); + reloadData(); +} + +KSambaShareModel::~KSambaShareModel() = default; + +int KSambaShareModel::rowCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent) + return m_list.size(); +} + +int KSambaShareModel::columnCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent) + return static_cast(ColumnRole::ColumnCount); +} + +QVariant KSambaShareModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (orientation != Qt::Horizontal || role != Qt::DisplayRole) { + return {}; // we only have column headers. + } + + Q_ASSERT(section < static_cast(ColumnRole::ColumnCount)); + switch (static_cast(section)) { + case ColumnRole::Name: + return i18nc("@title:column samba share name", "Name"); + case ColumnRole::Path: + return i18nc("@title:column samba share dir path", "Path"); + case ColumnRole::Comment: + return i18nc("@title:column samba share text comment/description", "Comment"); + case ColumnRole::ColumnCount: + break; // noop + } + + return {}; +} + +QVariant KSambaShareModel::data(const QModelIndex &index, int role) const +{ + if (!index.isValid()) { + return {}; + } + + Q_ASSERT(index.row() < m_list.length()); + Q_ASSERT(index.column() < static_cast(ColumnRole::ColumnCount)); + if (role == Qt::DisplayRole) { + switch (static_cast(index.column())) { + case ColumnRole::Name: + return m_list.at(index.row()).name(); + case ColumnRole::Path: + return m_list.at(index.row()).path(); + case ColumnRole::Comment: + return m_list.at(index.row()).comment(); + case ColumnRole::ColumnCount: + break; // noop + } + } + + return {}; +} + +void KSambaShareModel::reloadData() +{ + beginResetModel(); + m_list.clear(); + const auto samba = KSambaShare::instance(); + for (const auto &path : samba->sharedDirectories()) { + m_list += samba->getSharesByPath(path); + } + endResetModel(); +} + +bool KSambaShareModel::hasChildren(const QModelIndex &parent) const +{ + return !parent.isValid() ? false : (rowCount(parent) > 0); +} diff --git a/Modules/samba/ksmbstatus.h b/Modules/samba/ksmbstatus.h deleted file mode 100644 --- a/Modules/samba/ksmbstatus.h +++ /dev/null @@ -1,61 +0,0 @@ -/* - * ksmbstatus.h - * - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ -#ifndef ksmbstatus_h_included -#define ksmbstatus_h_included - -#include -#include -#include -#include - -#include - -#define SCREEN_XY_OFFSET 20 - -class NetMon : public QWidget { -Q_OBJECT -public: - explicit NetMon(QWidget *parent, KConfig * config=0); - void saveSettings() { - } - void loadSettings() { - } -private: - KConfig *configFile; - QProcess *showmountProc; - QTreeWidget *list; - QLabel *version; - QTimer *timer; - int rownumber; - enum {header, connexions, locked_files, finished, nfs} readingpart; - int lo[65536]; - int nrpid; - void processNFSLine(char *bufline, int linelen); - void processSambaLine(char *bufline, int linelen); - - QByteArray strShare, strUser, strGroup, strMachine, strSince, strPid; - int iUser, iGroup, iMachine, iPid; - -private Q_SLOTS: - void killShowmount(); - void update(); - void readFromProcess(); -}; - -#endif // main_included diff --git a/Modules/samba/ksmbstatus.cpp b/Modules/samba/ksmbstatus.cpp deleted file mode 100644 --- a/Modules/samba/ksmbstatus.cpp +++ /dev/null @@ -1,210 +0,0 @@ -/* - * ksmbstatus.cpp - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ - -#include -#include -#include -#include -#include - -#include - -#include -#include - -#include "ksmbstatus.h" - -#define Before(ttf,in) in.left(in.indexOf(ttf)) -#define After(ttf,in) (in.contains(ttf)?QString(in.mid(in.indexOf(ttf)+QString(ttf).length())):QLatin1String("")) - -NetMon::NetMon(QWidget * parent, KConfig *config) : - QWidget(parent), configFile(config), showmountProc(nullptr), strShare(""), strUser(""), strGroup(""), strMachine(""), strSince(""), strPid(""), iUser(0), iGroup(0), iMachine(0), iPid(0) { - QBoxLayout *topLayout = new QVBoxLayout(this); - - list = new QTreeWidget(this); - topLayout->addWidget(list); - version=new QLabel(this); - version->setTextInteractionFlags(Qt::TextSelectableByMouse); - topLayout->addWidget(version); - - list->setAllColumnsShowFocus(true); - list->setMinimumSize(425, 200); - - QStringList headers; - headers << i18n("Type") << i18n("Service") << i18n("Accessed From") - << i18n("UID") << i18n("GID") << i18n("PID") << i18n("Open Files"); - list->setHeaderLabels(headers); - - timer = new QTimer(this); - timer->start(15000); - QObject::connect(timer, &QTimer::timeout, this, &NetMon::update); - update(); -} - -void NetMon::processNFSLine(char *bufline, int) { - QByteArray line(bufline); - if (line.contains(":/")) { - QTreeWidgetItem *item = new QTreeWidgetItem(list); - item->setText(0, QStringLiteral("NFS")); - item->setText(0, After(QLatin1String(":"),QString::fromUtf8(line))); - item->setText(0, Before(QLatin1String(":/"),QString::fromUtf8(line))); - } -} - -void NetMon::processSambaLine(char *bufline, int) { - QByteArray line(bufline); - rownumber++; - if (rownumber == 2) - version->setText(QString::fromUtf8(bufline)); // second line = samba version - if ((readingpart==header) && line.contains("Service")) { - iUser=line.indexOf("uid"); - iGroup=line.indexOf("gid"); - iPid=line.indexOf("pid"); - iMachine=line.indexOf("machine"); - } else if ((readingpart==header) && (line.contains("---"))) { - readingpart=connexions; - } else if ((readingpart==connexions) && (int(line.length())>=iMachine)) { - strShare=line.mid(0, iUser); - strUser=line.mid(iUser, iGroup-iUser); - strGroup=line.mid(iGroup, iPid-iGroup); - strPid=line.mid(iPid, iMachine-iPid); - - line=line.mid(iMachine, line.length()); - strMachine=line; - QTreeWidgetItem * item = new QTreeWidgetItem(list); - item->setText(0, QStringLiteral("SMB")); - item->setText(1, QString::fromUtf8(strShare)); - item->setText(2, QString::fromUtf8(strMachine)); - item->setText(3, QString::fromUtf8(strUser)); - item->setText(4, QString::fromUtf8(strGroup)); - item->setText(5, QString::fromUtf8(strPid)/*,strSince*/); - } else if (readingpart==connexions) - readingpart=locked_files; - else if ((readingpart==locked_files) && (line.indexOf("No ")==0)) - readingpart=finished; - else if (readingpart==locked_files) { - if ((strncmp(bufline, "Pi", 2) !=0) // "Pid DenyMode ..." - && (strncmp(bufline, "--", 2) !=0)) // "------------" - { - char *tok=strtok(bufline, " "); - if (tok) { - int pid=atoi(tok); - (lo)[pid]++; - } - } - } -} - -// called when we get some data from smbstatus -// can be called for any size of buffer (one line, several lines, -// half of one ...) -void NetMon::readFromProcess() { - QProcess *process = qobject_cast(sender()); - if (!process || !process->canReadLine()) - return; - - qint64 buflen = 8046; // 8k enough? - char buffer[buflen]; - buflen = process->readLine(buffer, buflen); - ////qDebug()<<"received stuff"; - char s[250], *start, *end; - size_t len; - start = buffer; - while ((end = strchr(start, '\n'))) // look for '\n' - { - len = end-start; - if (len>=sizeof(s)) - len=sizeof(s)-1; - strncpy(s, start, len); - s[len] = '\0'; - ////qDebug() << "received: "<viewport()->update(); - list->update(); - } - */ - // here we could save the remaining part of line, if ever buffer - // doesn't end with a '\n' ... but will this happen ? -} - -void NetMon::update() { - QProcess *process = new QProcess(); - - memset(&lo, 0, sizeof(lo)); - list->clear(); - /* Re-read the Contents ... */ - - QString path(QString::fromUtf8(::getenv("PATH"))); - path += QLatin1String("/bin:/sbin:/usr/bin:/usr/sbin"); - - rownumber=0; - readingpart=header; - nrpid=0; - process->setEnvironment(QStringList() << (QStringLiteral("PATH=") + path)); - connect(process, &QProcess::readyRead, this, &NetMon::readFromProcess); - process->start(QStringLiteral("smbstatus")); - if (!process->waitForFinished()) { - version->setText(i18n("Error run smbstatus: %1", process->errorString())); - } else { - if (rownumber==0) // empty result - version->setText(i18n("Error: Unable to open configuration file \"smb.conf\"")); - else { - // ok -> count the number of locked files for each pid - for (int i = 0; i < list->topLevelItemCount(); ++i) - { - QTreeWidgetItem *row = list->topLevelItem(i); - // cerr<<"NetMon::update: this should be the pid: "<text(5)<text(5).toInt(); - row->setText(6,QStringLiteral("%1").arg((lo)[pid])); - } - } - } - - delete process; - process=nullptr; - - readingpart=nfs; - delete showmountProc; - showmountProc=new QProcess(); - connect(showmountProc, &QProcess::readyRead, this, &NetMon::readFromProcess); - showmountProc->setEnvironment(QStringList() << (QStringLiteral("PATH=") + path)); - //without this timer showmount hangs up to 5 minutes - //if the portmapper daemon isn't running - QTimer::singleShot(5000,this,&NetMon::killShowmount); - ////qDebug()<<"starting kill timer with 5 seconds"; - connect(showmountProc, static_cast(&QProcess::finished), this, &NetMon::killShowmount); - connect(showmountProc, &QProcess::errorOccurred, this, &NetMon::killShowmount); - showmountProc->start(QStringLiteral("showmount"), QStringList() << QStringLiteral("-a") << QStringLiteral("localhost")); - - version->adjustSize(); - list->show(); -} - -void NetMon::killShowmount() { - ////qDebug()<<"killShowmount()"; - showmountProc->deleteLater(); - showmountProc=nullptr; -} - diff --git a/Modules/samba/main.cpp b/Modules/samba/main.cpp --- a/Modules/samba/main.cpp +++ b/Modules/samba/main.cpp @@ -1,105 +1,82 @@ /* - * main.cpp for the samba kcontrol module - * - * This program is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. - */ + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ -#include - -#include -#include -#include +#include +#include #include -#include "kcmsambaimports.h" -#include "kcmsambalog.h" -#include "kcmsambastatistics.h" -#include "ksmbstatus.h" +#include #include +#include +#include +#include + +#include "ksambasharemodel.h" +#include "smbmountmodel.h" class SambaContainer : public KCModule { Q_OBJECT public: - SambaContainer(QWidget *parent=nullptr, const QVariantList &list = QVariantList()); - virtual ~SambaContainer(); - void load() override; - void save() override; + SambaContainer(QWidget *parent = nullptr, const QVariantList &list = QVariantList()); + ~SambaContainer() override = default; private: - KConfig config; - QTabWidget tabs; - NetMon status; - ImportsView imports; - LogView logView; - StatisticsView statisticsView; + QTableView *addTableView(const QString &localizedLabel, QAbstractListModel *model); }; K_PLUGIN_FACTORY(SambaFactory, registerPlugin(); ) -SambaContainer::SambaContainer(QWidget *parent, const QVariantList&) : - KCModule(parent), config(QStringLiteral("kcmsambarc")), tabs(this), status(&tabs, &config), imports(&tabs, &config), logView(&tabs, &config), statisticsView(&tabs, &config) { - QVBoxLayout *layout = new QVBoxLayout( this ); - layout->setContentsMargins(0, 0, 0, 0); - layout->setSpacing(0); - layout->addWidget(&tabs); - tabs.addTab(&status, i18n("&Exports")); - tabs.addTab(&imports, i18n("&Imports")); - tabs.addTab(&logView, i18n("&Log")); - tabs.addTab(&statisticsView, i18n("&Statistics")); - connect(&logView, &LogView::contentsChanged, &statisticsView, &StatisticsView::setListInfo); - setButtons(Help); - - setQuickHelp(i18n("

The Samba and NFS Status Monitor is a front end to the programs" - " smbstatus and showmount. Smbstatus reports on current" - " Samba connections, and is part of the suite of Samba tools, which" - " implements the SMB (Session Message Block) protocol, also called the" - " NetBIOS or LanManager protocol. This protocol can be used to provide" - " printer sharing or drive sharing services on a network including" - " machines running the various flavors of Microsoft Windows.

")); - - KAboutData *about = new KAboutData(i18n("kcmsamba"), - i18n("System Information Control Module"), - QString(), QString(), KAboutLicense::GPL, - i18n("(c) 2002 KDE Information Control Module Samba Team")); - about->addAuthor(i18n("Michael Glauche"), QString(), QStringLiteral("glauche@isa.rwth-aachen.de")); - about->addAuthor(i18n("Matthias Hoelzer"), QString(), QStringLiteral("hoelzer@kde.org")); +SambaContainer::SambaContainer(QWidget *parent, const QVariantList &) + : KCModule(parent) +{ + KAboutData *about = new KAboutData(i18n("kcmsamba"), + i18n("System Information Control Module"), + QString(), QString(), KAboutLicense::GPL, + i18n("(c) 2002 KDE Information Control Module Samba Team")); + about->addAuthor(i18n("Michael Glauche"), QString(), QStringLiteral("glauche@isa.rwth-aachen.de")); + about->addAuthor(i18n("Matthias Hoelzer"), QString(), QStringLiteral("hoelzer@kde.org")); about->addAuthor(i18n("David Faure"), QString(), QStringLiteral("faure@kde.org")); about->addAuthor(i18n("Harald Koschinski"), QString(), QStringLiteral("Harald.Koschinski@arcormail.de")); about->addAuthor(i18n("Wilco Greven"), QString(), QStringLiteral("greven@kde.org")); about->addAuthor(i18n("Alexander Neundorf"), QString(), QStringLiteral("neundorf@kde.org")); + about->addAuthor(i18n("Harald Sitter"), QString(), QStringLiteral("sitter@kde.org")); setAboutData(about); -} -SambaContainer::~SambaContainer() { - save(); -} + QVBoxLayout *layout = new QVBoxLayout(this); + Q_ASSERT(this->layout()); + setLayout(layout); + + addTableView(i18n("&Exports"), new KSambaShareModel(this)); -void SambaContainer::load() { - status.loadSettings(); - imports.loadSettings(); - logView.loadSettings(); - statisticsView.loadSettings(); + auto importsView = addTableView(i18n("&Imports"), new SmbMountModel(this)); + importsView->horizontalHeader()->setSectionResizeMode(static_cast(SmbMountModel::ColumnRole::Accessible), + QHeaderView::ResizeToContents); + + setButtons(Help); } -void SambaContainer::save() { - status.saveSettings(); - imports.saveSettings(); - logView.saveSettings(); - statisticsView.saveSettings(); - config.sync(); +QTableView *SambaContainer::addTableView(const QString &localizedLabel, QAbstractListModel *model) +{ + QString text = localizedLabel; + auto title = new KTitleWidget(this); + // hackily remove ampersand to not break i18n too much in 5.18 + // TODO: replace i18n'd string to one without quick access marker + title->setText(text.remove("&")); + title->setLevel(2); + layout()->addWidget(title); + + auto view = new QTableView(this); + layout()->addWidget(view); + view->setModel(model); + view->horizontalHeader()->setSectionResizeMode(QHeaderView::Stretch); + view->horizontalHeader()->reset(); + view->horizontalHeader()->setVisible(true); + view->verticalHeader()->setVisible(false); + + return view; } #include "main.moc" diff --git a/Modules/samba/smbmountmodel.h b/Modules/samba/smbmountmodel.h new file mode 100644 --- /dev/null +++ b/Modules/samba/smbmountmodel.h @@ -0,0 +1,54 @@ +/* + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + +#ifndef SMBMOUNTMODEL_H +#define SMBMOUNTMODEL_H + +#include +#include +#include + +/** + * Model of cifs mount entires. Implementing properties + * as columns rather than roles. + */ +class SmbMountModel : public QAbstractListModel +{ + Q_OBJECT +public: + enum class ColumnRole { + Share, + Path, + Accessible, + ColumnCount, // End marker + }; + + explicit SmbMountModel(QObject *parent = nullptr); + ~SmbMountModel() override; + + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; + QVariant data(const QModelIndex &index, int role) const override; + bool hasChildren(const QModelIndex &parent) const override; + +private slots: + void addDevice(const QString &udi); + void removeDevice(const QString &udi); + void reloadData(); + +private: + inline QList::const_iterator deviceForUdi(const QString &udi) const + { + return std::find_if(m_devices.constBegin(), m_devices.constEnd(), + [&udi](const Solid::Device &device) { + return device.udi() == udi; + }); + } + + QList m_devices; +}; + +#endif // SMBMOUNTMODEL_H diff --git a/Modules/samba/smbmountmodel.cpp b/Modules/samba/smbmountmodel.cpp new file mode 100644 --- /dev/null +++ b/Modules/samba/smbmountmodel.cpp @@ -0,0 +1,147 @@ +/* + SPDX-FileCopyrightText: 2020 Harald Sitter + SPDX-License-Identifier: GPL-2.0-only OR GPL-3.0-only OR LicenseRef-KDE-Accepted-GPL +*/ + +#include "smbmountmodel.h" + +#include +#include +#include +#include +#include +#include +#include + +SmbMountModel::SmbMountModel(QObject *parent) + : QAbstractListModel(parent) +{ + connect(Solid::DeviceNotifier::instance(), &Solid::DeviceNotifier::deviceAdded, + this, &SmbMountModel::addDevice); + connect(Solid::DeviceNotifier::instance(), &Solid::DeviceNotifier::deviceRemoved, + this, &SmbMountModel::removeDevice); + reloadData(); +} + +SmbMountModel::~SmbMountModel() = default; + +int SmbMountModel::rowCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent) + return m_devices.size(); +} + +int SmbMountModel::columnCount(const QModelIndex &parent) const +{ + Q_UNUSED(parent) + return static_cast(ColumnRole::ColumnCount); +} + +QVariant SmbMountModel::headerData(int section, Qt::Orientation orientation, int role) const +{ + if (orientation != Qt::Horizontal || role != Qt::DisplayRole) { + return {}; // we only have column headers. + } + + Q_ASSERT(section (ColumnRole::ColumnCount)); + switch (static_cast(section)) { + case ColumnRole::Share: + return i18n("Resource"); // TODO: maybe reword for 5.19 + case ColumnRole::Path: + return i18n("Mounted Under"); // TODO: maybe reword for 5.19 + case ColumnRole::Accessible: + return i18nc("@title:column whether a samba share is accessible locally (i.e. mounted)", "Accessible"); + case ColumnRole::ColumnCount: + break; // noop + } + + return {}; +} + +QVariant SmbMountModel::data(const QModelIndex &index, int role) const +{ + if (!index.isValid()) { + return {}; + } + + Q_ASSERT(index.row() < m_devices.count()); + Q_ASSERT(index.column() (ColumnRole::ColumnCount)); + + if (role == Qt::DisplayRole) { + switch (static_cast(index.column())) { + case ColumnRole::Share: + return m_devices.at(index.row()).as()->url(); + case ColumnRole::Path: + return m_devices.at(index.row()).as()->filePath(); + case ColumnRole::Accessible: + break; // Decoration only + case ColumnRole::ColumnCount: + break; // noop + } + } + + if (role == Qt::DecorationRole) { + switch (static_cast(index.column())) { + case ColumnRole::Accessible: + // Using characters here since we use a QTableView and can't just + return m_devices.at(index.row()).as()->isAccessible() + ? QIcon::fromTheme("dialog-ok") + : QIcon::fromTheme("dialog-cancel"); + case ColumnRole::Share: + case ColumnRole::Path: + break; // Display only + case ColumnRole::ColumnCount: + break; // noop + } + } + + return {}; +} + +void SmbMountModel::addDevice(const QString &udi) +{ + auto it = deviceForUdi(udi); + if (it != m_devices.constEnd()) { + return; // already in the list + } + + beginInsertRows(QModelIndex(), m_devices.count(), m_devices.count()); + m_devices.append(Solid::Device(udi)); + endInsertRows(); +} + +void SmbMountModel::removeDevice(const QString &udi) +{ + auto it = deviceForUdi(udi); + if (it == m_devices.constEnd()) { + return; // untracked udi + } + + const int index = static_cast(std::distance(m_devices.constBegin(), it)); + beginRemoveRows(QModelIndex(), index, index); + m_devices.removeAt(index); + endRemoveRows(); +} + +void SmbMountModel::reloadData() +{ + beginResetModel(); + m_devices.clear(); + const auto devices = Solid::Device::listFromType(Solid::DeviceInterface::NetworkShare); + for (auto it = devices.begin(); it != devices.end(); ++it) { + switch (it->as()->type()) { + case Solid::NetworkShare::Cifs: + m_devices.append(*it); + continue; + case Solid::NetworkShare::Nfs: + case Solid::NetworkShare::Unknown: + continue; + } + } + endResetModel(); +} + +bool SmbMountModel::hasChildren(const QModelIndex &parent) const +{ + return !parent.isValid() ? false : (rowCount(parent) > 0); +}