cromer/pamac-classic
Archived
2
0
Fork 2
Code Issues Pull Requests 1 Releases 13 Wiki Activity

some code improvements

Browse Source
This commit is contained in:
guinux
2015-01-28 16:40:05 +01:00
parent 66e66eab7e
commit 271c4a4204
4 changed files with 38 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/aur.vala
View File

@@ -33,15 +33,16 @@ namespace AUR {
var session = new Soup.Session ();
var message = new Soup.Message ("GET", uri);
var parser = new Json.Parser ();
unowned Json.Object root_object;
session.send_message (message);
try {
parser.load_from_data ((string) message.response_body.flatten ().data, -1);
root_object = parser.get_root ().get_object ();
prev_inter = root_object.get_array_member ("results");
} catch (Error e) {
print (e.message);
}
unowned Json.Node? root = parser.get_root ();
if (root != null) {
prev_inter = root.get_object ().get_array_member ("results");
}
int length = needles.length;
if (length == 1)
return prev_inter;
@@ -55,11 +56,13 @@ namespace AUR {
session.send_message (message);
try {
parser.load_from_data ((string) message.response_body.flatten ().data, -1);
root_object = parser.get_root ().get_object ();
found = root_object.get_array_member ("results");
} catch (Error e) {
print (e.message);
}
root = parser.get_root ();
if (root != null) {
found = root.get_object ().get_array_member ("results");
}
foreach (var prev_inter_node in prev_inter.get_elements ()) {
foreach (var found_node in found.get_elements ()) {
if (strcmp (prev_inter_node.get_object ().get_string_member ("Name"),
@@ -68,27 +71,31 @@ namespace AUR {
}
}
}
if (i != (length -1))
if (i != (length -1)) {
prev_inter = inter;
}
i += 1;
}
return inter;
}
public Json.Object? info (string pkgname) {
unowned Json.Object? pkg_info = null;
public Json.Object info (string pkgname) {
var pkg_info = new Json.Object ();
string uri = rpc_url + rpc_info + Uri.escape_string (pkgname);
var session = new Soup.Session ();
var message = new Soup.Message ("GET", uri);
session.send_message (message);
var parser = new Json.Parser ();
try {
var parser = new Json.Parser ();
parser.load_from_data ((string) message.response_body.flatten ().data, -1);
pkg_info = parser.get_root ().get_object ().get_object_member ("results");
} catch (Error e) {
stderr.printf ("Failed to get infos about %s from AUR\n", pkgname);
print (e.message);
}
unowned Json.Node? root = parser.get_root ();
if (root != null) {
pkg_info = root.get_object ().get_object_member ("results");
}
return pkg_info;
}
@@ -104,14 +111,16 @@ namespace AUR {
var session = new Soup.Session ();
var message = new Soup.Message ("GET", builder.str);
session.send_message (message);
var parser = new Json.Parser ();
try {
var parser = new Json.Parser ();
parser.load_from_data ((string) message.response_body.flatten ().data, -1);
unowned Json.Object root_object = parser.get_root ().get_object ();
results = root_object.get_array_member ("results");
} catch (Error e) {
print (e.message);
}
unowned Json.Node? root = parser.get_root ();
if (root != null) {
results = root.get_object ().get_array_member ("results");
}
return results;
}
}