convert presets to new format, part 1
This commit is contained in:
parent
fbacfd421c
commit
d422372b7f
7 changed files with 154 additions and 73 deletions
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
#include "config.h"
|
||||
#include "../ta-log.h"
|
||||
#include "../baseutils.h"
|
||||
#include "../fileutils.h"
|
||||
#include <fmt/printf.h>
|
||||
|
||||
|
|
@ -48,41 +49,9 @@ String DivConfig::toString() {
|
|||
return ret;
|
||||
}
|
||||
|
||||
const char* base64Table="ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
|
||||
|
||||
String DivConfig::toBase64() {
|
||||
String data=toString();
|
||||
String ret;
|
||||
|
||||
ret.reserve((2+data.size()*4)/3);
|
||||
|
||||
unsigned int groupOfThree=0;
|
||||
unsigned char pos=0;
|
||||
for (char& i: data) {
|
||||
groupOfThree|=((unsigned char)i)<<((2-pos)<<3);
|
||||
if (++pos>=3) {
|
||||
pos=0;
|
||||
ret+=base64Table[(groupOfThree>>18)&63];
|
||||
ret+=base64Table[(groupOfThree>>12)&63];
|
||||
ret+=base64Table[(groupOfThree>>6)&63];
|
||||
ret+=base64Table[groupOfThree&63];
|
||||
groupOfThree=0;
|
||||
}
|
||||
}
|
||||
if (pos==2) {
|
||||
ret+=base64Table[(groupOfThree>>18)&63];
|
||||
ret+=base64Table[(groupOfThree>>12)&63];
|
||||
ret+=base64Table[(groupOfThree>>6)&63];
|
||||
ret+='=';
|
||||
} else if (pos==1) {
|
||||
ret+=base64Table[(groupOfThree>>18)&63];
|
||||
ret+=base64Table[(groupOfThree>>12)&63];
|
||||
ret+="==";
|
||||
}
|
||||
|
||||
logV("toBase64: %s",ret);
|
||||
|
||||
return ret;
|
||||
return taEncodeBase64(data);
|
||||
}
|
||||
|
||||
void DivConfig::parseLine(const char* line) {
|
||||
|
|
@ -143,38 +112,7 @@ bool DivConfig::loadFromMemory(const char* buf) {
|
|||
}
|
||||
|
||||
bool DivConfig::loadFromBase64(const char* buf) {
|
||||
String data;
|
||||
|
||||
unsigned int groupOfThree=0;
|
||||
signed char pos=18;
|
||||
for (const char* i=buf; *i; i++) {
|
||||
unsigned char nextVal=0;
|
||||
if ((*i)=='/') {
|
||||
nextVal=63;
|
||||
} else if ((*i)=='+') {
|
||||
nextVal=62;
|
||||
} else if ((*i)>='0' && (*i)<='9') {
|
||||
nextVal=52+((*i)-'0');
|
||||
} else if ((*i)>='a' && (*i)<='z') {
|
||||
nextVal=26+((*i)-'a');
|
||||
} else if ((*i)>='A' && (*i)<='Z') {
|
||||
nextVal=((*i)-'A');
|
||||
} else {
|
||||
nextVal=0;
|
||||
}
|
||||
groupOfThree|=nextVal<<pos;
|
||||
pos-=6;
|
||||
if (pos<0) {
|
||||
pos=18;
|
||||
if ((groupOfThree>>16)&0xff) data+=(groupOfThree>>16)&0xff;
|
||||
if ((groupOfThree>>8)&0xff) data+=(groupOfThree>>8)&0xff;
|
||||
if (groupOfThree&0xff) data+=groupOfThree&0xff;
|
||||
groupOfThree=0;
|
||||
}
|
||||
}
|
||||
|
||||
logV("fromBase64: %s",data);
|
||||
|
||||
String data=taDecodeBase64(buf);
|
||||
return loadFromMemory(data.c_str());
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue