18 dirs: List[String] = Nil, |
18 dirs: List[String] = Nil, |
19 ancestor_session: String = "", |
19 ancestor_session: String = "", |
20 all_known: Boolean = false, |
20 all_known: Boolean = false, |
21 focus_session: Boolean = false, |
21 focus_session: Boolean = false, |
22 required_session: Boolean = false, |
22 required_session: Boolean = false, |
23 system_mode: Boolean = false) |
23 system_mode: Boolean = false, |
|
24 verbose: Boolean = false) |
24 |
25 |
25 def unapply(json: JSON.T): Option[Args] = |
26 def unapply(json: JSON.T): Option[Args] = |
26 for { |
27 for { |
27 session <- JSON.string(json, "session") |
28 session <- JSON.string(json, "session") |
28 prefs <- JSON.string_default(json, "preferences") |
29 prefs <- JSON.string_default(json, "preferences") |
31 ancestor_session <- JSON.string_default(json, "ancestor_session") |
32 ancestor_session <- JSON.string_default(json, "ancestor_session") |
32 all_known <- JSON.bool_default(json, "all_known") |
33 all_known <- JSON.bool_default(json, "all_known") |
33 focus_session <- JSON.bool_default(json, "focus_session") |
34 focus_session <- JSON.bool_default(json, "focus_session") |
34 required_session <- JSON.bool_default(json, "required_session") |
35 required_session <- JSON.bool_default(json, "required_session") |
35 system_mode <- JSON.bool_default(json, "system_mode") |
36 system_mode <- JSON.bool_default(json, "system_mode") |
|
37 verbose <- JSON.bool_default(json, "verbose") |
36 } |
38 } |
37 yield { |
39 yield { |
38 Args(session, prefs = prefs, opts = opts, dirs = dirs, ancestor_session = ancestor_session, |
40 Args(session, prefs = prefs, opts = opts, dirs = dirs, ancestor_session = ancestor_session, |
39 all_known = all_known, focus_session = focus_session, required_session = required_session, |
41 all_known = all_known, focus_session = focus_session, required_session = required_session, |
40 system_mode = system_mode) |
42 system_mode = system_mode, verbose = verbose) |
41 } |
43 } |
42 |
44 |
43 def command(progress: Progress, args: Args): (JSON.T, Sessions.Base_Info, Build.Results) = |
45 def command(progress: Progress, args: Args): (JSON.T, Sessions.Base_Info, Build.Results) = |
44 { |
46 { |
45 val options = Options.init(prefs = args.prefs, opts = args.opts) |
47 val options = Options.init(prefs = args.prefs, opts = args.opts) |
61 progress = progress, |
63 progress = progress, |
62 build_heap = true, |
64 build_heap = true, |
63 system_mode = args.system_mode, |
65 system_mode = args.system_mode, |
64 dirs = dirs, |
66 dirs = dirs, |
65 infos = base_info.infos, |
67 infos = base_info.infos, |
|
68 verbose = args.verbose, |
66 sessions = List(args.session)) |
69 sessions = List(args.session)) |
67 |
70 |
68 (JSON.Object("rc" -> results.rc), base_info, results) |
71 (JSON.Object("rc" -> results.rc), base_info, results) |
69 } |
72 } |
70 } |
73 } |