meta-tech/pluie-yaml
meta-tech/pluie-yaml
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix error loading bad file

Browse Source
This commit is contained in:
a-Sansara 2018-08-28 01:58:14 +02:00
parent efe4a48d8f
commit ca6a46421d
2 changed files with 22 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/vala/Pluie/Yaml.Config.vala
View File

@ -81,10 +81,12 @@ public class Pluie.Yaml.Config
this.display_file = display_file;
if (this.path != null) {
this.loader = new Yaml.Loader (this.path, display_file, false);
Yaml.Node? root = this.loader.get_nodes ();
if (root != null) {
this.finder = new Yaml.Finder(root);
this.get_imports ();
if (this.loader.done) {
Yaml.Node? root = this.loader.get_nodes ();
if (root != null) {
this.finder = new Yaml.Finder(root);
this.get_imports ();
}
}
}
}
@ -105,9 +107,9 @@ public class Pluie.Yaml.Config
/**
* retriew the corresponding Yaml.Root node for loaded yaml file
*/
public Yaml.Root root_node ()
public Yaml.Root? root_node ()
{
return this.finder.context as Yaml.Root;
return this.finder!=null ? this.finder.context as Yaml.Root : null;
}
/**

26
src/vala/Pluie/Yaml.Loader.vala
View File

@ -61,20 +61,22 @@ public class Pluie.Yaml.Loader
public Loader (string path, bool display_file = false, bool displayNode = false )
{
this.reader = new Io.Reader (path);
this.scanner = new Yaml.Scanner (path);
if (display_file) this.display_file ();
if (this.reader.readable) {
this.scanner = new Yaml.Scanner (path);
if (display_file) this.display_file ();
if ((this.done = this.scanner.run())) {
if (displayNode) {
var n = this.get_nodes ();
if (n != null) n.display_childs ();
of.state(n != null);
if ((this.done = this.scanner.run())) {
if (displayNode) {
var n = this.get_nodes ();
if (n != null) n.display_childs ();
of.state(n != null);
}
}
else {
var evt = this.scanner.get_error_event ();
of.error ("line %d (%s)".printf (evt.line, evt.data["error"]));
this.display_file (evt.line);
}
}
else {
var evt = this.scanner.get_error_event ();
of.error ("line %d (%s)".printf (evt.line, evt.data["error"]));
this.display_file (evt.line);
}
}