mod adhoc;
mod forgame;
+mod usebundles;
mod uselibs;
#[derive(Debug)]
.unwrap_or_else(|e| e.end_process(12));
}
-//---------- upload-bundle ----------
-
-#[derive(Debug)]
-struct BundleForUpload {
- file: String,
- f: BufReader<File>,
- size: usize,
- hash: bundles::Hash,
- kind: bundles::Kind,
-}
-
-impl BundleForUpload {
- #[throws(AE)]
- fn prepare(file: String) -> Self {
- let f = File::open(&file)
- .with_context(|| file.clone())
- .context("open bundle file")?;
- let size = f
- .metadata().context("fstat bundle file")?
- .len()
- .try_into().map_err(|_| anyhow!("bundle file far too large"))?;
- let mut f = BufReader::new(f);
- let hash = bundles::DigestWrite::of(&mut f)
- .context("read bundle file (for hash)")?;
- let hash = bundles::Hash(hash.into());
- let kind = bundles::Kind::only();
- f.rewind().context("rewind bundle file")?;
- BundleForUpload { file, f, size, hash, kind }
- }
-
- #[throws(AE)]
- fn upload(self, ma: &MainOpts, chan: &mut MgmtChannelForGame,
- progress: &mut dyn termprogress::Reporter)
- -> bundles::Id {
- let BundleForUpload { mut f, size, hash, kind,.. } = self;
- let cmd = MC::UploadBundle {
- size,
- game: ma.instance(),
- hash, kind,
- progress: MgmtChannel::PROGRESS,
- };
- let resp = chan.cmd_withbulk(&cmd, &mut f, &mut io::sink(),
- &mut *progress)?;
- if_let!{ MR::Bundle { bundle } = resp;
- else throw!(anyhow!("unexpected {:?}", &resp)) };
- progress.clear();
- bundle
- }
-}
-
-mod upload_bundle {
- use super::*;
-
- #[derive(Default,Debug)]
- struct Args {
- bundle_file: String,
- }
-
- fn subargs(sa: &mut Args) -> ArgumentParser {
- use argparse::*;
- let mut ap = ArgumentParser::new();
- ap.refer(&mut sa.bundle_file).required()
- .add_argument("BUNDLE",Store,"bundle file");
- ap
- }
-
- #[throws(AE)]
- fn call(SCCA{ mut out, ma, args,.. }:SCCA) {
- let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
- let mut chan = ma.access_game()?;
- let mut progress = ma.progressbar()?;
- let for_upload = BundleForUpload::prepare(args.bundle_file)?;
- let bundle = for_upload.upload(&ma, &mut chan, &mut *progress)?;
- writeln!(out, "{}", bundle)?;
- }
-
- inventory_subcmd!{
- "upload-bundle",
- "Upload a bundle",
- }
-}
-
-//---------- list-bundles ----------
-
-mod list_bundles {
- use super::*;
-
- type Args = NoArgs;
-
- #[throws(AE)]
- fn call(SCCA{ mut out, ma, args,.. }:SCCA) {
- let _args = parse_args::<Args,_>(args, &noargs, &ok_id, None);
- let mut chan = ma.access_game()?;
- let resp = chan.cmd(&MC::ListBundles {
- game: ma.instance(),
- })?;
- if_let!{ MR::Bundles { bundles } = resp;
- else throw!(anyhow!("unexpected {:?}", &resp)) };
- for (id, state) in bundles {
- writeln!(out, "{} {}", id, &state)?;
- }
- }
-
- inventory_subcmd!{
- "list-bundles",
- "List bundles",
- }
-}
-
-//---------- download-bundle ----------
-
-mod download_bundle {
- use super::*;
-
- #[derive(Default,Debug)]
- struct Args {
- index: bundles::Index,
- output: Option<PathBuf>,
- }
-
- fn subargs(sa: &mut Args) -> ArgumentParser {
- use argparse::*;
- let mut ap = ArgumentParser::new();
- ap.refer(&mut sa.index).required()
- .add_argument("INDEX",Store,"bundle number");
- ap.refer(&mut sa.output).metavar("OUTPUT")
- .add_option(&["-o","--output"],StoreOption,
- "write output to OUTPUT (rather than NNNNN.zip");
- ap
- }
-
- #[throws(AE)]
- fn call(SCCA{ out, ma, args,.. }:SCCA) {
- let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
- let mut chan = ma.access_game()?;
- let kind = bundles::Kind::only();
- let id = bundles::Id { kind, index: args.index };
- let path = args.output.unwrap_or_else(|| id.to_string().into());
-
- let (f, path_tmp): (Box<dyn Write>, _) =
- if path.as_os_str().as_bytes() == b"-"
- {
- drop(out);
- (Box::new(RawStdout::new()), None)
- } else {
- let tmp = {
- let mut w = path.as_os_str().to_owned();
- w.push(".tmp");
- PathBuf::from(w)
- };
- let f = fs::File::create(&tmp)
- .with_context(|| tmp.to_debug()).context("create temporary")?;
- (Box::new(f), Some((path, tmp)))
- };
- let mut f = BufWriter::new(f);
- let cmd = MC::DownloadBundle {
- game: ma.instance(),
- id,
- };
- chan.cmd_withbulk(&cmd, &mut io::empty(), &mut f,
- &mut termprogress::Null)
- .context("download bundle")?;
- f.flush().context("flush bundle file")?;
- if let Some((path, tmp)) = path_tmp {
- fs::rename(&tmp,&path)
- .with_context(|| path.to_debug()).context("rename after download")?;
- }
- }
-
- inventory_subcmd!{
- "download-bundle",
- "download bundle",
- }
-}
-
//---------- clear game ----------
#[throws(AE)]
--- /dev/null
+// Copyright 2020-2021 Ian Jackson and contributors to Otter
+// SPDX-License-Identifier: AGPL-3.0-or-later
+// There is NO WARRANTY.
+
+use super::*;
+
+//---------- upload-bundle ----------
+
+#[derive(Debug)]
+pub struct BundleForUpload {
+ pub file: String,
+ pub f: BufReader<File>,
+ pub size: usize,
+ pub hash: bundles::Hash,
+ pub kind: bundles::Kind,
+}
+
+impl BundleForUpload {
+ #[throws(AE)]
+ pub fn prepare(file: String) -> Self {
+ let f = File::open(&file)
+ .with_context(|| file.clone())
+ .context("open bundle file")?;
+ let size = f
+ .metadata().context("fstat bundle file")?
+ .len()
+ .try_into().map_err(|_| anyhow!("bundle file far too large"))?;
+ let mut f = BufReader::new(f);
+ let hash = bundles::DigestWrite::of(&mut f)
+ .context("read bundle file (for hash)")?;
+ let hash = bundles::Hash(hash.into());
+ let kind = bundles::Kind::only();
+ f.rewind().context("rewind bundle file")?;
+ BundleForUpload { file, f, size, hash, kind }
+ }
+
+ #[throws(AE)]
+ pub fn upload(self, ma: &MainOpts, chan: &mut MgmtChannelForGame,
+ progress: &mut dyn termprogress::Reporter)
+ -> bundles::Id {
+ let BundleForUpload { mut f, size, hash, kind,.. } = self;
+ let cmd = MC::UploadBundle {
+ size,
+ game: ma.instance(),
+ hash, kind,
+ progress: MgmtChannel::PROGRESS,
+ };
+ let resp = chan.cmd_withbulk(&cmd, &mut f, &mut io::sink(),
+ &mut *progress)?;
+ if_let!{ MR::Bundle { bundle } = resp;
+ else throw!(anyhow!("unexpected {:?}", &resp)) };
+ progress.clear();
+ bundle
+ }
+}
+
+mod upload_bundle {
+ use super::*;
+
+ #[derive(Default,Debug)]
+ struct Args {
+ bundle_file: String,
+ }
+
+ fn subargs(sa: &mut Args) -> ArgumentParser {
+ use argparse::*;
+ let mut ap = ArgumentParser::new();
+ ap.refer(&mut sa.bundle_file).required()
+ .add_argument("BUNDLE",Store,"bundle file");
+ ap
+ }
+
+ #[throws(AE)]
+ fn call(SCCA{ mut out, ma, args,.. }:SCCA) {
+ let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
+ let mut chan = ma.access_game()?;
+ let mut progress = ma.progressbar()?;
+ let for_upload = BundleForUpload::prepare(args.bundle_file)?;
+ let bundle = for_upload.upload(&ma, &mut chan, &mut *progress)?;
+ writeln!(out, "{}", bundle)?;
+ }
+
+ inventory_subcmd!{
+ "upload-bundle",
+ "Upload a bundle",
+ }
+}
+
+//---------- list-bundles ----------
+
+mod list_bundles {
+ use super::*;
+
+ type Args = NoArgs;
+
+ #[throws(AE)]
+ fn call(SCCA{ mut out, ma, args,.. }:SCCA) {
+ let _args = parse_args::<Args,_>(args, &noargs, &ok_id, None);
+ let mut chan = ma.access_game()?;
+ let resp = chan.cmd(&MC::ListBundles {
+ game: ma.instance(),
+ })?;
+ if_let!{ MR::Bundles { bundles } = resp;
+ else throw!(anyhow!("unexpected {:?}", &resp)) };
+ for (id, state) in bundles {
+ writeln!(out, "{} {}", id, &state)?;
+ }
+ }
+
+ inventory_subcmd!{
+ "list-bundles",
+ "List bundles",
+ }
+}
+
+//---------- download-bundle ----------
+
+mod download_bundle {
+ use super::*;
+
+ #[derive(Default,Debug)]
+ struct Args {
+ index: bundles::Index,
+ output: Option<PathBuf>,
+ }
+
+ fn subargs(sa: &mut Args) -> ArgumentParser {
+ use argparse::*;
+ let mut ap = ArgumentParser::new();
+ ap.refer(&mut sa.index).required()
+ .add_argument("INDEX",Store,"bundle number");
+ ap.refer(&mut sa.output).metavar("OUTPUT")
+ .add_option(&["-o","--output"],StoreOption,
+ "write output to OUTPUT (rather than NNNNN.zip");
+ ap
+ }
+
+ #[throws(AE)]
+ fn call(SCCA{ out, ma, args,.. }:SCCA) {
+ let args = parse_args::<Args,_>(args, &subargs, &ok_id, None);
+ let mut chan = ma.access_game()?;
+ let kind = bundles::Kind::only();
+ let id = bundles::Id { kind, index: args.index };
+ let path = args.output.unwrap_or_else(|| id.to_string().into());
+
+ let (f, path_tmp): (Box<dyn Write>, _) =
+ if path.as_os_str().as_bytes() == b"-"
+ {
+ drop(out);
+ (Box::new(RawStdout::new()), None)
+ } else {
+ let tmp = {
+ let mut w = path.as_os_str().to_owned();
+ w.push(".tmp");
+ PathBuf::from(w)
+ };
+ let f = fs::File::create(&tmp)
+ .with_context(|| tmp.to_debug()).context("create temporary")?;
+ (Box::new(f), Some((path, tmp)))
+ };
+ let mut f = BufWriter::new(f);
+ let cmd = MC::DownloadBundle {
+ game: ma.instance(),
+ id,
+ };
+ chan.cmd_withbulk(&cmd, &mut io::empty(), &mut f,
+ &mut termprogress::Null)
+ .context("download bundle")?;
+ f.flush().context("flush bundle file")?;
+ if let Some((path, tmp)) = path_tmp {
+ fs::rename(&tmp,&path)
+ .with_context(|| path.to_debug()).context("rename after download")?;
+ }
+ }
+
+ inventory_subcmd!{
+ "download-bundle",
+ "download bundle",
+ }
+}
~ianmdlvl / otter.git / commitdiff