Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

chore:修复dde-daemon编译问题 #658

Merged
merged 1 commit into from
Oct 12, 2024
Merged

chore:修复dde-daemon编译问题 #658

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion audio1/bluez_audio.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,8 @@ func isBluezDeviceValid(bluezPath string) bool {
logger.Warning("[isDeviceValid] new device failed:", err)
return false
}
icon, err := bluezDevice.Icon().Get(0)
bluezDevice.Device().Paired().Get(0)
icon, err := bluezDevice.Device().Icon().Get(0)
if err != nil {
logger.Warning("[isDeviceValid] get icon failed:", err)
return false
Expand Down
2 changes: 1 addition & 1 deletion audio1/card_profile_workaround.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,5 +108,5 @@ func tryConnectBluetooth(c *pulse.Card) error {
if err != nil {
return err
}
return dev.Connect(0)
return dev.Device().Connect(0)
}
2 changes: 1 addition & 1 deletion bluetooth1/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ type DeviceInfo struct {
RSSI int16
Address string

Battery byte
Battery bool
}

func unmarshalDeviceInfo(data string) (*DeviceInfo, error) {
Expand Down
8 changes: 4 additions & 4 deletions system/bluetooth1/bluetooth.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -537,7 +537,7 @@ func (b *SysBluetooth) updateBatteryForAdd(devPath dbus.ObjectPath) {
b.addDeviceWithCount(devPath, 3)
} else {
d, _ := b.getDevice(devPath)
d.Battery, _ = d.core.Percentage().Get(0)
d.Battery, _ = d.core.Battery().Percentage().Get(0)

// update backup battery
b.backupDevicesMu.Lock()
Expand All @@ -557,13 +557,13 @@ func (b *SysBluetooth) updateBatteryForAdd(devPath dbus.ObjectPath) {
func (b *SysBluetooth) updateBatteryForRemove(devPath dbus.ObjectPath) {
if b.isDeviceExists(devPath) {
d, _ := b.getDevice(devPath)
d.Battery = 0
d.Battery = false

// update backup battery
b.backupDevicesMu.Lock()
idx := b.indexBackupDeviceNoLock(d.AdapterPath, devPath)
if idx != -1 {
b.backupDevices[d.AdapterPath][idx].Battery = 0
b.backupDevices[d.AdapterPath][idx].Battery = false
}
b.backupDevicesMu.Unlock()

Expand Down Expand Up @@ -967,7 +967,7 @@ func (b *SysBluetooth) tryConnectPairedDevices(adapterPath dbus.ObjectPath) {
logger.Debugf("do not auto connect %v, but try connect once", d)
connectDuration = 1 * time.Second
if !d.Trusted {
err := d.core.Trusted().Set(0, true)
err := d.core.Device().Trusted().Set(0, true)
if err != nil {
logger.Warning(err)
}
Expand Down
4 changes: 2 additions & 2 deletions system/bluetooth1/bluetooth_ifc.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ func (b *SysBluetooth) SetDeviceAlias(device dbus.ObjectPath, alias string) *dbu
if err != nil {
return dbusutil.ToError(err)
}
err = d.core.Alias().Set(0, alias)
err = d.core.Device().Alias().Set(0, alias)
if err != nil {
return dbusutil.ToError(err)
}
Expand All @@ -121,7 +121,7 @@ func (b *SysBluetooth) SetDeviceTrusted(device dbus.ObjectPath, trusted bool) *d
if err != nil {
return dbusutil.ToError(err)
}
err = d.core.Trusted().Set(0, trusted)
err = d.core.Device().Trusted().Set(0, trusted)
if err != nil {
return dbusutil.ToError(err)
}
Expand Down
78 changes: 39 additions & 39 deletions system/bluetooth1/device.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ type device struct {
RSSI int16
Address string

Battery byte
Battery bool

connected bool
connectedTime time.Time
Expand Down Expand Up @@ -117,7 +117,7 @@ type backupDevice struct {
RSSI int16
Address string

Battery byte
Battery bool
}

type connectPhase uint32
Expand Down Expand Up @@ -221,19 +221,19 @@ func newDevice(systemSigLoop *dbusutil.SignalLoop, dpath dbus.ObjectPath) (d *de
d = &device{Path: dpath}
systemConn := systemSigLoop.Conn()
d.core, _ = bluez.NewDevice(systemConn, dpath)
d.AdapterPath, _ = d.core.Adapter().Get(0)
d.Name, _ = d.core.Name().Get(0)
d.Alias, _ = d.core.Alias().Get(0)
d.Address, _ = d.core.Address().Get(0)
d.Trusted, _ = d.core.Trusted().Get(0)
d.Paired, _ = d.core.Paired().Get(0)
d.connected, _ = d.core.Connected().Get(0)
d.UUIDs, _ = d.core.UUIDs().Get(0)
d.ServicesResolved, _ = d.core.ServicesResolved().Get(0)
d.Icon, _ = d.core.Icon().Get(0)
d.RSSI, _ = d.core.RSSI().Get(0)
d.blocked, _ = d.core.Blocked().Get(0)
d.Battery, _ = d.core.Percentage().Get(0)
d.AdapterPath, _ = d.core.Device().Adapter().Get(0)
d.Name, _ = d.core.Device().Name().Get(0)
d.Alias, _ = d.core.Device().Alias().Get(0)
d.Address, _ = d.core.Device().Address().Get(0)
d.Trusted, _ = d.core.Device().Trusted().Get(0)
d.Paired, _ = d.core.Device().Paired().Get(0)
d.connected, _ = d.core.Device().Connected().Get(0)
d.UUIDs, _ = d.core.Device().UUIDs().Get(0)
d.ServicesResolved, _ = d.core.Device().ServicesResolved().Get(0)
d.Icon, _ = d.core.Device().Icon().Get(0)
d.RSSI, _ = d.core.Device().RSSI().Get(0)
d.blocked, _ = d.core.Device().Blocked().Get(0)
d.Battery, _ = d.core.Battery().Percentage().Get(0)
d.needNotify = true
var err error
d.inputReconnectMode, err = d.getInputReconnectModeRaw()
Expand Down Expand Up @@ -298,7 +298,7 @@ func (d *device) notifyDevicePropertiesChanged() {
}

func (d *device) connectProperties() {
err := d.core.Connected().ConnectChanged(func(hasValue bool, connected bool) {
err := d.core.Device().Connected().ConnectChanged(func(hasValue bool, connected bool) {
if !hasValue {
return
}
Expand Down Expand Up @@ -380,7 +380,7 @@ func (d *device) connectProperties() {
logger.Warning(err)
}

_ = d.core.Name().ConnectChanged(func(hasValue bool, value string) {
_ = d.core.Device().Name().ConnectChanged(func(hasValue bool, value string) {
if !hasValue {
return
}
Expand All @@ -389,7 +389,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.Alias().ConnectChanged(func(hasValue bool, value string) {
_ = d.core.Device().Alias().ConnectChanged(func(hasValue bool, value string) {
if !hasValue {
return
}
Expand All @@ -398,7 +398,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.Address().ConnectChanged(func(hasValue bool, value string) {
_ = d.core.Device().Address().ConnectChanged(func(hasValue bool, value string) {
if !hasValue {
return
}
Expand All @@ -407,7 +407,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.Trusted().ConnectChanged(func(hasValue bool, value bool) {
_ = d.core.Device().Trusted().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
Expand All @@ -416,7 +416,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.Paired().ConnectChanged(func(hasValue bool, value bool) {
_ = d.core.Device().Paired().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
Expand All @@ -439,7 +439,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.ServicesResolved().ConnectChanged(func(hasValue bool, value bool) {
_ = d.core.Device().ServicesResolved().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
Expand All @@ -448,7 +448,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.Icon().ConnectChanged(func(hasValue bool, value string) {
_ = d.core.Device().Icon().ConnectChanged(func(hasValue bool, value string) {
if !hasValue {
return
}
Expand All @@ -462,7 +462,7 @@ func (d *device) connectProperties() {
}
})

_ = d.core.UUIDs().ConnectChanged(func(hasValue bool, value []string) {
_ = d.core.Device().UUIDs().ConnectChanged(func(hasValue bool, value []string) {
if !hasValue {
return
}
Expand All @@ -471,7 +471,7 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.RSSI().ConnectChanged(func(hasValue bool, value int16) {
_ = d.core.Device().RSSI().ConnectChanged(func(hasValue bool, value int16) {
if !hasValue {
d.RSSI = 0
logger.Debugf("%s RSSI invalidated", d)
Expand All @@ -482,22 +482,22 @@ func (d *device) connectProperties() {
d.notifyDevicePropertiesChanged()
})

_ = d.core.LegacyPairing().ConnectChanged(func(hasValue bool, value bool) {
_ = d.core.Device().LegacyPairing().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
logger.Debugf("%s LegacyPairing: %v", d, value)
})

_ = d.core.Blocked().ConnectChanged(func(hasValue bool, value bool) {
_ = d.core.Device().Blocked().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
logger.Debugf("%s Blocked: %v", d, value)
d.blocked = value
})

_ = d.core.Percentage().ConnectChanged(func(hasValue bool, value byte) {
_ = d.core.Battery().Percentage().ConnectChanged(func(hasValue bool, value bool) {
if !hasValue {
return
}
Expand Down Expand Up @@ -639,7 +639,7 @@ func (d *device) doRealConnect() error {
}()
}
d.setConnectPhase(connectPhaseConnectProfilesStart)
err := d.core.Connect(0)
err := d.core.Device().Connect(0)
d.setConnectPhase(connectPhaseConnectProfilesEnd)
if err != nil {
if strings.Contains(err.Error(), "Input/output error") {
Expand All @@ -666,41 +666,41 @@ func (d *device) doRealConnect() error {
}

func (d *device) doTrust() error {
trusted, _ := d.core.Trusted().Get(0)
trusted, _ := d.core.Device().Trusted().Get(0)
if trusted {
return nil
}
err := d.core.Trusted().Set(0, true)
err := d.core.Device().Trusted().Set(0, true)
if err != nil {
logger.Warning(err)
}
return err
}

func (d *device) cancelBlock() error {
blocked, err := d.core.Blocked().Get(0)
blocked, err := d.core.Device().Blocked().Get(0)
if err != nil {
logger.Warning(err)
return err
}
if !blocked {
return nil
}
err = d.core.Blocked().Set(0, false)
err = d.core.Device().Blocked().Set(0, false)
if err != nil {
logger.Warning(err)
}
return err
}

func (d *device) cancelPairing() error {
err := d.core.CancelPairing(0)
err := d.core.Device().CancelPairing(0)

return err
}

func (d *device) doPair() error {
paired, err := d.core.Paired().Get(0)
paired, err := d.core.Device().Paired().Get(0)
if err != nil {
logger.Warning(err)
return err
Expand All @@ -711,7 +711,7 @@ func (d *device) doPair() error {
}

d.setConnectPhase(connectPhasePairStart)
err = d.core.Pair(0)
err = d.core.Device().Pair(0)
d.setConnectPhase(connectPhasePairEnd)
if err != nil {
logger.Warningf("%s pair failed: %v", d, err)
Expand Down Expand Up @@ -771,7 +771,7 @@ func (d *device) Disconnect() {
d.setDisconnectPhase(disconnectPhaseStart)
defer d.setDisconnectPhase(disconnectPhaseNone)

connected, err := d.core.Connected().Get(0)
connected, err := d.core.Device().Connected().Get(0)
if err != nil {
logger.Warning(err)
return
Expand All @@ -783,7 +783,7 @@ func (d *device) Disconnect() {

// 如果是 LE 或由设备主动重连接的设备, 则先设置 Trusted 为 false, 防止很快地重连接。
if d.maybeReconnectByDevice() {
err = d.core.Trusted().Set(0, false)
err = d.core.Device().Trusted().Set(0, false)
if err != nil {
logger.Warning("set trusted failed:", err)
}
Expand All @@ -794,7 +794,7 @@ func (d *device) Disconnect() {
ch := d.goWaitDisconnect()

d.setDisconnectPhase(disconnectPhaseDisconnectStart)
err = d.core.Disconnect(0)
err = d.core.Device().Disconnect(0)
if err != nil {
logger.Warningf("failed to disconnect %s: %v", d, err)
}
Expand Down
3 changes: 2 additions & 1 deletion system/resource_ctl/cgroup.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
"bytes"
"encoding/json"
"fmt"
"io/ioutil"
"os"
"path/filepath"
"regexp"
Expand Down Expand Up @@ -82,7 +83,7 @@ func getTasksFromFile(path string) (tasks [][]byte, err error) {

var content []byte

content, err = os.ReadAll(tasksFile)
content, err = ioutil.ReadAll(tasksFile)
if err != nil {
return
}
Expand Down
Loading