Update CoreFoundationPreerences settings engine to handle both controllers and devices
This commit is contained in:
Micke Prag
parent
5dd66bfb03
commit
5fcc391c95
1 changed files with 95 additions and 81 deletions
|
|
@ -60,22 +60,26 @@ std::wstring Settings::getSetting(const std::wstring &strName) const {
|
|||
/*
|
||||
* Return the number of stored devices
|
||||
*/
|
||||
int Settings::getNumberOfDevices(void) const {
|
||||
int Settings::getNumberOfNodes(Node type) const {
|
||||
CFArrayRef cfarray = CFPreferencesCopyKeyList( d->app_ID, d->userName, d->hostName );
|
||||
if (!cfarray) return 0;
|
||||
CFIndex size = CFArrayGetCount( cfarray );
|
||||
int devices = 0;
|
||||
int nodes = 0;
|
||||
for (CFIndex k = 0; k < size; ++k) {
|
||||
CFStringRef key = (CFStringRef) CFArrayGetValueAtIndex(cfarray, k);
|
||||
if (CFStringHasPrefix( key, CFSTR("devices.") ) &&
|
||||
CFStringHasSuffix( key, CFSTR(".name") ) ) {
|
||||
devices++;
|
||||
if (!CFStringHasSuffix( key, CFSTR(".name") )) {
|
||||
continue;
|
||||
}
|
||||
if (type == Device && CFStringHasPrefix( key, CFSTR("devices.") )) {
|
||||
++nodes;
|
||||
} else if (type == Controller && CFStringHasPrefix( key, CFSTR("controllers.") )) {
|
||||
++nodes;
|
||||
}
|
||||
}
|
||||
return devices;
|
||||
return nodes;
|
||||
}
|
||||
|
||||
int Settings::getDeviceId(int intDeviceIndex) const {
|
||||
int Settings::getNodeId(Node type, int intNodeIndex) const {
|
||||
CFArrayRef cfarray = CFPreferencesCopyKeyList( d->app_ID, d->userName, d->hostName );
|
||||
if (!cfarray) return 0;
|
||||
CFIndex size = CFArrayGetCount( cfarray );
|
||||
|
|
@ -83,10 +87,19 @@ int Settings::getDeviceId(int intDeviceIndex) const {
|
|||
int id = 0;
|
||||
for (CFIndex k = 0; k < size; ++k) {
|
||||
CFStringRef key = (CFStringRef) CFArrayGetValueAtIndex(cfarray, k);
|
||||
if (CFStringHasPrefix( key, CFSTR("devices.") ) &&
|
||||
CFStringHasSuffix( key, CFSTR(".name") ) ) {
|
||||
|
||||
if (index == intDeviceIndex) {
|
||||
if (!CFStringHasSuffix( key, CFSTR(".name") )) {
|
||||
CFRelease( key );
|
||||
continue;
|
||||
}
|
||||
if ( type == Device && !CFStringHasPrefix(key, CFSTR("devices.")) ) {
|
||||
CFRelease( key );
|
||||
continue;
|
||||
}
|
||||
if ( type == Controller && !CFStringHasPrefix(key, CFSTR("controllers.")) ) {
|
||||
CFRelease( key );
|
||||
continue;
|
||||
}
|
||||
if (index == intNodeIndex) {
|
||||
CFArrayRef split = CFStringCreateArrayBySeparatingStrings( 0, key, CFSTR(".") );
|
||||
if ( !split || CFArrayGetCount( split ) != 3 ) continue;
|
||||
|
||||
|
|
@ -117,29 +130,30 @@ int Settings::getDeviceId(int intDeviceIndex) const {
|
|||
}
|
||||
index++;
|
||||
}
|
||||
CFRelease( key );
|
||||
return id;
|
||||
}
|
||||
|
||||
/*
|
||||
* Add a new node
|
||||
*/
|
||||
int Settings::addNode(Node type) {
|
||||
int id = getNextNodeId(type);
|
||||
setStringSetting( type, id, L"name", L"", false ); //Create a empty name so the node has an entry
|
||||
if (type == Device) {
|
||||
//Is there a reason we do this?
|
||||
setStringSetting( type, id, L"model", L"", false );
|
||||
}
|
||||
return id;
|
||||
}
|
||||
|
||||
/*
|
||||
* Add a new device
|
||||
* Get next available node id
|
||||
*/
|
||||
int Settings::addDevice() {
|
||||
int id = getNextDeviceId();
|
||||
setStringSetting( id, L"name", L"", false ); //Create a empty name so the device has an entry
|
||||
setStringSetting( id, L"model", L"", false );
|
||||
return id;
|
||||
}
|
||||
|
||||
/*
|
||||
* Get next available device id
|
||||
*/
|
||||
int Settings::getNextDeviceId() const {
|
||||
int Settings::getNextNodeId(Node type) const {
|
||||
int id = 0, max = 0;
|
||||
int numberOfDevices = getNumberOfDevices();
|
||||
for( int i = 0; i < numberOfDevices; i++) {
|
||||
id = getDeviceId( i );
|
||||
int numberOfNodes = getNumberOfNodes(type);
|
||||
for( int i = 0; i < numberOfNodes; i++) {
|
||||
id = getNodeId( type, i );
|
||||
if (id > max) {
|
||||
max = id;
|
||||
}
|
||||
|
|
@ -151,9 +165,9 @@ int Settings::getNextDeviceId() const {
|
|||
/*
|
||||
* Remove a device
|
||||
*/
|
||||
int Settings::removeDevice(int intDeviceId){
|
||||
int Settings::removeNode(Node type, int intNodeId){
|
||||
int ret = TELLSTICK_ERROR_DEVICE_NOT_FOUND;
|
||||
CFStringRef filterKey = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d."), intDeviceId); // The key to search for
|
||||
CFStringRef filterKey = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d."), getNodeString(type).c_str(), intNodeId); // The key to search for
|
||||
|
||||
CFArrayRef cfarray = CFPreferencesCopyKeyList( d->app_ID, d->userName, d->hostName );
|
||||
if (!cfarray) {
|
||||
|
|
@ -172,15 +186,15 @@ int Settings::removeDevice(int intDeviceId){
|
|||
return ret;
|
||||
}
|
||||
|
||||
std::wstring Settings::getStringSetting(int intDeviceId, const std::wstring &wname, bool parameter) const {
|
||||
std::wstring Settings::getStringSetting(Node type, int intNodeId, const std::wstring &wname, bool parameter) const {
|
||||
std::string name(TelldusCore::wideToString(wname));
|
||||
CFStringRef cfname = CFStringCreateWithCString( 0, name.c_str(), kCFStringEncodingUTF8 );
|
||||
|
||||
CFStringRef key;
|
||||
if (parameter) {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.parameters.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.parameters.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
} else {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
}
|
||||
|
||||
CFStringRef value;
|
||||
|
|
@ -209,7 +223,7 @@ std::wstring Settings::getStringSetting(int intDeviceId, const std::wstring &wna
|
|||
return retval;
|
||||
}
|
||||
|
||||
int Settings::setStringSetting(int intDeviceId, const std::wstring &wname, const std::wstring &wvalue, bool parameter) {
|
||||
int Settings::setStringSetting(Node type, int intNodeId, const std::wstring &wname, const std::wstring &wvalue, bool parameter) {
|
||||
std::string name(TelldusCore::wideToString(wname));
|
||||
std::string value(TelldusCore::wideToString(wvalue));
|
||||
CFStringRef cfname = CFStringCreateWithCString( 0, name.c_str(), kCFStringEncodingUTF8 );
|
||||
|
|
@ -217,9 +231,9 @@ int Settings::setStringSetting(int intDeviceId, const std::wstring &wname, const
|
|||
|
||||
CFStringRef key;
|
||||
if (parameter) {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.parameters.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.parameters.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
} else {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
}
|
||||
|
||||
CFPreferencesSetValue( key, cfvalue, d->app_ID, d->userName, d->hostName );
|
||||
|
|
@ -227,7 +241,7 @@ int Settings::setStringSetting(int intDeviceId, const std::wstring &wname, const
|
|||
return TELLSTICK_SUCCESS;
|
||||
}
|
||||
|
||||
int Settings::getIntSetting(int intDeviceId, const std::wstring &wname, bool parameter) const {
|
||||
int Settings::getIntSetting(Node type, int intNodeId, const std::wstring &wname, bool parameter) const {
|
||||
int retval = 0;
|
||||
std::string name(TelldusCore::wideToString(wname));
|
||||
CFStringRef cfname = CFStringCreateWithCString( 0, name.c_str(), kCFStringEncodingUTF8 );
|
||||
|
|
@ -235,9 +249,9 @@ int Settings::getIntSetting(int intDeviceId, const std::wstring &wname, bool par
|
|||
|
||||
CFStringRef key;
|
||||
if (parameter) {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.parameters.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.parameters.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
} else {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
}
|
||||
|
||||
cfvalue = (CFNumberRef)CFPreferencesCopyValue(key, d->app_ID, d->userName, d->hostName);
|
||||
|
|
@ -258,16 +272,16 @@ int Settings::getIntSetting(int intDeviceId, const std::wstring &wname, bool par
|
|||
return retval;
|
||||
}
|
||||
|
||||
int Settings::setIntSetting(int intDeviceId, const std::wstring &wname, int value, bool parameter) {
|
||||
int Settings::setIntSetting(Node type, int intNodeId, const std::wstring &wname, int value, bool parameter) {
|
||||
std::string name(TelldusCore::wideToString(wname));
|
||||
CFStringRef cfname = CFStringCreateWithCString( 0, name.c_str(), kCFStringEncodingUTF8 );
|
||||
CFNumberRef cfvalue = CFNumberCreate(NULL, kCFNumberIntType, &value);
|
||||
|
||||
CFStringRef key;
|
||||
if (parameter) {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.parameters.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.parameters.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
} else {
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("devices.%d.%@"), intDeviceId, cfname);
|
||||
key = CFStringCreateWithFormat(0, NULL, CFSTR("%ss.%d.%@"), getNodeString(type).c_str(), intNodeId, cfname);
|
||||
}
|
||||
|
||||
CFPreferencesSetValue( key, cfvalue, d->app_ID, d->userName, d->hostName );
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue