Develop/snipe 25

.reuse/dep5

@@ -74,12 +74,12 @@ Copyright: UnionTech Software Technology Co., Ltd.
 License: MIT
 
 # fulltext
-Files: src/plugins/filemanager/dfmplugin-search/3rdparty/fulltext/*
+Files: 3rdparty/fulltext/*
 Copyright: 2009-2014 Alan Wright
 License: LGPL-3.0-or-later
 
 # fsearch
-Files: src/plugins/filemanager/dfmplugin-search/3rdparty/fsearch/*
+Files: 3rdparty/fsearch/*
 Copyright: 2020 Christian Boxdörfer
 License: MIT
 

src/plugins/filemanager/dfmplugin-search/3rdparty/fsearch/database.c → 3rdparty/fsearch/database.c

@@ -46,6 +46,7 @@
 // add py index,update database version to 1.0
 #define DATABASE_MAJOR_VERSION 1
 #define DATABASE_MINOR_VERSION 0
+#define MAX_DIR_DEPTH 100
 
 #define DATABASE_FILTER_PATH "^((/boot)|(/dev)|(/proc)|(/sys)|(/root)|(/run)).*$"
 
@@ -458,15 +459,16 @@ db_location_walk_tree_recursive(DatabaseLocation *location,
                                 BTreeNode *parent,
                                 int spec,
                                 bool *is_stop,
-                                bool has_data_prefix)
+                                bool has_data_prefix,
+                                const int depth)
 {
     if (*is_stop)
         return WALK_OK;
 
     if (!db_support(dname, has_data_prefix))
         return WALK_BADPATTERN;
 
-    int len = strlen(dname);
+    size_t len = strlen(dname);
     if (len >= FILENAME_MAX - 1) {
         //trace ("filename too long: %s\n", dname);
         return WALK_NAMETOOLONG;
@@ -535,7 +537,7 @@ db_location_walk_tree_recursive(DatabaseLocation *location,
                                          is_dir);
         btree_node_prepend(parent, node);
         location->num_items++;
-        if (is_dir) {
+        if (is_dir && depth <= MAX_DIR_DEPTH) {
             db_location_walk_tree_recursive(location,
                                             db_config,
                                             excludes,
@@ -546,7 +548,8 @@ db_location_walk_tree_recursive(DatabaseLocation *location,
                                             node,
                                             spec,
                                             is_stop,
-                                            has_data_prefix);
+                                            has_data_prefix,
+                                            depth + 1);
         }
     }
 
@@ -598,7 +601,8 @@ db_location_build_tree(const char *dname, DatabaseConfig *db_config, bool *is_st
                                                    root,
                                                    spec,
                                                    is_stop,
-                                                   has_data_prefix);
+                                                   has_data_prefix,
+                                                   0);
     config_free(config);
     g_timer_destroy(timer);
     if (res == WALK_OK) {

src/plugins/filemanager/dfmplugin-search/3rdparty/fulltext/chinesetokenizer.cpp → 3rdparty/fulltext/chinesetokenizer.cpp

@@ -80,7 +80,6 @@ bool ChineseTokenizer::incrementToken()
     length = 0;
     start = offset;
 
-    bool last_is_en = false, last_is_num = false;
     while (true) {
         wchar_t c;
         ++offset;
@@ -97,41 +96,13 @@ bool ChineseTokenizer::incrementToken()
             c = ioBuffer[bufferIndex++];
         }
 
-        if (UnicodeUtil::isLower(c) || UnicodeUtil::isUpper(c)) {
-            if (last_is_num) {
-                --bufferIndex;
-                --offset;
-                return flush();
-            }
-
-            push(c);
-            if (length == kMaxWordLen) {
-                return flush();
-            }
-            last_is_en = true;
-        } else if (UnicodeUtil::isDigit(c)) {
-            if (last_is_en) {
-                --bufferIndex;
-                --offset;
-                return flush();
-            }
-
-            push(c);
-            if (length == kMaxWordLen) {
-                return flush();
-            }
-            last_is_num = true;
-        } else if (UnicodeUtil::isOther(c)) {
-            if (length > 0) {
-                --bufferIndex;
-                --offset;
-                return flush();
-            }
-            push(c);
-            return flush();
-        } else if (length > 0) {
+        if (length > 0) {
+            --bufferIndex;
+            --offset;
             return flush();
         }
+        push(c);
+        return flush();
     }
 }
 

assets/configs/org.deepin.dde.file-manager.animation.json

@@ -6,10 +6,65 @@
             "value":true,
             "serial":0,
             "flags":[],
-            "name":"View animation enabled",
-            "name[zh_CN]":"启用视图动效",
-            "description[zh_CN]":"用于判断是否允许在视图中开启动效",
-            "description":"Used to determine if the view animation enabled",
+            "name":"Global animation switch",
+            "name[zh_CN]":"全局动画开关",
+            "description[zh_CN]":"用于控制所有动画效果的总开关（暂未实现）",
+            "description":"Used to control all animation effects globally (not implemented yet)",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "dfm.animation.enter.enable": {
+            "value":false,
+            "serial":0,
+            "flags":[],
+            "name":"Directory enter animation enabled",
+            "name[zh_CN]":"启用访问文件夹动效",
+            "description[zh_CN]":"用于控制进入文件夹时的过渡动画效果",
+            "description":"Used to control the transition animation when entering directories",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "dd.animation.resort.enable": {
+            "value":true,
+            "serial":0,
+            "flags":[],
+            "name":"Desktop sort animation enabled",
+            "name[zh_CN]":"启用桌面排序动效",
+            "description[zh_CN]":"用于控制桌面图标排序变化时的过渡动画效果",
+            "description":"Used to control the transition animation when changing desktop icon sort order",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "dfm.animation.detailview.enable": {
+            "value":true,
+            "serial":0,
+            "flags":[],
+            "name":"Detail view expand animation enabled",
+            "name[zh_CN]":"启用详情视图展开动效",
+            "description[zh_CN]":"用于控制详情视图展开和收起时的动画效果",
+            "description":"Used to control the animation when expanding/collapsing detail view",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "dfm.animation.layout.enable": {
+            "value":true,
+            "serial":0,
+            "flags":[],
+            "name":"Icon view layout animation enabled",
+            "name[zh_CN]":"启用图标视图重新布局动效",
+            "description[zh_CN]":"用于控制图标视图重新布局时的动画效果",
+            "description":"Used to control the animation when relayouting icon view",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "dfm.animation.sidebar.enable": {
+            "value":true,
+            "serial":0,
+            "flags":[],
+            "name":"Sidebar fold animation enabled",
+            "name[zh_CN]":"启用侧边栏折叠动效",
+            "description[zh_CN]":"用于控制侧边栏展开和折叠时的动画效果",
+            "description":"Used to control the animation when expanding/collapsing sidebar",
             "permissions":"readwrite",
             "visibility":"private"
         },
@@ -101,6 +156,28 @@
             "permissions":"readwrite",
             "visibility":"private"
         },
+        "dfm.animation.sidebar.duration": {
+            "value":366,
+            "serial":0,
+            "flags":[],
+            "name":"Sidebar show animation duration",
+            "name[zh_CN]":"侧边栏出入动效时长",
+            "description[zh_CN]":"用于调整侧边栏开关时动效播放时长",
+            "description":"Used to adjust the sidebar show animation duration",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
+        "dfm.animation.sidebar.curve": {
+            "value":22,
+            "serial":0,
+            "flags":[],
+            "name":"Sidebar show animation curve",
+            "name[zh_CN]":"侧边栏出入动效动画曲线",
+            "description[zh_CN]":"用于调整侧边栏出入时动效动画曲线",
+            "description":"Used to adjust the sidebar show animation curve",
+            "permissions":"readwrite",
+            "visibility":"private"
+        },
         "dd.animation.resort.custom.duration": {
             "value":366,
             "serial":0,

assets/configs/org.deepin.dde.file-manager.view.json

@@ -23,6 +23,17 @@
             "description":"Used to determine whether to enable Open folder windows in a separate process",
             "permissions":"readwrite",
             "visibility":"private"
+        },
+        "dfm.displaypreview.visible": {
+            "value":false,
+            "serial":0,
+            "flags":[],
+            "name":"Display preview visible",
+            "name[zh_CN]":"显示预览",
+            "description[zh_CN]":"控制显示预览",
+            "description":"Control display preview",
+            "permissions":"readwrite",
+            "visibility":"private"
         }
     }
 }

assets/dbus/org.deepin.Filemanager.TextIndex.xml

@@ -0,0 +1,32 @@
+<!DOCTYPE node PUBLIC "-//freedesktop//DTD D-BUS Object Introspection 1.0//EN" "http://www.freedesktop.org/standards/dbus/1.0/introspect.dtd">
+<node>
+  <interface name="org.deepin.Filemanager.TextIndex">
+    <signal name="TaskFinished">
+      <arg name="type" type="s" direction="out"/>
+      <arg name="path" type="s" direction="out"/>
+      <arg name="success" type="b" direction="out"/>
+    </signal>
+    <signal name="TaskProgressChanged">
+      <arg name="type" type="s" direction="out"/>
+      <arg name="path" type="s" direction="out"/>
+      <arg name="count" type="x" direction="out"/>
+    </signal>
+    <method name="CreateIndexTask">
+      <arg type="b" direction="out"/>
+      <arg name="path" type="s" direction="in"/>
+    </method>
+    <method name="UpdateIndexTask">
+      <arg type="b" direction="out"/>
+      <arg name="path" type="s" direction="in"/>
+    </method>
+    <method name="StopCurrentTask">
+      <arg type="b" direction="out"/>
+    </method>
+    <method name="HasRunningTask">
+      <arg type="b" direction="out"/>
+    </method>
+    <method name="IndexDatabaseExists">
+      <arg type="b" direction="out"/>
+    </method>
+  </interface>
+</node>

assets/scripts/dde-file-manager

@@ -5,20 +5,33 @@
 # SPDX-License-Identifier: GPL-3.0-or-later
 
 # qurl::toPercentEncoding的加密规则
+# When Chinese special characters are mixed, only the ascall character set is used for encoding. 
+# When Chinese characters and special characters are mixed, encoding errors occur, 
+# resulting in the inability to open some directories with special characters. 
+# Here, utf-8 multi-byte encoding is used.
 urlencode() {
-    local string="${1}"
-    local strlen=${#string}
-    local encoded=""
+    local input="${1}"
+    local output=""
+    local char
 
-    for (( pos=0 ; pos<strlen ; pos++ )); do
-        c=${string:$pos:1}
-        printf -v o '%%%02x' "'$c"
-        case "$c" in
-            [-_.~a-zA-Z0-9] ) o=${c} ;;
-        esac
-        encoded+="${o}"
-    done
-    echo "${encoded}"
+
+    while IFS= read -r -n1 char; do
+        # Convert the character into bytes
+        if [[ "$char" =~ [a-zA-Z0-9\-\_\.\~] ]]; then
+            # If the character is unreserved, append as is
+            output+="$char"
+        else
+            # Handle multi-byte characters
+            local bytes
+            bytes=$(printf "%s" "$char" | od -An -tx1 | tr -d ' \n')
+            while [[ "$bytes" != "" ]]; do
+                output+="%${bytes:0:2}"  # Take the first byte
+                bytes="${bytes:2}"      # Remove the first byte
+            done
+        fi
+    done < <(printf "%s" "$input")
+
+    echo "$output"
 }
 
 args=""
@@ -65,8 +78,6 @@ for arg in "$@"; do
     args+="$arg,"
 done
 args=${args%,}
-echo "dbus args = "$args
-echo "origin args = "$argsOrigin
 
 if [[ $isDbus == "false" ]]; then
     exec file-manager.sh "$argsOrigin"

debian/changelog

@@ -1,3 +1,10 @@
+dde-file-manager (6.5.11) unstable; urgency=medium
+
+  *fix bugs
+  * 
+
+ -- zhangsheng <[email protected]>  Sat, 30 Nov 2024 09:15:27 +0800
+
 dde-file-manager (6.5.10) unstable; urgency=medium
 
   [ zhangsheng ]

debian/dde-file-manager-services-plugins.install

@@ -1,5 +1,6 @@
 usr/lib/*/deepin-service-manager/*.so
 usr/share/deepin-service-manager/system/*.json
-
+usr/share/deepin-service-manager/user/*.json
 usr/share/dbus-1/system.d/*.conf
-usr/share/dbus-1/system-services/*.service
+usr/share/dbus-1/system-services/*.service
+etc/systemd/system/[email protected]/*

debian/rules

@@ -21,4 +21,10 @@ override_dh_auto_configure:
 	-DAPP_VERSION=$(DEB_VERSION_UPSTREAM) -DVERSION=$(DEB_VERSION_UPSTREAM) LIB_INSTALL_DIR=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 override_dh_auto_build:
-	dh_auto_build -- -j8
+	dh_auto_build -- -j8
+
+override_dh_auto_install:
+	dh_auto_install --destdir=debian/tmp
+
+override_dh_shlibdeps:
+	dh_shlibdeps --dpkg-shlibdeps-params=--ignore-missing-info

include/dfm-base/dfm_global_defines.h

@@ -26,6 +26,10 @@ enum class ViewMode {
     kAllViewMode = kIconMode | kListMode | kExtendMode
 };
 
+inline constexpr int kIconSizeMax { 512 };
+inline constexpr int kIconSizeMin { 24 };
+inline constexpr int kIconSizeStep { 8 };
+
 enum class TransparentStatus : uint8_t {
     kDefault,
     kTransparent,

include/dfm-base/dfm_plugin_defines.h

@@ -31,7 +31,7 @@ inline constexpr std::initializer_list<const char *> kFileManager {
 
 namespace Edge {
 inline constexpr std::initializer_list<const char *> kCommon {
-    "dfmplugin-emblem", "dfmplugin-filepreview", "dfmplugin-tag",
+    "dfmplugin-emblem", "dfmplugin-tag",
     "dfmplugin-dirshare", "dfmplugin-burn"
 };
 inline constexpr std::initializer_list<const char *> kFileManager {

include/dfm-base/settingdialog/settingjsongenerator.h

@@ -57,6 +57,7 @@ class SettingJsonGenerator
     bool addCheckBoxConfig(const QString &key, const QString &text, bool defaultVal = true);
     bool addComboboxConfig(const QString &key, const QString &name, const QStringList &options, int defaultVal = 0);
     bool addComboboxConfig(const QString &key, const QString &name, const QVariantMap &options, QVariant defaultVal = QVariant());
+    bool addSliderConfig(const QString &key, const QString &name, int maxVal, int minVal, int defaultVal = 0);
 
 protected:
     SettingJsonGenerator();