Develop/snipe

.github/workflows/backup-to-gitlab.yml

@@ -8,10 +8,8 @@ concurrency:
 jobs:
   backup-to-gitlabwh:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitlabwh.yml@master
-    secrets:
-      BRIDGETOKEN: ${{ secrets.BRIDGETOKEN }}
+    secrets: inherit
 
   backup-to-gitee:
     uses: linuxdeepin/.github/.github/workflows/backup-to-gitee.yml@master
-    secrets:
-      GITEE_SYNC_TOKEN: ${{ secrets.GITEE_SYNC_TOKEN }}
+    secrets: inherit

.github/workflows/call-build-distribution.yml

@@ -10,8 +10,4 @@ on:
 jobs:
   check_job:
     uses: linuxdeepin/.github/.github/workflows/build-distribution.yml@master
-    secrets:
-      BUILD_GPG_PRIVATE_KEY: ${{ secrets.BUILD_GPG_PRIVATE_KEY }}
-      BUILD_SSH_PRIVATE_KEY: ${{ secrets.BUILD_SSH_PRIVATE_KEY }}
-      WEBDAV_PASSWD: ${{ secrets.WEBDAV_PASSWD }}
-      WEBDAV_USER: ${{ secrets.WEBDAV_USER }}
+    secrets: inherit

.github/workflows/call-chatOps.yml

@@ -6,5 +6,4 @@ on:
 jobs:
   chatopt:
     uses: linuxdeepin/.github/.github/workflows/chatOps.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.github/workflows/call-clacheck.yml

@@ -12,5 +12,4 @@ concurrency:
 jobs:
   clacheck:
     uses: linuxdeepin/.github/.github/workflows/cla-check.yml@master
-    secrets:
-      APP_PRIVATE_KEY: ${{ secrets.APP_PRIVATE_KEY }}
+    secrets: inherit

.obs/workflows.yml

@@ -28,10 +28,9 @@ test_build:
 
 tag_build:
   steps:
-    - branch_package:
-        source_project: deepin:Develop:dde
-        source_package: %{SCM_REPOSITORY_NAME}
-        target_project: deepin:Unstable:dde
+    - trigger_services:
+        project: deepin:Unstable:dde
+        package: %{SCM_REPOSITORY_NAME}
   filters:
     event: tag_push
 

.tx/config

@@ -5,6 +5,7 @@ mode = developer
 
 [o:linuxdeepin:p:deepin-desktop-environment:r:dde-daemonpot]
 file_filter = misc/po/<lang>.po
+minimum_perc = 0
 source_file = misc/po/dde-daemon.pot
 source_lang = en
 type = PO

Makefile

@@ -133,7 +133,7 @@ translate: $(addsuffix /LC_MESSAGES/dde-daemon.mo, $(addprefix out/locale/, ${LA
 pot:
 	deepin-update-pot misc/po/locale_config.ini
 
-POLICIES=accounts1 Grub2 Fprintd1
+POLICIES=accounts grub2 fprintd
 ts:
 	for i in $(POLICIES); do \
 		deepin-policy-ts-convert policy2ts misc/polkit-action/org.deepin.dde.$$i.policy.in misc/ts/org.deepin.dde.$$i.policy; \
@@ -224,6 +224,7 @@ install: build install-dde-data install-icons
 	cp -r misc/dsg-configs/*.json ${DESTDIR}${PREFIX}/share/dsg/configs/org.deepin.dde.daemon/
 
 	cp -f misc/scripts/dde-lock.sh ${DESTDIR}${PREFIX}/lib/deepin-daemon/
+	cp -f misc/scripts/dde-shutdown.sh ${DESTDIR}${PREFIX}/lib/deepin-daemon/
 install-dde-data:
 	mkdir -pv ${DESTDIR}${PREFIX}/share/dde/
 	cp -r misc/data ${DESTDIR}${PREFIX}/share/dde/

accounts1/accounts.go

@@ -14,6 +14,7 @@ var (
 	_imageBlur         *ImageBlur
 	_userStandardIcons []string
 	_accountsManager   *Manager
+	_userCustomIcons   []string
 	logger             = log.NewLogger("daemon/accounts")
 )
 
@@ -46,7 +47,8 @@ func (d *Daemon) Start() error {
 	if d.manager != nil {
 		return nil
 	}
-	_userStandardIcons = getUserStandardIcons()
+
+	_userStandardIcons, _userCustomIcons = getUserIcons()
 	service := loader.GetService()
 	d.manager = NewManager(service)
 	_accountsManager = d.manager

accounts1/manager.go

@@ -37,7 +37,6 @@ const (
 	userIconsDir       = actConfigDir + "/icons"
 	userCustomIconsDir = actConfigDir + "/icons/local"
 
-	userIconGuest       = actConfigDir + "/icons/guest.png"
 	actConfigFile       = actConfigDir + "/accounts.ini"
 	actConfigGroupGroup = "Accounts"
 	actConfigKeyGuest   = "AllowGuest"
@@ -139,7 +138,7 @@ func NewManager(service *dbusutil.Service) *Manager {
 	m.usersMap = make(map[string]*User)
 	m.userAddedChanMap = make(map[string]chan string)
 
-	m.GuestIcon = userIconGuest
+	m.GuestIcon = getRandomIcon()
 	m.AllowGuest = isGuestUserEnabled()
 
 	m.initUsers(getUserPaths())

accounts1/manager_ifc.go

@@ -108,6 +108,7 @@ func (m *Manager) CreateUser(sender dbus.Sender,
 	if err != nil {
 		logger.Warningf("failed to set groups for user %s: %v", name, err)
 	}
+
 	// create user success
 	select {
 	case userPath, ok := <-ch:
@@ -266,14 +267,13 @@ func (m *Manager) FindUserByName(name string) (user string, busErr *dbus.Error)
 //
 // ret0：头像路径，为空则表示获取失败
 func (m *Manager) RandUserIcon() (iconFile string, busErr *dbus.Error) {
-	icons := getUserStandardIcons()
-	if len(icons) == 0 {
+	if len(_userStandardIcons) == 0 {
 		return "", dbusutil.ToError(errors.New("Did not find any user icons"))
 	}
 
 	rand.Seed(time.Now().UnixNano())
-	idx := rand.Intn(len(icons)) // #nosec G404
-	return icons[idx], nil
+	idx := rand.Intn(len(_userStandardIcons)) // #nosec G404
+	return _userStandardIcons[idx], nil
 }
 
 func (m *Manager) isDomainUserExist(name string) bool {

accounts1/user.go

@@ -29,8 +29,8 @@ import (
 )
 
 const (
-	defaultUserIcon          = "file:///var/lib/AccountsService/icons/default.png"
 	defaultUserBackgroundDir = "/usr/share/wallpapers/deepin/"
+	defaultUserIcon          = "file:///var/lib/AccountsService/icons/default"
 
 	controlCenterPath = "/usr/bin/dde-control-center"
 	deepinDaemonDir   = "/usr/lib/deepin-daemon/"
@@ -73,14 +73,42 @@ const (
 	defaultWorkspace         = 1
 )
 
-func getDefaultUserBackground() string {
-	filename := filepath.Join(defaultUserBackgroundDir, "desktop.bmp")
-	_, err := os.Stat(filename)
-	if err == nil {
-		return "file://" + filename
+const (
+	deepinThemePath         = "/usr/share/deepin-themes/"
+	defaultTheme            = "bloom"
+	themeFile               = "index.theme"
+	themeGroupDefault       = "DefaultTheme"
+	themeGroupDark          = "DarkTheme"
+	configKeyLockBackground = "LockBackground"
+)
+
+func getThemeLockBackground(theme string) string {
+	kf, err := dutils.NewKeyFileFromFile(
+		path.Join(deepinThemePath, theme, themeFile))
+	if err != nil {
+		logger.Warning("load theme failed", err)
+		return ""
+	}
+	defer kf.Free()
+	bg, err := kf.GetString(themeGroupDefault, configKeyLockBackground)
+	if err != nil {
+		logger.Warning("get lock background failed", err)
+		return ""
 	}
+	if !dutils.IsFileExist(bg) {
+		return ""
+	}
+	return bg
+}
 
-	return "file://" + filepath.Join(defaultUserBackgroundDir, "desktop.jpg")
+// 通过默认主题去获取壁纸
+func getDefaultUserBackground() string {
+	bg := "file://" + filepath.Join(defaultUserBackgroundDir, "deepin-default.jpg")
+	value := getThemeLockBackground(defaultTheme)
+	if value != "" {
+		bg = value
+	}
+	return bg
 }
 
 type User struct {
@@ -144,6 +172,7 @@ type User struct {
 
 	WechatAuthEnabled bool
 	configLocker      sync.Mutex
+	customIconList    []string
 }
 
 func NewUser(userPath string, service *dbusutil.Service, ignoreErr bool) (*User, error) {
@@ -260,11 +289,21 @@ func (u *User) updateIconList() {
 	_ = u.emitPropChangedIconList(u.IconList)
 }
 
+func (u *User) initCustomIcons() {
+	icons := _userCustomIcons
+
+	customIconPre := u.UserName + "-"
+	for _, icon := range icons {
+		if strings.Contains(icon, customIconPre) {
+			u.customIconList = append(u.customIconList, icon)
+		}
+	}
+}
+
 func (u *User) getAllIcons() []string {
 	icons := _userStandardIcons
-	if u.customIcon != "" {
-		icons = append(icons, u.customIcon)
-	}
+
+	icons = append(icons, u.customIconList...)
 	return icons
 }
 
@@ -280,8 +319,9 @@ func (u *User) getGroups() []string {
 // ret0: new user icon uri
 // ret1: added
 // ret2: error
-func (u *User) setIconFile(iconURI string) (string, bool, error) {
-	if isStrInArray(iconURI, u.IconList) {
+func (u *User) setIconFile(iconURI string, isNewIcon bool) (string, bool, error) {
+	// 通过控制中心修改过的自定义用户头像, 需要重新添加进来, 并将之前的头像删除掉, 否则直接返回系统头像
+	if isStrInArray(iconURI, u.IconList) && !isNewIcon {
 		return iconURI, false, nil
 	}
 
@@ -303,10 +343,12 @@ func (u *User) setIconFile(iconURI string) (string, bool, error) {
 	if err != nil {
 		return "", false, err
 	}
+
 	err = dutils.CopyFile(tmp, dest)
 	if err != nil {
 		return "", false, err
 	}
+
 	return dutils.EncodeURI(dest, dutils.SCHEME_FILE), true, nil
 }
 
@@ -732,10 +774,22 @@ func updateConfigPath(username string) {
 	}
 }
 
+func isOldCustomIcon(u *User) bool {
+	iconFile := dutils.DecodeURI(u.IconFile)
+	if _, err := os.Stat(iconFile); os.IsNotExist(err) {
+		if !isStrInArray(u.IconFile, u.IconList) {
+			return true
+		}
+	}
+
+	return false
+}
+
 // 从配置文件中加载用户的配置信息
 func loadUserConfigInfo(u *User) {
 	var err error
 
+	u.initCustomIcons()
 	u.IconList = u.getAllIcons()
 
 	// NOTICE(jouyouyun): Got created time,  not accurate, can only be used as a reference
@@ -803,12 +857,22 @@ func loadUserConfigInfo(u *User) {
 	}
 	icon, _ := kf.GetString(confGroupUser, confKeyIcon)
 	u.IconFile = icon
-	if u.IconFile == "" {
+	// 如果系统升级使用的是原来的头像, 升级后使用当前默认头像
+	if u.IconFile == "" || isOldCustomIcon(u) {
 		u.IconFile = defaultUserIcon
 		isSave = true
 	}
 
-	u.IconList = u.getAllIcons()
+	u.customIcon, _ = kf.GetString(confGroupUser, confKeyCustomIcon)
+
+	// CustomIcon is the newly added field in the configuration file
+	if u.customIcon == "" {
+		if u.IconFile != defaultUserIcon && isStrInArray(u.IconFile, u.customIconList) {
+			// u.IconFile is a custom icon, not a standard icon
+			u.customIcon = u.IconFile
+			isSave = true
+		}
+	}
 
 	_, desktopBgs, _ := kf.GetStringList(confGroupUser, confKeyDesktopBackgrounds)
 	u.DesktopBackgrounds = desktopBgs

accounts1/user_ifc.go

@@ -456,6 +456,15 @@ func (u *User) SetIconFile(sender dbus.Sender, iconURI string) *dbus.Error {
 		return dbusutil.ToError(err)
 	}
 
+	// 找到要移除的原始用户头像
+	var oldIconPath string
+	for _, icon := range u.customIconList {
+		if strings.Contains(icon, path.Base(iconURI)) {
+			oldIconPath = icon
+			break
+		}
+	}
+
 	// if iconURI not in iconList, need to create temp icon file
 	if !isStrInArray(iconURI, u.IconList) {
 		// copy file to temp file, update icon file
@@ -489,7 +498,7 @@ func (u *User) SetIconFile(sender dbus.Sender, iconURI string) *dbus.Error {
 		return nil
 	}
 
-	newIconURI, added, err := u.setIconFile(iconURI)
+	newIconURI, added, err := u.setIconFile(iconURI, len(oldIconPath) > 0)
 	if err != nil {
 		logger.Warning("Set icon failed:", err)
 		return dbusutil.ToError(err)
@@ -501,10 +510,20 @@ func (u *User) SetIconFile(sender dbus.Sender, iconURI string) *dbus.Error {
 			{confKeyCustomIcon, newIconURI},
 			{confKeyIcon, newIconURI},
 		})
+
 		if err != nil {
 			return dbusutil.ToError(err)
 		}
 
+		// remove old custom icon
+		if oldIconPath != "" {
+			logger.Debugf("remove old custom icon %q", u.customIcon)
+			err := os.Remove(dutils.DecodeURI(oldIconPath))
+			if err != nil {
+				logger.Warning(err)
+			}
+		}
+
 		// 默认的icon如果不是default.png的情况下，会被设置为customIcon,会被误删,
 		// 为规避已经设置为customIcon的历史版本,判断如果是icons目录下的数据,就不删除
 		needRemove := func(uri string) bool {
@@ -523,6 +542,7 @@ func (u *User) SetIconFile(sender dbus.Sender, iconURI string) *dbus.Error {
 			}
 		}
 		u.customIcon = newIconURI
+		u.customIconList = append(u.customIconList, newIconURI)
 		u.updateIconList()
 	} else {
 		err = u.writeUserConfigWithChange(confKeyIcon, newIconURI)