github-personal/sysadm
1
0
Fork 0
mirror of https://github.com/outbackdingo/sysadm.git synced 2026-01-27 10:20:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

A couple more tweaks for the new pkg_info API call: Now the "provides"/"requires" information will also be output (not too common yet), and the same function can be used for any repo file/database.

Browse Source
This commit is contained in:
Ken Moore
2016-03-25 14:38:41 -04:00
parent e18efb942d
commit 147f0c5338
2 changed files with 62 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/server/WebBackend.cpp
View File

@@ -624,12 +624,9 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIohyveRequest(const QJsonVal
}
else if(act=="fetchiso"){
ok = true;
//DProcess fetchproc;
out->insert("fetchiso", sysadm::Iohyve::fetchISO(in_args.toObject()));
}
else if(act=="getprops"){
ok = true;
out->insert("getprops", sysadm::Iohyve::getProps(in_args.toObject()));
}
else if(act=="install"){
ok = true;
out->insert("install", sysadm::Iohyve::installGuest(in_args.toObject()));
@@ -650,10 +647,6 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmIohyveRequest(const QJsonVal
ok = true;
out->insert("resizedisk", sysadm::Iohyve::resizeDisk(in_args.toObject()));
}
else if(act=="setprop"){
ok = true;
out->insert("setprop", sysadm::Iohyve::setProp(in_args.toObject()));
}
else if(act=="setup"){
ok = true;
out->insert("setup", sysadm::Iohyve::setupIohyve(in_args.toObject()));
@@ -715,7 +708,8 @@ RestOutputStruct::ExitCode WebSocket::EvaluateSysadmPkgRequest(const QJsonValue
//Parse
if(act=="pkg_info"){
QJsonObject info = sysadm::PKG::pkg_info(pkgs, repo);
if(!pkgs.isEmpty()){ out->insert("pkg_info",info); }
if(!info.isEmpty()){ out->insert("pkg_info",info); }
else{ return RestOutputStruct::NOCONTENT; }
}else{
//unknown action
return RestOutputStruct::BADREQUEST;

68
src/server/library/sysadm-pkg.cpp
View File

@@ -44,26 +44,66 @@ inline QStringList names_from_ids(QStringList ids, QString db){
while(q.next()){ out << q.value("name").toString(); }
return out;
}
//provide values from ID's
inline QStringList provides_from_ids(QStringList ids){
QSqlQuery q("SELECT provide FROM provides WHERE id = '"+ids.join("' OR id = '")+"'");
QStringList out;
while(q.next()){ out << q.value("provide").toString(); }
return out;
}
//require values from ID's
inline QStringList requires_from_ids(QStringList ids){
QSqlQuery q("SELECT require FROM requires WHERE id = '"+ids.join("' OR id = '")+"'");
QStringList out;
while(q.next()){ out << q.value("require").toString(); }
return out;
}
// =================
// MAIN FUNCTIONS
// =================
QJsonObject PKG::pkg_info(QStringList origins, QString repo){
QJsonObject retObj;
QString dbname;
if(repo=="local"){ dbname= "/var/db/pkg/local.sqlite"; }
else{ dbname= "/var/db/pkg/repo-"+repo+".sqlite"; }
//QString conn = dbname; conn.replace("/","_");
//qDebug() << "Database:" << dbname;// << conn;
//Open the local database
QSqlDatabase DB = QSqlDatabase::addDatabase("QSQLITE");
DB.setHostName("localhost");
if(repo=="local"){ DB.setDatabaseName( "/var/db/pkg/local.sqlite"); }
else{ DB.setDatabaseName( "/var/db/pkg/repo-"+repo+".sqlite"); }
DB.setConnectOptions("QSQLITE_OPEN_READONLY=1");
if( !DB.open() ){ return retObj; } //cannot open database
QSqlDatabase DB;
if(QSqlDatabase::contains()){
//database already loaded
qDebug() << "Existing DB Connection";
DB = QSqlDatabase::database();
}else{
//new database needs to be loaded
qDebug() << "New DB Connection";
DB = QSqlDatabase::addDatabase("QSQLITE");
DB.setConnectOptions("QSQLITE_OPEN_READONLY=1");
DB.setHostName("localhost");
DB.setDatabaseName(dbname);
}
if(DB.databaseName()!=dbname){
if(DB.isOpen()){ DB.close(); }
DB.setConnectOptions("QSQLITE_OPEN_READONLY=1");
DB.setHostName("localhost");
DB.setDatabaseName(dbname);
}
qDebug() << "Open Database:" << DB.databaseName() << dbname;
if( !DB.open() ){
//qDebug() << " - could not be opened";
return retObj;
}
//Now do all the pkg info, one pkg origin at a time
QSqlQuery query("SELECT * FROM packages" +(origins.isEmpty() ? "" : " WHERE origin = '"+origins.join("' OR origin = '")+"'") );
//int id = query.record().indexOf("origin");
origins.removeAll("");
QString q_string = "SELECT * FROM packages";
if(!origins.isEmpty()){ q_string.append(" WHERE origin = '"+origins.join("' OR origon = '")+"'"); }
QSqlQuery query(q_string);
while(query.next()){
QJsonObject info;
QString id = query.value("id").toString(); //need this pkg id for later
QString origin = query.value("origin").toString(); //need the origin for later
if(id.isEmpty() || origin.isEmpty()){ continue; }
QJsonObject info;
//General info
for(int i=0; i<query.record().count(); i++){
info.insert(query.record().fieldName(i), query.value(i).toString() );
@@ -131,6 +171,16 @@ QJsonObject PKG::pkg_info(QStringList origins, QString repo){
tmpList.clear();
while(q13.next()){ tmpList << q13.value("path").toString(); }
if(!tmpList.isEmpty()){ info.insert("config_files", QJsonArray::fromStringList(tmpList) ); }
//PROVIDES
QSqlQuery q14("SELECT provide_id FROM pkg_provides WHERE package_id = '"+id+"'");
tmpList.clear();
while(q14.next()){ tmpList << q14.value("provide_id").toString(); }
if(!tmpList.isEmpty()){ info.insert("provides", QJsonArray::fromStringList(provides_from_ids(tmpList)) ); }
//REQUIRES
QSqlQuery q15("SELECT require_id FROM pkg_requires WHERE package_id = '"+id+"'");
tmpList.clear();
while(q15.next()){ tmpList << q15.value("require_id").toString(); }
if(!tmpList.isEmpty()){ info.insert("requires", QJsonArray::fromStringList(requires_from_ids(tmpList)) ); }
//Now insert this information into the main object
retObj.insert(origin,info);
} //end loop over pkg matches