StarMirror/qTox
1
0
Fork 0
mirror of https://github.com/qTox/qTox.git synced 2024-03-22 14:00:36 +08:00
Code Issues Projects Releases Wiki Activity

Make qtox-updater-genflist compatible with qtox-updater

Browse Source
This commit is contained in:
Tux3 / Mlkj / !Lev.uXFMLA 2014-11-10 01:04:00 +01:00
parent 55939e9563
commit 5681e62bfb
No known key found for this signature in database
GPG Key ID: 7E086DD661263264
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
tools/update-server/qtox-updater-genflist/main.cpp
View File

@ -9,8 +9,8 @@
using namespace std; using namespace std;
/// Pass the target folder as first argument, no spaces allowed. We'll call that dir $TARGET /// Pass the target folder as first argument, no spaces allowed. We'll call that dir $TARGET
/// Update the content of $TARGET/files/ before calling this tool /// Update the content of $TARGET/source/ before calling this tool
/// We'll generate $TARGET/flist and exit /// We'll generate $TARGET/flist and $TARGET/files/ then exit
/// We need qtox-updater-skey in our working directory to sign the flist /// We need qtox-updater-skey in our working directory to sign the flist
/// ///
/// The generated flist is very simple and just installs everything in the working directory ... /// The generated flist is very simple and just installs everything in the working directory ...
@ -45,14 +45,18 @@ int main(int argc, char* argv[])
return 1; return 1;
} }
QDir fdir(target+"/files/"); // Wipe the /files/ folder
if (!fdir.isReadable()) QDir(target+"/files/").removeRecursively();
QDir(target).mkdir("files");
QDir sdir(target+"/source/");
if (!sdir.isReadable())
{ {
cout << "ERROR: qtox-updater-genflist can't open the target files directory" << endl; cout << "ERROR: qtox-updater-genflist can't open the target source directory" << endl;
return 1; return 1;
} }
QStringList filesListStr = fdir.entryList(QDir::Files); QStringList filesListStr = sdir.entryList(QDir::Files);
/// Serialize the flist data /// Serialize the flist data
QByteArray flistData; QByteArray flistData;
@ -60,7 +64,7 @@ int main(int argc, char* argv[])
{ {
cout << "Adding "<<fileStr.toStdString()<<"..."<<endl; cout << "Adding "<<fileStr.toStdString()<<"..."<<endl;
QFile file(target+"/files/"+fileStr); QFile file(target+"/source/"+fileStr);
if (!file.open(QIODevice::ReadOnly)) if (!file.open(QIODevice::ReadOnly))
{ {
cout << "ERROR: qtox-updater-genflist couldn't open a target file to sign it" << endl; cout << "ERROR: qtox-updater-genflist couldn't open a target file to sign it" << endl;
@ -72,12 +76,19 @@ int main(int argc, char* argv[])
unsigned char sig[crypto_sign_BYTES]; unsigned char sig[crypto_sign_BYTES];
crypto_sign_detached(sig, nullptr, (unsigned char*)fileData.data(), fileData.size(), (unsigned char*)skeyData.data()); crypto_sign_detached(sig, nullptr, (unsigned char*)fileData.data(), fileData.size(), (unsigned char*)skeyData.data());
QString id = QCryptographicHash::hash(fileStr.toUtf8(), QCryptographicHash::Sha3_224).toHex();
flistData += QByteArray::fromRawData((char*)sig, crypto_sign_BYTES); flistData += QByteArray::fromRawData((char*)sig, crypto_sign_BYTES);
flistData += stringToData(QCryptographicHash::hash(fileStr.toUtf8(), QCryptographicHash::Sha3_224).toHex()); flistData += stringToData(id);
flistData += stringToData("./"+fileStr); ///< Always install in the working directory for now flistData += stringToData("./"+fileStr); ///< Always install in the working directory for now
flistData += uint64ToData(fileData.size()); flistData += uint64ToData(fileData.size());
file.close(); file.close();
if (!file.copy(target+"/files/"+id))
{
cout << "ERROR: qtox-updater-genflist couldn't copy target file to /files/" << endl;
return 1;
}
} }
cout << "Signing and writing the flist..."<<endl; cout << "Signing and writing the flist..."<<endl;