Skip to content

Commit

Permalink
refactor: remove legacy plugins and migrate to new architecture
Browse files Browse the repository at this point in the history
- Removed legacy plugins:
  * dfmplugin-bookmark
  * dfmplugin-core
  * dfmplugin-detailspace
  * dfmplugin-sidebar
  * dfmplugin-titlebar
  * dfmplugin-workspace
  * dfmplugin-trash
  * dfmplugin-recent
  * dfmplugin-computer
  * ddplugin-canvas
  * ddplugin-core

- Updated installation paths:
  * Changed from DFM_PLUGIN_COMMON_EDGE_DIR to DFM_PLUGIN_COMMON_CORE_DIR
  * Updated paths in CMake configurations
  * Removed unnecessary directory prefixes

- Cleaned up debian packaging:
  * Removed obsolete .install files
  * Updated dependencies
  * Removed lintian overrides

This change is part of the architectural redesign to simplify the plugin system
and improve maintainability by removing deprecated components and consolidating
core functionality.

Log: refactor project structure
  • Loading branch information
Johnson-zs authored and deepin-bot[bot] committed Dec 3, 2024
1 parent 14ecabb commit ff975e9
Show file tree
Hide file tree
Showing 778 changed files with 127 additions and 158 deletions.
73 changes: 22 additions & 51 deletions debian/control
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,10 @@ Depends:
${shlibs:Depends},
${misc:Depends},
libdde-file-manager (=${binary:Version}),
dde-desktop-plugins (=${binary:Version}),
libqt6sql6-sqlite,
qt6-translations-l10n
Conflicts: dde-workspace (<< 2.90.5), dde-file-manager-oem
Replaces: dde-file-manager-oem, dde-file-manager (<< 6.0.1)
Conflicts: dde-workspace (<< 2.90.5), dde-file-manager-oem, dde-desktop-plugins
Replaces: dde-file-manager-oem, dde-file-manager (<< 6.0.1), dde-desktop-plugins
Recommends: qt5dxcb-plugin, deepin-screensaver, dcc-wallpapersetting-plugin
Description: deepin desktop-environment - desktop module
Deepin Desktop Environment (DDE) - desktop module.
Expand All @@ -91,13 +90,19 @@ Depends:
socat,
cryfs,
dde-device-formatter,
dde-file-manager-plugins (=${binary:Version}),
dde-file-manager-daemon-plugins (=${binary:Version}),
dde-file-manager-services-plugins (=${binary:Version}),
dde-file-manager-common-plugins (=${binary:Version}),
dde-file-manager-preview (=${binary:Version}),
libblockdev-crypto2 | libblockdev-crypto3
Replaces: dde-file-manager-oem, dde-desktop (<< 6.0.1), libdde-file-manager
libblockdev-crypto2 | libblockdev-crypto3,
dde-file-manager-services-plugins (=${binary:Version})
Replaces: dde-file-manager-oem, dde-desktop (<< 6.0.1),
dde-file-manager-preview,
dde-file-manager-preview-plugins,
dde-file-manager-plugins,
dde-file-manager-daemon-plugins,
dde-file-manager-common-plugins
Conflicts: dde-file-manager-preview,
dde-file-manager-preview-plugins,
dde-file-manager-plugins,
dde-file-manager-daemon-plugins,
dde-file-manager-common-plugins
Recommends: dde-qt5integration, avfs, samba, deepin-anything-server
Description: File manager front end
File manager front-end of Deepin OS
Expand All @@ -115,46 +120,6 @@ Multi-Arch: same
Description: DDE File Manager core librarys
This package contains the shared libraries.

Package: dde-desktop-plugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: deepin desktop-environment - desktop edge plugins module
Deepin Desktop Environment (DDE) - desktop edge plugins module.

Package: dde-file-manager-plugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, cryfs
Description: deepin desktop-environment - filemanager edge plugins module
Deepin Desktop Environment (DDE) - filemanager edge plugins module.

Package: dde-file-manager-common-plugins
Architecture: any
Depends:
${shlibs:Depends},
${misc:Depends}
Description: deepin desktop-environment - filemanager common edge plugins module
Deepin Desktop Environment (DDE) - filemanager common edge plugins module.

Package: dde-file-manager-daemon-plugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Conflics: dde-file-manager-server-plugins
Description: deepin desktop-environment - daemon edge plugins module
Deepin Desktop Environment (DDE) - daemon edge plugins module.

Package: dde-file-manager-services-plugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: deepin desktop-environment - services edge plugins module
Deepin Desktop Environment (DDE) - services edge plugins module.

Package: dde-file-manager-preview
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Replaces: dde-file-manager-preview-plugins
Description: deepin desktop-environment - filemanager preview module
Deepin Desktop Environment (DDE) - filemanager preview edge module.

Package: dde-disk-mount-plugin
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Expand All @@ -167,6 +132,12 @@ Depends: ${shlibs:Depends}, ${misc:Depends}
Description: extension library of dde-file-manager
Extension library of dde-file-manager which is provided for third parties

Package: dde-file-manager-services-plugins
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: deepin desktop-environment - deepin-service-manager plugins module
Deepin Desktop Environment (DDE) - deepin-service-manager plugins module.

Package: libdfm-extension-dev
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}, libdfm-extension (=${binary:Version})
Expand All @@ -181,4 +152,4 @@ Depends: ${shlibs:Depends}, ${misc:Depends}, dde-file-manager (=${binary:Version
Description: DDE File Manager Devel library
This package contains the header files and static libraries
of dde-file-manager

1 change: 0 additions & 1 deletion debian/dde-desktop-plugins.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/dde-file-manager-common-plugins.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/dde-file-manager-daemon-plugins.install

This file was deleted.

4 changes: 4 additions & 0 deletions debian/dde-file-manager-dev.install
Original file line number Diff line number Diff line change
@@ -1,6 +1,10 @@
usr/include/dfm-base/*
usr/include/dfm-framework/*
usr/lib/*/pkgconfig/dfm-framework.pc
usr/lib/*/pkgconfig/dfm6-framework.pc
usr/lib/*/cmake/dfm-framework/*.cmake
usr/lib/*/cmake/dfm6-framework/*.cmake
usr/lib/*/pkgconfig/dfm-base.pc
usr/lib/*/pkgconfig/dfm6-base.pc
usr/lib/*/cmake/dfm-base/*.cmake
usr/lib/*/cmake/dfm6-base/*.cmake
1 change: 0 additions & 1 deletion debian/dde-file-manager-plugins.install

This file was deleted.

1 change: 0 additions & 1 deletion debian/dde-file-manager-plugins.lintian-overrides

This file was deleted.

4 changes: 0 additions & 4 deletions debian/dde-file-manager-preview.install

This file was deleted.

3 changes: 3 additions & 0 deletions debian/dde-file-manager.install
Original file line number Diff line number Diff line change
@@ -1,13 +1,15 @@
usr/bin/dde-file-manager
usr/bin/file-manager.sh
usr/libexec/dde-file-manager
usr/libexec/dde-file-manager-preview
usr/bin/dde-file-manager-pkexec
usr/bin/dde-file-manager-daemon
usr/bin/dde-property-dialog
usr/bin/dde-file-dialog
usr/bin/dde-select-dialog-x11
usr/bin/dde-select-dialog-wayland
usr/lib/*/dde-file-manager/plugins/filemanager-core/*.so
usr/lib/*/dde-file-manager/plugins/previews/*.so
usr/share/applications/dde-file-manager.desktop
usr/share/applications/dde-open.desktop
usr/share/dde-file-manager/translations/*.qm
Expand All @@ -21,6 +23,7 @@ usr/share/deepin-manual/manual-assets/application
usr/share/polkit-1/actions/*.policy
usr/share/deepin-log-viewer/deepin-log.conf.d/*.json
usr/share/deepin-debug-config/deepin-debug-config.d/*.json
usr/share/mime/packages/dtk-dci.xml
usr/lib/systemd/user/
etc/X11/Xsession.d/99dfm-dlnfs-automount
etc/deepin/dde-file-manager/dfm-dlnfs-automount
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,6 @@ target_link_libraries(${PROJECT_NAME}
)

#install library file
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${DFM_PLUGIN_COMMON_EDGE_DIR})
install(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION ${DFM_PLUGIN_COMMON_CORE_DIR})
INSTALL_DCONFIG("org.deepin.dde.file-manager.preview.json")

10 changes: 5 additions & 5 deletions src/plugins/common/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
cmake_minimum_required(VERSION 3.10)

# add sub dir for business plugins
add_subdirectory(core/dfmplugin-fileoperations)
add_subdirectory(core/dfmplugin-propertydialog)
add_subdirectory(core/dfmplugin-trashcore) # TODO(zhangs): merge it
add_subdirectory(core/dfmplugin-menu)
add_subdirectory(core/dfmplugin-bookmark)
add_subdirectory(dfmplugin-fileoperations)
add_subdirectory(dfmplugin-propertydialog)
add_subdirectory(dfmplugin-trashcore) # TODO(zhangs): merge it
add_subdirectory(dfmplugin-menu)
add_subdirectory(dfmplugin-bookmark)
add_subdirectory(dfmplugin-burn)
add_subdirectory(dfmplugin-emblem)
add_subdirectory(dfmplugin-dirshare)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "events/bookmarkeventreceiver.h"
#include "menu/bookmarkmenuscene.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_event_defines.h>
#include <dfm-base/widgets/filemanagerwindowsmanager.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@
#include "private/bookmarkmenuscene_p.h"
#include "controller/bookmarkmanager.h"

#include "plugins/common/core/dfmplugin-menu/menuscene/action_defines.h"
#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menuscene/action_defines.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_global_defines.h>
#include <dfm-base/base/schemefactory.h>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-burn/burn.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "utils/burnsignalmanager.h"
#include "events/burneventreceiver.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_global_defines.h>
#include <dfm-base/dfm_event_defines.h>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-burn/dfmplugin-burn.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ install(TARGETS
${BIN_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_COMMON_EDGE_DIR}
${DFM_PLUGIN_COMMON_CORE_DIR}
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "events/burneventreceiver.h"
#include "events/burneventcaller.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_menu_defines.h>
#include <dfm-base/dfm_global_defines.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ install(TARGETS
${BIN_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_COMMON_EDGE_DIR}
${DFM_PLUGIN_COMMON_CORE_DIR}
)
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-dirshare/dirshare.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "widget/sharecontrolwidget.h"
#include "utils/usersharehelper.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"
#include <dfm-base/base/schemefactory.h>
#include <dfm-base/dfm_global_defines.h>

Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-emblem/dfmplugin-emblem.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -18,5 +18,5 @@ install(TARGETS
${BIN_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_COMMON_EDGE_DIR}
${DFM_PLUGIN_COMMON_CORE_DIR}
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "action_defines.h"
#include "templatemenuscene/templatemenuscene.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_menu_defines.h>
#include <dfm-base/dfm_event_defines.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
#include "propertymenuscene_p.h"
#include "events/propertyeventreceiver.h"

#include "plugins/common/core/dfmplugin-menu/menuscene/action_defines.h"
#include "plugins/common/dfmplugin-menu/menuscene/action_defines.h"

#include <dfm-base/dfm_menu_defines.h>
#include <dfm-base/mimetype/mimesappsmanager.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
#include "menu/propertymenuscene.h"
#include "utils/propertydialogmanager.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

namespace dfmplugin_propertydialog {
DFM_LOG_REISGER_CATEGORY(DPPROPERTYDIALOG_NAMESPACE)
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-tag/dfmplugin-tag.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -32,5 +32,5 @@ install(TARGETS
${BIN_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_COMMON_EDGE_DIR}
${DFM_PLUGIN_COMMON_CORE_DIR}
)
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-tag/menu/tagdirmenuscene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#include "tagdirmenuscene.h"
#include "private/tagdirmenuscene_p.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_menu_defines.h>
#include <dfm-base/base/schemefactory.h>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-tag/menu/tagmenuscene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
#include "widgets/tagcolorlistwidget.h"
#include "events/tageventcaller.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_global_defines.h>
#include <dfm-base/base/schemefactory.h>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-tag/tag.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
#include "events/tageventreceiver.h"
#include "data/tagproxyhandle.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/base/urlroute.h>
#include <dfm-base/base/schemefactory.h>
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/common/dfmplugin-utils/dfmplugin-utils.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -30,5 +30,5 @@ install(TARGETS
${BIN_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_COMMON_EDGE_DIR}
${DFM_PLUGIN_COMMON_CORE_DIR}
)
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "private/extensionlibmenuscene_p.h"
#include "extensionimpl/pluginsload/extensionpluginmanager.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/dfm_menu_defines.h>
#include <dfm-base/utils/universalutils.h>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
#include "windowimpl/extensionwindowsmanager.h"
#include "pluginsload/extensionpluginmanager.h"

#include "plugins/common/core/dfmplugin-menu/menu_eventinterface_helper.h"
#include "plugins/common/dfmplugin-menu/menu_eventinterface_helper.h"

#include <dfm-base/widgets/filemanagerwindowsmanager.h>

Expand Down
4 changes: 2 additions & 2 deletions src/plugins/daemon/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required(VERSION 3.10)

add_subdirectory(core/daemonplugin-core)
add_subdirectory(daemonplugin-core)
add_subdirectory(daemonplugin-filemanager1)
add_subdirectory(daemonplugin-tag)
add_subdirectory(daemonplugin-vault)
add_subdirectory(daemon-recentdaemon)
add_subdirectory(daemon-recentdaemon)
2 changes: 1 addition & 1 deletion src/plugins/daemon/daemon-recentdaemon/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ install(TARGETS
${PROJECT_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_DAEMON_EDGE_DIR}
${DFM_PLUGIN_FILEMANAGER_CORE_DIR}
)
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ install(TARGETS
${PROJECT_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_DAEMON_EDGE_DIR}
${DFM_PLUGIN_FILEMANAGER_CORE_DIR}
)

# install dbus
Expand Down
2 changes: 1 addition & 1 deletion src/plugins/daemon/daemonplugin-tag/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -46,5 +46,5 @@ install(TARGETS
${PROJECT_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_DAEMON_EDGE_DIR}
${DFM_PLUGIN_FILEMANAGER_CORE_DIR}
)
2 changes: 1 addition & 1 deletion src/plugins/daemon/daemonplugin-vault/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -45,5 +45,5 @@ install(TARGETS
${PROJECT_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_DAEMON_EDGE_DIR}
${DFM_PLUGIN_FILEMANAGER_CORE_DIR}
)
4 changes: 2 additions & 2 deletions src/plugins/desktop/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ include_directories(
${CMAKE_CURRENT_SOURCE_DIR}
)

add_subdirectory(core/ddplugin-core)
add_subdirectory(core/ddplugin-canvas)
add_subdirectory(ddplugin-core)
add_subdirectory(ddplugin-canvas)
add_subdirectory(ddplugin-background)
add_subdirectory(ddplugin-organizer)
add_subdirectory(ddplugin-wallpapersetting)
Original file line number Diff line number Diff line change
Expand Up @@ -36,5 +36,5 @@ install(TARGETS
${BIN_NAME}
LIBRARY
DESTINATION
${DFM_PLUGIN_DESKTOP_EDGE_DIR}
${DFM_PLUGIN_DESKTOP_CORE_DIR}
)
Loading

0 comments on commit ff975e9

Please sign in to comment.