Bump MSRV to 1.63.0

This reverts commit 5fd2eac6eb.

.gitlab-ci.yml

@@ -64,10 +64,10 @@ check-nightly:
   <<: *check-base
   variables:
     RUST_VERSION: nightly
-check-old:
+check-msrv:
   <<: *check-base
   variables:
-    RUST_VERSION: "1.56.1"
+    RUST_VERSION: "1.63.0"
 
 # Build using Rust stable
 build-x86_64-linux-gnu:

Cargo.toml

@@ -1,6 +1,7 @@
 [package]
 name = "ffsend"
 version = "0.2.76"
+rust-version = "1.63.0"
 authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"]
 license = "GPL-3.0"
 readme = "README.md"
@@ -54,16 +55,7 @@ name = "ffsend"
 path = "src/main.rs"
 
 [features]
-default = [
-    "archive",
-    "clipboard",
-    "crypto-ring",
-    "history",
-    "infer-command",
-    "qrcode",
-    "send3",
-    "urlshorten",
-]
+default = ["archive", "clipboard", "crypto-ring", "history", "infer-command", "qrcode", "send3", "urlshorten"]
 
 # Compile with file archiving support
 archive = ["tar"]
@@ -119,7 +111,7 @@ open = "2"
 openssl-probe = "0.1"
 pathdiff = "0.2"
 pbr = "1"
-prettytable-rs = "0.8"
+prettytable-rs = { version = "0.10.0", default-features = false }
 qr2term = { version = "0.2", optional = true }
 rand = "0.8"
 regex = "1.5"

README.md

@@ -362,7 +362,7 @@ You can use `ffsend` from the command line in the same directory:
 .\ffsend.exe --help
 ```
 
-To make it globally invokable as `ffsend`, you must make the binary available in
+To make it globally invocable as `ffsend`, you must make the binary available in
 your systems `PATH`. The easiest solution is to move it into `System32`:
 ```cmd
 move .\ffsend.exe C:\Windows\System32\ffsend.exe
@@ -428,7 +428,7 @@ docker pull timvisee/ffsend
 ```
 
 On Linux or macOS you might define a alias in your shell configuration, to make
-it invokable as `ffsend`:
+it invocable as `ffsend`:
 
 ```bash
 alias ffsend='docker run --rm -it -v "$(pwd):/data" timvisee/ffsend'
@@ -444,7 +444,7 @@ before proceeding:
 ### Build requirements
 - Runtime [requirements](#requirements)
 - [`git`][git]
-- [`rust`][rust] `v1.40` or higher (install using [`rustup`][rustup])
+- [`rust`][rust] `v1.63` (MSRV) or higher (install using [`rustup`][rustup])
 - [OpenSSL][openssl] or [LibreSSL][libressl] libraries/headers:
   - Linux:
     - Ubuntu, Debian and derivatives: `apt install build-essential cmake pkg-config libssl-dev`
@@ -811,7 +811,7 @@ Check out the [LICENSE](LICENSE) file for more information.
 [termux]: https://termux.com/
 [rust]: https://rust-lang.org/
 [rustup]: https://rustup.rs/
-[send]: https://send.vis.ee/
+[send]: https://github.com/timvisee/send
 [mozilla-send]: https://github.com/mozilla/send
 [timvisee-send]: https://github.com/timvisee/send
 [send-encryption]: https://github.com/timvisee/send/blob/master/docs/encryption.md

contrib/util/nautilus/README.md

@@ -0,0 +1,6 @@
+`firefox-send` is a script for Nautilus/Nemo/Caja (maybe it needs some adaptation for Caja) to send files directly from the file browser, using the contextual menu.
+
+* Copy the `firefox-send` file to ~/.local/share/nautilus/scripts/firefox-send
+* Modify the default options to your use case: host server, download number, retention time.
+* Make the file executable (`chmod +x firefox-send`).
+* Restart Nautilus/Nemo/Caja.

contrib/util/nautilus/firefox-send

@@ -0,0 +1,46 @@
+#!/bin/bash
+
+
+#CONSTANTS
+#FILEPATH=`echo $NAUTILUS_SCRIPT_SELECTED_URIS | sed 's@file://@@g'`
+# Quote the paths
+IFS=$'\n' read -d '' -r -a FILEPATH <<< "$NAUTILUS_SCRIPT_SELECTED_FILE_PATHS"
+FFSEND_BIN='/usr/bin/ffsend'
+FFSEND_BIN_OPTS="upload --open --copy"
+ZENITY='/usr/bin/zenity '
+ZENITY_PROGRESS_OPTIONS='--auto-close --auto-kill' #you can remove this if you like
+
+#sanity checks
+for sanity_check in $FFSEND_BIN "${FILEPATH[@]}"
+do
+   ZENITY_ERROR_SANITY="There is an error, it involved $sanity_check.\n Probably binary or file missing" 
+   if [ ! -e $sanity_check ]
+     then 
+      #zenity --error --text="$(eval "echo \"$ZENITY_ERROR_SANITY\"")"
+      zenity --error --text="$ZENITY_ERROR_SANITY"
+     exit 
+  fi
+done
+
+# Use the following flags automatically from now on
+# -I: no interaction
+# -f: force
+# -y: yes
+# -q: quiet
+export FFSEND_NO_INTERACT=1 FFSEND_FORCE=1 FFSEND_YES=1 FFSEND_QUIET=1
+export FFSEND_HOST=https://send.boblorange.net
+export FFSEND_EXPIRY_TIME=604800
+export FFSEND_DOWNLOAD_LIMIT=5
+
+#check whether copying file or directory
+if [ ! -f "${FILEPATH[@]}" ]; then
+    FFSEND_BIN_OPTS="$FFSEND_BIN_OPTS --archive"
+fi
+  
+# Upload a file
+#zenity --info --text="Ready to send: $FFSEND_BIN $FFSEND_BIN_OPTS ${FILEPATH[@]}"
+$FFSEND_BIN $FFSEND_BIN_OPTS "${FILEPATH[@]}" | $($ZENITY --progress --text="sending $(basename $FILEPATH)" --pulsate   $ZENITY_PROGRESS_OPTIONS) 
+#echo -e "$FILEPATH" | xargs -i $FFSEND_BIN $FFSEND_BIN_OPTS {} | $($ZENITY --progress --text="sending $(basename $FILEPATH)" --pulsate   $ZENITY_PROGRESS_OPTIONS) 
+
+# Upload a file
+#echo -e "$NAUTILUS_SCRIPT_SELECTED_FILE_PATHS" | xargs -i ffsend upload --open --copy {}

pkg/create_deb

@@ -28,7 +28,7 @@ fi
 mkdir -p "$DIR/ffsend-$VERSION"
 cp -- "$DIR/../ffsend" "$DIR/ffsend-$VERSION/ffsend"
 
-# Create an application tarbal
+# Create an application tarball
 cd -- "$DIR/.."
 git archive --format tar.gz -o "$DIR/ffsend-$VERSION/ffsend-$VERSION.tar.gz" "$TRAVIS_TAG"
 

src/cmd/arg/gen_passphrase.rs

@@ -1,11 +1,8 @@
-use chbs::{config::BasicConfig, prelude::*, word::WordList};
+use chbs;
 use clap::Arg;
 
 use super::{CmdArg, CmdArgFlag};
 
-/// How many words the passphrase should consist of.
-const PASSPHRASE_WORDS: usize = 5;
-
 /// The passphrase generation argument.
 pub struct ArgGenPassphrase {}
 
@@ -13,10 +10,7 @@ impl ArgGenPassphrase {
     /// Generate a cryptographically secure passphrase that is easily
     /// remembered using diceware.
     pub fn gen_passphrase() -> String {
-        let mut config = BasicConfig::default();
-        config.words = PASSPHRASE_WORDS;
-        config.word_provider = WordList::builtin_eff_general_short().sampler();
-        config.to_scheme().generate()
+        chbs::passphrase()
     }
 }