Merge remote-tracking branch 'origin/master' into pkg-deb

.gitattributes

@@ -1,3 +0,0 @@
-# Mark generated completion files as vendored
-contrib/completions/* linguist-vendored
-contrib/completions/gen_completions linguist-vendored=false

.github/FUNDING.yml

@@ -1,7 +0,0 @@
-# Funding links
-github:
-  - timvisee
-custom:
-  - "https://timvisee.com/donate"
-patreon: timvisee
-ko_fi: timvisee

.gitlab-ci.yml

@@ -1,61 +1,40 @@
-# GitLab CI configuration for ffsend builds, tests and releases
-#
-# To add a new release:
-# - configure a new 'build-*' job with the proper target
-# - export a build artifact from the new job
-# - manually upload artifact to GitHub in the 'github-release' job
-
 image: "rust:slim"
 
 stages:
   - check
-  - build
   - test
+  - integration
   - release
-  - package
 
-# Variable defaults
 variables:
   RUST_VERSION: stable
-  RUST_TARGET: x86_64-unknown-linux-gnu
 
-# Cache rust/cargo/build artifacts
+# Cargo artifacts caching per Rust version
 cache:
-  key: "$CI_PIPELINE_ID-$RUST_VERSION"
+  key: "$RUST_VERSION"
   paths:
-    - /usr/local/cargo/registry/
-    - /usr/local/rustup/toolchains/
-    - /usr/local/rustup/update-hashes/
+    - /usr/local/rustup/
+    - /usr/local/cargo/
     - target/
 
 # Install compiler and OpenSSL dependencies
 before_script:
-  - apt-get update
+  - apt-get update -y
   - apt-get install -y --no-install-recommends build-essential pkg-config libssl-dev
-  - |
-    rustup install $RUST_VERSION
-    rustup default $RUST_VERSION
-  - |
-    rustc --version
-    cargo --version
+  - rustup install $RUST_VERSION && rustup default $RUST_VERSION
+  - rustc --version && cargo --version
 
-# Check on stable, beta and nightly
+# Check on stable, beta and nightly 
 .check-base: &check-base
   stage: check
   script:
-    - cargo check --verbose
-    - cargo check --no-default-features --features send3,crypto-ring --verbose
-    - cargo check --no-default-features --features send2,crypto-openssl --verbose
-    - cargo check --no-default-features --features send3,crypto-openssl --verbose
-    - cargo check --no-default-features --features send2,send3,crypto-openssl --verbose
-    - cargo check --no-default-features --features send3,crypto-ring,archive --verbose
-    - cargo check --no-default-features --features send3,crypto-ring,history --verbose
-    - cargo check --no-default-features --features send3,crypto-ring,qrcode --verbose
-    - cargo check --no-default-features --features send3,crypto-ring,urlshorten --verbose
-    - cargo check --no-default-features --features send3,crypto-ring,infer-command --verbose
-    - cargo check --features no-color --verbose
+    - cargo check --all --verbose
+    - cargo check --no-default-features --all --verbose
+    - cargo check --features no-color --all --verbose
 check-stable:
   <<: *check-base
+  variables:
+    RUST_VERSION: stable
 check-beta:
   <<: *check-base
   variables:
@@ -64,328 +43,18 @@ check-nightly:
   <<: *check-base
   variables:
     RUST_VERSION: nightly
-check-msrv:
-  <<: *check-base
-  variables:
-    RUST_VERSION: "1.63.0"
 
-# Build using Rust stable
-build-x86_64-linux-gnu:
-  stage: build
-  needs: []
-  script:
-    - cargo build --target=$RUST_TARGET --release --verbose
-    - mv target/$RUST_TARGET/release/ffsend ./ffsend-$RUST_TARGET
-    - strip -g ./ffsend-$RUST_TARGET
-  artifacts:
-    name: ffsend-x86_64-linux-gnu
-    paths:
-      - ffsend-$RUST_TARGET
-    expire_in: 1 month
-
-# Build a static version
-build-x86_64-linux-musl:
-  stage: build
-  needs: []
-  variables:
-    RUST_TARGET: x86_64-unknown-linux-musl
-  script:
-    # Install the static target
-    - rustup target add $RUST_TARGET
-
-    # Build OpenSSL statically
-    - apt-get install -y build-essential wget musl-tools
-    - wget https://www.openssl.org/source/old/1.1.1/openssl-1.1.1k.tar.gz
-    - tar xzvf openssl-1.1.1k.tar.gz
-    - cd openssl-1.1.1k
-    - ./config no-async -fPIC --openssldir=/usr/local/ssl --prefix=/usr/local
-    - make
-    - make install
-    - cd ..
-
-    # Statically build ffsend
-    - export OPENSSL_STATIC=1
-    - export OPENSSL_LIB_DIR=/usr/local/lib
-    - export OPENSSL_INCLUDE_DIR=/usr/local/include
-    - cargo build --target=$RUST_TARGET --release --verbose
-
-    # Prepare the release artifact, strip it
-    - find . -name ffsend -exec ls -lah {} \;
-    - mv target/$RUST_TARGET/release/ffsend ./ffsend-$RUST_TARGET
-    - strip -g ./ffsend-$RUST_TARGET
-  artifacts:
-    name: ffsend-x86_64-linux-musl
-    paths:
-      - ffsend-$RUST_TARGET
-    expire_in: 1 month
-
-# Run the unit tests through Cargo
-test-cargo:
+# Run unit tests
+test-unit:
   stage: test
-  needs: []
-  dependencies: []
   script:
-    - cargo test --verbose
+    - cargo test --all --verbose
 
 # Run integration test with the public Send service
-test-public:
-  image: alpine:latest
-  stage: test
-  dependencies:
-    - build-x86_64-linux-musl
-  variables:
-    GIT_STRATEGY: none
-    RUST_TARGET: x86_64-unknown-linux-musl
-  before_script: []
+integration-send:
+  stage: integration
   script:
-    # Prepare ffsend binary, create random file
-    - mv ./ffsend-$RUST_TARGET ./ffsend
-    - chmod a+x ./ffsend
-    - head -c1m </dev/urandom >test.txt
-
-    # Generate random file, upload/download and assert equality
-    - ./ffsend upload test.txt -I
-    - ./ffsend download $(./ffsend history -q) -I -o=download.txt
-    - "cmp -s ./test.txt ./download.txt || (echo ERROR: Downloaded file is different than original; exit 1)"
-    - rm ./download.txt
-
-# Cargo crate release
-release-crate:
-  stage: release
-  dependencies: []
-  only:
-    - /^v(\d+\.)*\d+$/
-  script:
-    - echo "Creating release crate to publish on crates.io..."
-    - echo $CARGO_TOKEN | cargo login
-    - echo "Publishing crate to crates.io..."
-    - cargo publish --verbose --allow-dirty
-
-# Snap release
-release-snap:
-  image: snapcore/snapcraft:stable
-  stage: release
-  dependencies: []
-  only:
-    - /^v(\d+\.)*\d+$/
-  before_script: []
-  script:
-    # Prepare the environment
-    - apt-get update -y
-    - apt-get install python3 -yqq
-    - cd pkg/snap
-
-    # Update version number in snapcraft.yaml
-    - VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
-    - echo "Determined binary version number 'v$VERSION', updating snapcraft.yaml..."
-    - 'sed "s/^version:.*\$/version: $VERSION/" -i snapcraft.yaml'
-    - 'sed "s/^pkgver=.*\$/pkgver=$VERSION/" -i snapcraft.yaml'
-
-    # Build the package
-    - echo "Building snap package..."
-    - snapcraft
-
-    # Publish snap package
-    - echo "Publishing snap package..."
-    - echo "$SNAPCRAFT_LOGIN" | base64 -d > snapcraft.login
-    - snapcraft whoami
-    - snapcraft push --release=stable ffsend_*_amd64.snap
-  artifacts:
-    name: ffsend-snap-x86_64
-    paths:
-      - pkg/snap/ffsend_*_amd64.snap
-    expire_in: 1 month
-
-# Publish release binaries to as GitHub release
-release-github:
-  stage: release
-  only:
-    - /^v(\d+\.)*\d+$/
-  dependencies:
-    - build-x86_64-linux-gnu
-    - build-x86_64-linux-musl
-  before_script: []
-  script:
-    # Install dependencies
-    - apt-get update
-    - apt-get install -y curl wget gzip netbase
-
-    # Download github-release binary
-    - wget https://github.com/tfausak/github-release/releases/download/1.2.5/github-release-linux.gz -O github-release.gz
-    - gunzip github-release.gz
-    - chmod a+x ./github-release
-
-    # Create the release, upload binaries
-    - ./github-release release --token "$GITHUB_TOKEN" --owner timvisee --repo ffsend --tag "$CI_COMMIT_REF_NAME"  --title "ffsend $CI_COMMIT_REF_NAME"
-    - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo ffsend --tag "$CI_COMMIT_REF_NAME" --file ./ffsend-x86_64-unknown-linux-gnu --name ffsend-$CI_COMMIT_REF_NAME-linux-x64
-    - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo ffsend --tag "$CI_COMMIT_REF_NAME" --file ./ffsend-x86_64-unknown-linux-musl --name ffsend-$CI_COMMIT_REF_NAME-linux-x64-static
-
-# Publish a Docker image
-release-docker:
-  image: docker:git
-  stage: release
-  only:
-    - /^v(\d+\.)*\d+$/
-  dependencies:
-    - build-x86_64-linux-musl
-  services:
-    - docker:dind
-  variables:
-    RUST_TARGET: x86_64-unknown-linux-musl
-    DOCKER_HOST: tcp://docker:2375
-    # DOCKER_DRIVER: overlay2
-  before_script: []
-  script:
-    # Place binary in Docker directory, change to it
-    - mv ./ffsend-$RUST_TARGET ./pkg/docker/ffsend
-    - cd ./pkg/docker
-
-    # Build the Docker image, run it once to test
-    - docker build -t timvisee/ffsend:latest ./
-    - docker run --rm timvisee/ffsend:latest -V
-
-    # Retag version
-    - VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
-    - echo "Determined Docker image version number 'v$VERSION', retagging image..."
-    - docker tag timvisee/ffsend:latest timvisee/ffsend:$VERSION
-
-    # Authenticate and push the Docker images
-    - echo "$DOCKER_PASSWORD" | docker login -u "$DOCKER_USER" --password-stdin
-    - docker push timvisee/ffsend:$VERSION
-    - docker push timvisee/ffsend:latest
-
-# AUR packages release
-package-aur:
-  image: archlinux
-  stage: package
-  needs:
-    - release-github
-  dependencies: []
-  only:
-    - /^v(\d+\.)*\d+$/
-  before_script: []
-  script:
-    - cd ./pkg/aur
-
-    # Determine the version number we're releasing for
-    - VERSION=$(echo $CI_COMMIT_REF_NAME | cut -c 2-)
-    - echo "Determined binary version number 'v$VERSION'"
-
-    # Determine remote URLs and SHA checksums
-    - echo "Determining SHA checksums for remote files..."
-    - URL_BIN=https://github.com/timvisee/ffsend/releases/download/v$VERSION/ffsend-v$VERSION-linux-x64-static
-    - URL_SOURCE=https://gitlab.com/timvisee/ffsend/-/archive/v$VERSION/ffsend-v$VERSION.tar.gz
-    - URL_BASH_COMPLETION=https://gitlab.com/timvisee/ffsend/raw/v$VERSION/contrib/completions/ffsend.bash
-    - URL_ZSH_COMPLETION=https://gitlab.com/timvisee/ffsend/raw/v$VERSION/contrib/completions/_ffsend
-    - URL_FISH_COMPLETION=https://gitlab.com/timvisee/ffsend/raw/v$VERSION/contrib/completions/ffsend.fish
-    - URL_LICENSE=https://gitlab.com/timvisee/ffsend/raw/v$VERSION/LICENSE
-    - 'echo "Selected binary URL: $URL_BIN"'
-    - 'echo "Selected source URL: $URL_SOURCE"'
-    - echo "Determining sha256sum for remote binary..."
-    - 'SHA_BIN=$(curl -sSL "$URL_BIN" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sum: $SHA_BIN"'
-    - 'SHA_BASH_COMPLETION=$(curl -sSL "$URL_BASH_COMPLETION" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sums of bash completion: $SHA_BASH_COMPLETION"'
-    - 'SHA_ZSH_COMPLETION=$(curl -sSL "$URL_ZSH_COMPLETION" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sums of ZSH completion: $SHA_ZSH_COMPLETION"'
-    - 'SHA_FISH_COMPLETION=$(curl -sSL "$URL_FISH_COMPLETION" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sums of fish completion: $SHA_FISH_COMPLETION"'
-    - 'SHA_LICENSE=$(curl -sSL "$URL_LICENSE" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sums of LICENSE: $SHA_LICENSE"'
-    - echo "Determining sha256sum for remote source..."
-    - 'SHA_SOURCE=$(curl -sSL "$URL_SOURCE" | sha256sum | cut -d" " -f1)'
-    - 'echo "Got sha256sum: $SHA_SOURCE"'
-
-    # Update PKGBUILD parameters: version, source URL and SHA sum
-    - echo "Updating PKGBUILDS with release information..."
-    - sed "s/^pkgver=.*\$/pkgver=$VERSION/" -i ffsend/PKGBUILD
-    - sed "s/^pkgver=.*\$/pkgver=$VERSION/" -i ffsend-bin/PKGBUILD
-    - sed "s/^pkgver=.*\$/pkgver=$VERSION.$CI_COMMIT_SHORT_SHA/" -i ffsend-git/PKGBUILD
-    - sed "s/^source=(\".*\").*\$/source=(\"$(echo $URL_SOURCE | sed 's/\//\\\//g')\")/" -i ffsend/PKGBUILD
-    - sed "s/\(\"ffsend-v\$pkgver::\).*\"/\1$(echo $URL_BIN | sed 's/\//\\\//g')\"/" -i ffsend-bin/PKGBUILD
-    - sed "s/\(\"ffsend-v\$pkgver.bash::\).*\"/\1$(echo $URL_BASH_COMPLETION | sed 's/\//\\\//g')\"/" -i ffsend-bin/PKGBUILD
-    - sed "s/\(\"ffsend-v\$pkgver.zsh::\).*\"/\1$(echo $URL_ZSH_COMPLETION | sed 's/\//\\\//g')\"/" -i ffsend-bin/PKGBUILD
-    - sed "s/\(\"ffsend-v\$pkgver.fish::\).*\"/\1$(echo $URL_FISH_COMPLETION | sed 's/\//\\\//g')\"/" -i ffsend-bin/PKGBUILD
-    - sed "s/\(\"LICENSE-v\$pkgver::\).*\"/\1$(echo $URL_LICENSE | sed 's/\//\\\//g')\"/" -i ffsend-bin/PKGBUILD
-    - sed "s/^sha256sums=.*\$/sha256sums=('$SHA_SOURCE')/" -i ffsend/PKGBUILD
-    - sed "s/^sha256sums=.*\$/sha256sums=('$SHA_BIN' '$SHA_BASH_COMPLETION' '$SHA_ZSH_COMPLETION' '$SHA_FISH_COMPLETION' '$SHA_LICENSE')/" -i ffsend-bin/PKGBUILD
-
-    # Get SHA hash for local and remote file w/o version, update if it has changed
-    - 'SHA_STRIP_LOCAL=$(cat ffsend-git/PKGBUILD | sed /^pkgver=.\*/d | sha256sum | cut -d" " -f1)'
-    - 'SHA_STRIP_REMOTE=$(curl -sSL "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=ffsend-git" | sed /^pkgver=.\*/d | sha256sum | cut -d" " -f1)'
-
-    # Install dependencies
-    - echo "Installing required build packages..."
-    - pacman -Syu --noconfirm sudo base-devel binutils openssh rust cargo cmake git openssl
-
-    # Make AUR package
-    - mkdir -p /.cargo
-    - chmod -R 777 /.cargo
-    - cd ffsend-bin/
-    - echo "Making binary package..."
-    - sudo -u nobody makepkg -c
-    - sudo -u nobody makepkg --printsrcinfo > .SRCINFO
-    - cd ../ffsend
-    - echo "Making main source package..."
-    - sudo -u nobody makepkg -c
-    - sudo -u nobody makepkg --printsrcinfo > .SRCINFO
-    # Make git package if different than the remote
-    - |
-      if [ ! "$SHA_STRIP_LOCAL" == "$SHA_STRIP_REMOTE" ]; then
-        cd ../ffsend-git
-        echo "Making git source package..."
-        sudo -u nobody makepkg -c
-        sudo -u nobody makepkg --printsrcinfo > .SRCINFO
-      else
-        echo "Not making git source package, it has not changed"
-      fi
-    - cd ..
-
-    # Set up SSH for publishing
-    - mkdir -p /root/.ssh
-    - cp ./aur.pub /root/.ssh/id_rsa.pub
-    - echo "$AUR_SSH_PRIVATE" > /root/.ssh/id_rsa
-    - echo "Host aur.archlinux.org" >> /root/.ssh/config
-    - echo "  IdentityFile /root/.ssh/aur" >> /root/.ssh/config
-    - echo "  User aur" >> /root/.ssh/config
-    - chmod 600 /root/.ssh/{id_rsa*,config}
-    - eval `ssh-agent -s`
-    - ssh-add /root/.ssh/id_rsa
-    - ssh-keyscan -H aur.archlinux.org >> /root/.ssh/known_hosts
-    - git config --global user.name "timvisee"
-    - git config --global user.email "tim@visee.me"
-
-    # Publish main package: clone AUR repo, commit update and push
-    - git clone ssh://aur@aur.archlinux.org/ffsend.git aur-ffsend
-    - cd aur-ffsend
-    - cp ../ffsend/{PKGBUILD,.SRCINFO} ./
-    - git add PKGBUILD .SRCINFO
-    - git commit -m "Release v$VERSION"
-    - git push
-    - cd ..
-
-    # Publish binary package: clone AUR repo, commit update and push
-    - git clone ssh://aur@aur.archlinux.org/ffsend-bin.git aur-ffsend-bin
-    - cd aur-ffsend-bin
-    - cp ../ffsend-bin/{PKGBUILD,.SRCINFO} ./
-    - git add PKGBUILD .SRCINFO
-    - git commit -m "Release v$VERSION"
-    - git push
-    - cd ..
-
-    # Publish git package: clone AUR repo, commit update and push
-    # Only publish it if it is different than the remote
-    - |
-      if [ ! "$SHA_STRIP_LOCAL" == "$SHA_STRIP_REMOTE" ]; then
-        git clone ssh://aur@aur.archlinux.org/ffsend-git.git aur-ffsend-git
-        cd aur-ffsend-git
-        cp ../ffsend-git/{PKGBUILD,.SRCINFO} ./
-        git add PKGBUILD .SRCINFO
-        git commit -m "Update PKGBUILD for release v$VERSION"
-        git push
-        cd ..
-      else
-        echo "Not pushing git package, it has not changed"
-      fi
-
-# TODO: add job to test ffsend{-git} AUR packages
+    - cargo build
+    - head -c 1M </dev/urandom >testfile
+    - cargo run -- upload testfile -n testfile.bin -a -d 10 -p secret -I
+    # TODO: download this file, compare checksums

.travis.yml

@@ -1,41 +1,157 @@
-# Travis CI configuration for building macOS binaries for ffsend.
-# These macOS binaries are published on GitHub as release files.
-#
-# The main CI runs on GitLab CI at: https://gitlab.com/timvisee/ffsend/pipelines
-
+# Configuration for Travis CI
 language: rust
+sudo: required
+services:
+  - docker
 
-# Only build release jobs
 stages:
+  - build
+  - test
   - name: release
     if: tag =~ ^v(\d+\.)*\d+$
 
 jobs:
   include:
+    ################################
+    # Build stage                  #
+    ################################
+
+    # Linux with Rust stable/beta/nightly
+    - stage: build
+      rust: stable
+      env: TARGET=x86_64-unknown-linux-gnu
+      cache: cargo
+      script: &build-script
+        - cargo build --verbose --all
+        - cargo build --no-default-features --verbose --all
+        - cargo build --features no-color --verbose --all
+    - stage: build
+      rust: beta
+      env: TARGET=x86_64-unknown-linux-gnu
+      cache: cargo
+      script: *build-script
+    - stage: build
+      rust: nightly
+      env: TARGET=x86_64-unknown-linux-gnu
+      cache: cargo
+      script: *build-script
+
+    # macOS with Rust stable
+    - stage: build
+      rust: stable
+      os: osx
+      env: TARGET=x86_64-apple-darwin
+      cache: cargo
+      script: *build-script
+
+    ################################
+    # Test stage                   #
+    ################################
+
+    - stage: test
+      env: TARGET=x86_64-unknown-linux-gnu
+      cache: cargo
+      script: cargo test --verbose --all
+
+    ################################
+    # Release stage                #
+    ################################
+
+    # Cargo crate release
+    - stage: release
+      env: TARGET=x86_64-unknown-linux-gnu
+      cache: cargo
+      script:
+        - echo "Creating release crate on crates.io..."
+        - echo $CARGO_TOKEN | cargo login
+        - cargo publish --verbose
+
+    # GitHub binary release for Linux on x86/x86_64
+    - stage: release
+      rust: stable
+      env: TARGET=x86_64-unknown-linux-gnu TARGET_SIMPLE=linux-x64 DEB=y
+      cache: cargo
+      install: &install-github-release
+        - |
+          if [ ! $TARGET == "x86_64-unknown-linux-gnu" ] && [ ! $TARGET == "x86_64-apple-darwin" ]; then
+            cargo install cross
+          fi
+        - |
+          if [ -n "$DEB" ]; then
+            cargo install cargo-deb
+          fi
+      script: &script-github-release
+        - |
+          if [ $TARGET == "x86_64-unknown-linux-gnu" ] || [ $TARGET == "x86_64-apple-darwin" ]; then
+            echo "Creating release binary on GitHub for $TARGET..."
+            cargo build --release --verbose --all
+            cp target/release/ffsend ./ffsend
+          else
+            echo "Creating release binary on GitHub for $TARGET (cross compiled)..."
+            cross build --target $TARGET --release --verbose --all
+            cp target/$TARGET/release/ffsend ./ffsend
+          fi
+        - tar -czvf ./ffsend-$TRAVIS_TAG-$TARGET_SIMPLE.tar.gz ffsend
+        - |
+          if [ -n "$DEB" ]; then
+            cargo deb --verbose
+          fi
+        - mv ./ffsend ./ffsend-$TRAVIS_TAG-$TARGET_SIMPLE
+      deploy: &deploy-github-release
+        provider: releases
+        api_key: $GITHUB_OAUTH_TOKEN
+        skip_cleanup: true
+        overwrite: true
+        file_glob: true
+        file:
+          - target/debian/ffsend_*.deb
+          - ffsend-$TRAVIS_TAG-$TARGET_SIMPLE.tar.gz
+          - ffsend-$TRAVIS_TAG-$TARGET_SIMPLE
+        on:
+          tags: true
+          branch: master
+    - stage: release
+      rust: stable
+      env: TARGET=i686-unknown-linux-gnu TARGET_SIMPLE=linux-i386 DEB=y
+      cache: cargo
+      install: *install-github-release
+      script: *script-github-release
+      deploy: *deploy-github-release
+
+    # GitHub binary release for Linux on arch
+    - stage: release
+      rust: stable
+      env: TARGET=aarch64-unknown-linux-gnu TARGET_SIMPLE=linux-aarch64
+      cache: cargo
+      install: *install-github-release
+      script: *script-github-release
+      deploy: *deploy-github-release
+    - stage: release
+      rust: stable
+      env: TARGET=arm-unknown-linux-gnueabi TARGET_SIMPLE=linux-arm
+      cache: cargo
+      install: *install-github-release
+      script: *script-github-release
+      deploy: *deploy-github-release
+    - stage: release
+      rust: stable
+      env: TARGET=armv7-unknown-linux-gnueabihf TARGET_SIMPLE=linux-armv7
+      cache: cargo
+      install: *install-github-release
+      script: *script-github-release
+      deploy: *deploy-github-release
+
+    # GitHub binary release for macOX
     - stage: release
       rust: stable
       os: osx
-      env: RUST_TARGET=x86_64-apple-darwin
+      env: TARGET=x86_64-apple-darwin TARGET_SIMPLE=osx-x64
       cache: cargo
-      script:
-        # Create release binary for macOS
-        - echo "Creating release binary for $RUST_TARGET..."
-        - cargo build --target=$RUST_TARGET --release --verbose --all
-        - cp target/$RUST_TARGET/release/ffsend ./ffsend
+      install: *install-github-release
+      script: *script-github-release
+      deploy: *deploy-github-release
 
-        # Download github-release binary
-        - wget https://github.com/tfausak/github-release/releases/download/1.2.4/github-release-osx.gz -O github-release.gz
-        - gunzip github-release.gz
-        - chmod a+x ./github-release
-
-        # Create the release, upload binary
-        - ./github-release release --token "$GITHUB_TOKEN" --owner timvisee --repo ffsend --tag "$TRAVIS_TAG"  --title "ffsend $TRAVIS_TAG"
-        - ./github-release upload --token "$GITHUB_TOKEN" --owner timvisee --repo ffsend --tag "$TRAVIS_TAG" --file ./ffsend --name ffsend-$TRAVIS_TAG-macos
-
-        # TODO: disabled for now to throttle updates, manually enable on major release
-        # # Update homebrew package
-        # - git config --global user.name "timvisee"
-        # - git config --global user.email "$GIT_EMAIL"
-        # - git config --global credential.helper store
-        # - echo "https://timvisee:$HOMEBREW_GITHUB_API_TOKEN@github.com" >> ~/.git-credentials
-        # - brew bump-formula-pr --url="https://github.com/timvisee/ffsend/archive/$TRAVIS_TAG.tar.gz" --message="Automated release pull request using continuous integration." --no-browse -f -v ffsend
+# TODO: add Windows architecture (using AppVeyor)
+# TODO: add (Free)BSD architecture
+# TODO: enfore the git tag/crate version equality for releases
+# TODO: disable addons/rust installation for GitHub release job

CONTRIBUTING.md

@@ -1,132 +0,0 @@
-# Contributing
-
-**Repository:**
-- [GitLab repository][gitlab]
-- _Mirror: [GitHub repository][github]_
-
-**Issues:** (bug reporting, feature requests, enhancements, etc.)
-- [GitLab issue board][gitlab-issues]
-- _Alternatively: [GitHub issue board][github-issues]_
-
-**Pull/merge requests:** (fixes, implemented features, etc.)
-- [GitLab merge requests][gitlab-mr]
-- _Alternatively: [GitHub pull requests][github-pr]_
-
-
-
-Contributions to the `ffsend` project are welcome!
-When contributing new features, alternative implementations or bigger
-improvements, please first discuss the change you wish to make via an issue
-or email.
-Small changes such as fixed commands, fixed spelling or dependency updates
-are always welcome without discussion.
-
-The `ffsend` repository is primarily hosted on [GitLab][gitlab].
-[GitHub][github] hosts a mirror, for publicity and findability.
-Please open any issues or pull requests on the [GitLab][gitlab] pages if possible.
-Otherwise opening these on [GitHub][github] is fine, though they might be
-manually moved over to [GitLab][gitlab].
-
-Please note we have a code of conduct, please follow it in all your interactions
-with the project.
-
-## Pull Request Process
-
-1. Ensure you've discussed your improvements in an issue when working on a
-   bigger change
-2. Ensure your branch is up-to-date with the latest [`master`][branch-master]
-3. Ensure the project builds with your changes: `cargo build`
-4. Ensure the project tests succeed with your changes: `cargo test`
-5. Update the `README.md` with details of significant changes, this includes new
-   compiler features, command-line arguments, environment variables or new
-   package installation instructions.
-6. Submit your pull request.
-7. Fix any issues continuous integration might report.
-
-Additional notes:
-- Do not change version numbers, this is done by @timvisee
-
-## Code of Conduct
-
-### Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-### Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-### Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-### Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-### Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting the project owner at 3a4fb3964f@sinenomine.email. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-### Attribution
-This Code of Conduct is adapted from the [Contributor Covenant][coc-homepage], version 1.4,
-available at [https://contributor-covenant.org/version/1/4][coc-version]
-
-## License
-This project is released under the GNU GPL-3.0 license.
-Check out the [LICENSE](LICENSE) file for more information.
-
-[branch-master]: https://gitlab.com/timvisee/ffsend/tree/master
-[gitlab]: https://gitlab.com/timvisee/ffsend
-[gitlab-issues]: https://gitlab.com/timvisee/ffsend/issues
-[gitlab-mr]: https://gitlab.com/timvisee/ffsend/merge_requests
-[github]: https://github.com/timvisee/ffsend
-[github-issues]: https://github.com/timvisee/ffsend/issues
-[github-pr]: https://github.com/timvisee/ffsend/pulls
-[coc-homepage]: https://contributor-covenant.org
-[coc-version]: https://contributor-covenant.org/version/1/4/

Cargo.toml

@@ -1,15 +1,14 @@
 [package]
 name = "ffsend"
-version = "0.2.76"
-rust-version = "1.63.0"
-authors = ["Tim Visee <3a4fb3964f@sinenomine.email>"]
+version = "0.0.7"
+authors = ["Tim Visee <timvisee@gmail.com>"]
 license = "GPL-3.0"
 readme = "README.md"
-homepage = "https://timvisee.com/projects/ffsend"
+homepage = "https://gitlab.com/timvisee/ffsend"
 repository = "https://gitlab.com/timvisee/ffsend"
 description = """\
     Easily and securely share files from the command line.\n\
-    A fully featured Send client.\
+    A fully featured Firefox Send client.\
 """
 keywords = ["send", "firefox", "cli"]
 categories = [
@@ -20,16 +19,8 @@ categories = [
     "network-programming",
 ]
 exclude = [
-    "/.github",
-    "/contrib",
-    "/pkg",
-    "/res",
-    "/*.yml",
-    "/CONTRIBUTING.md",
-    "/SECURITY.md",
+    "res/*",
 ]
-edition = "2018"
-build = "build.rs"
 
 [package.metadata.deb]
 section = "utility"
@@ -38,7 +29,7 @@ Easily and securely share files and directories from the command line through
 a safe, private and encrypted link using a single simple command. \
 Files are shared using the Send service and may be up to 2GB. \
 Others are able to download these files with this tool, \
-or through their web browser.\n\
+or through their webbrowser.\n\
 \n\
 All files are always encrypted on the client, \
 and secrets are never shared with the remote host. \
@@ -47,89 +38,48 @@ An optional password may be specified, and a default file lifetime of 1 \
 remain online forever. This provides a secure platform to share your files."""
 priority = "standard"
 license-file = ["LICENSE", "3"]
-depends = "$auto, libssl1.1, ca-certificates, xclip"
+depends = "$auto, xclip"
 maintainer-scripts = "pkg/deb"
 
+[badges]
+travis-ci = { repository = "timvisee/ffsend", branch = "master" }
+
 [[bin]]
 name = "ffsend"
 path = "src/main.rs"
 
 [features]
-default = ["archive", "clipboard", "crypto-ring", "history", "infer-command", "qrcode", "send3", "urlshorten"]
+default = ["archive", "clipboard", "history"]
 
 # Compile with file archiving support
 archive = ["tar"]
 
-# Support for putting share URLs in clipboard
-clipboard = ["clip", "which"]
-
 # Compile with file history support
 history = []
 
-# Support for Send v2
-send2 = ["ffsend-api/send2"]
-
-# Support for Send v3
-send3 = ["ffsend-api/send3"]
-
-# Use OpenSSL as cryptography backend
-crypto-openssl = ["ffsend-api/crypto-openssl"]
-
-# Use ring as cryptography backend
-crypto-ring = ["ffsend-api/crypto-ring"]
-
-# Support for generating QR codes for share URLs
-qrcode = ["qr2term"]
-
-# Support for shortening share URLs
-urlshorten = ["urlshortener"]
-
-# Support for inferring subcommand when linking binary
-infer-command = []
-
 # Compile without colored output support
 no-color = ["colored/no-color"]
 
-# Automatic using build.rs: use xclip/xsel binary method for clipboard support
-clipboard-bin = ["clipboard"]
-
-# Automatic using build.rs: use native clipboard crate for clipboard support
-clipboard-crate = ["clipboard"]
-
 [dependencies]
-chbs = "0.1.0"
 chrono = "0.4"
-clap = "2.33"
-colored = "2.0"
-derive_builder = "0.10"
-directories = "4.0"
+clap = "2.31"
+colored = "1.6"
+derive_builder = "0.5"
+directories = "0.10"
 failure = "0.1"
-ffsend-api = { version = "0.7.3", default-features = false }
+ffsend-api = "0.0"
 fs2 = "0.4"
-lazy_static = "1.4"
-open = "2"
-openssl-probe = "0.1"
-pathdiff = "0.2"
+lazy_static = "1.0"
+open = "1"
 pbr = "1"
-prettytable-rs = { version = "0.10.0", default-features = false }
-qr2term = { version = "0.2", optional = true }
-rand = "0.8"
-regex = "1.5"
-rpassword = "5"
-serde = "1"
-serde_derive = "1"
+prettytable-rs = "0.6"
+rpassword = "2.0"
+serde = "1.0"
+serde_derive = "1.0"
 tar = { version = "0.4", optional = true }
 tempfile = "3"
-toml = "0.5"
-urlshortener = { version = "3", optional = true }
-version-compare = "0.1"
+toml = "0.4"
+version-compare = "0.0.6"
 
-[target.'cfg(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd"))'.dependencies]
-which = { version = "4.0", optional = true }
-
-[target.'cfg(not(any(target_os = "linux", target_os = "freebsd", target_os = "dragonfly", target_os = "openbsd", target_os = "netbsd")))'.dependencies]
-# Aliased to clip to prevent name collision with clipboard feature
-clip = { version = "0.5", optional = true, package = "clipboard" }
-
-[package.metadata.docs.rs]
-targets = ["x86_64-unknown-linux-gnu"]
+[target.'cfg(not(target_os = "linux"))'.dependencies]
+clipboard = { version = "0.4", optional = true }

LICENSE

@@ -1,7 +1,7 @@
                     GNU GENERAL PUBLIC LICENSE
                        Version 3, 29 June 2007
 
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Copyright (C) 2018 Tim Visee. <https://timvisee.com/>
  Everyone is permitted to copy and distribute verbatim copies
  of this license document, but changing it is not allowed.
 
@@ -645,7 +645,7 @@ the "copyright" line and a pointer to where the full notice is found.
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 Also add information on how to contact you by electronic and paper mail.
 
@@ -664,11 +664,11 @@ might be different; for a GUI interface, you would use an "about box".
   You should also get your employer (if you work as a programmer) or school,
 if any, to sign a "copyright disclaimer" for the program, if necessary.
 For more information on this, and how to apply and follow the GNU GPL, see
-<https://www.gnu.org/licenses/>.
+<http://www.gnu.org/licenses/>.
 
   The GNU General Public License does not permit incorporating your program
 into proprietary programs.  If your program is a subroutine library, you
 may consider it more useful to permit linking proprietary applications with
 the library.  If this is what you want to do, use the GNU Lesser General
 Public License instead of this License.  But first, please read
-<https://www.gnu.org/licenses/why-not-lgpl.html>.
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

README.md

@@ -1,27 +1,24 @@
-[![Build status on GitLab CI][gitlab-ci-master-badge]][gitlab-ci-link]
+[![Build status on Travis CI][travis-master-badge]][travis-link]
 [![Newest release on crates.io][crate-version-badge]][crate-link]
+[![Number of downloads on crates.io][crate-download-badge]][crate-link]
 [![Project license][crate-license-badge]](LICENSE)
 
-[crate-license-badge]: https://img.shields.io/crates/l/ffsend.svg
 [crate-link]: https://crates.io/crates/ffsend
+[crate-download-badge]: https://img.shields.io/crates/d/ffsend.svg
 [crate-version-badge]: https://img.shields.io/crates/v/ffsend.svg
-[gitlab-ci-link]: https://gitlab.com/timvisee/ffsend/pipelines
-[gitlab-ci-master-badge]: https://gitlab.com/timvisee/ffsend/badges/master/pipeline.svg
-
-*Notice: the default Send host is provided by [@timvisee][timvisee]
-([info](https://gitlab.com/timvisee/ffsend/-/issues/111)).
-Please consider to [donate] and help keep it running.*
-
-# ffsend
+[crate-license-badge]: https://img.shields.io/crates/l/ffsend.svg
+[travis-master-badge]: https://travis-ci.org/timvisee/ffsend.svg?branch=master
+[travis-link]: https://travis-ci.org/timvisee/ffsend
 
+# ffsend [WIP]
 > Easily and securely share files from the command line.
-> A [Send][send] client.
+> A fully featured [Firefox Send][send] client.
 
 Easily and securely share files and directories from the command line through a
 safe, private and encrypted link using a single simple command.
 Files are shared using the [Send][send] service and may be up
-to 1GB. Others are able to download these files with this tool, or through
-their web browser.
+to 2GB. Others are able to download these files with this tool, or through
+their webbrowser.
 
 [![ffsend usage demo][usage-demo-svg]][usage-demo-asciinema]  
 _No demo visible here? View it on [asciinema][usage-demo-asciinema]._
@@ -36,7 +33,7 @@ Find out more about security [here](#security).
 - [Features](#features)
 - [Usage](#usage)
 - [Requirements](#requirements)
-- [Install](#install) ([Linux](#linux-all-distributions), [macOS](#macos), [Windows](#windows), [FreeBSD](#freebsd), [Android](#android), [_Other OS/arch_](#other-os-or-architecture))
+- [Install](#install)
 - [Build](#build)
 - [Configuration and environment](#configuration-and-environment)
 - [Security](#security)
@@ -45,28 +42,27 @@ Find out more about security [here](#security).
 - [License](#license)
 
 The public [Send][send] service that is used as default host is provided by
-[@timvisee][timvisee] ([info](https://gitlab.com/timvisee/ffsend/-/issues/111)).  
-This application is not affiliated with [Firefox][firefox] or
-[Mozilla][mozilla] in any way.
+[Mozilla][mozilla].  
+This application is not affiliated with [Mozilla][mozilla], [Firefox][firefox]
+or [Firefox Send][send] in any way.
 
-_Note: this tool is currently in beta, as some extra desired features are yet to be implemented_
+_Note: this tool is currently in the alpha phase_
 
 ## Features
 - Fully featured and friendly command line tool
-- Upload and download files and directories securely, always encrypted on the client
-- Additional password protection, generation and configurable download limits
-- File and directory archiving and extraction
-- Built-in share URL shortener and QR code generator
-- Supports Send v3 (current) and v2
+- Upload and download files and directories securely
+- Always encrypted on the client
+- Additional password protection and configurable download limits
+- Built-in file and directory archiving and extraction
 - History tracking your files for easy management
-- Ability to use your own Send hosts
+- Ability to use your own Send host
 - Inspect or delete shared files
 - Accurate error reporting
-- Streaming encryption and uploading/downloading, very low memory footprint
-- Intended for use in [scripts](#scriptability) without interaction
+- Low memory footprint, due to encryption, download and upload streaming
+- Intended to be used in scripts without interaction
 
 For a list of upcoming features and ideas, take a look at the
-current [open issues](https://gitlab.com/timvisee/ffsend/issues) over on GitLab.
+[ROADMAP](ROADMAP.md) file.
 
 ## Usage
 Easily upload and download:
@@ -74,36 +70,35 @@ Easily upload and download:
 ```bash
 # Simple upload
 $ ffsend upload my-file.txt
-https://send.vis.ee/#sample-share-url
+Share link: https://send.firefox.com/#sample-share-url
 
 # Advanced upload
-# - Specify a download limit of 1
-# - Specify upload expiry time of 5 minutes
+# - Specify a download limit of 20
 # - Enter a password to encrypt the file
 # - Archive the file before uploading
 # - Copy the shareable link to your clipboard
 # - Open the shareable link in your browser
-$ ffsend upload --downloads 1 --expiry-time 5m --password --archive --copy --open my-file.txt
+$ ffsend upload --downloads 20 --password --archive --copy --open my-file.txt
 Password: ******
-https://send.vis.ee/#sample-share-url
+Share link: https://send.firefox.com/#sample-share-url
 
 # Upload to your own host
 $ ffsend u -h https://example.com/ my-file.txt
-https://example.com/#sample-share-url
+Share link: https://example.com/#sample-share-url
 
 # Simple download
-$ ffsend download https://send.vis.ee/#sample-share-url
+$ ffsend download https://send.firefox.com/#sample-share-url
 ```
 
 Inspect remote files:
 
 ```bash
 # Check if a file exists
-$ ffsend exists https://send.vis.ee/#sample-share-url
+$ ffsend exists https://send.firefox.com/#sample-share-url
 Exists: yes
 
 # Fetch remote file info
-$ ffsend info https://send.vis.ee/#sample-share-url
+$ ffsend info https://send.firefox.com/#sample-share-url
 ID:         b087066715
 Name:       my-file.txt
 Size:       12 KiB
@@ -113,420 +108,132 @@ Expiry:     18h2m (64928s)
 ```
 
 Other commands include:
-
 ```bash
 # View your file history
 $ ffsend history
-#  LINK                                        EXPIRE
-1  https://send.vis.ee/#sample-share-url  23h57m
-2  https://send.vis.ee/#other-sample-url  17h38m
-3  https://example.com/#sample-share-url       37m30s
+#  LINK                                        EXPIRY  OWNER TOKEN
+1  https://send.firefox.com/#sample-share-url  23h57m  eea9f544f6d5df8a5afd
+2  https://send.firefox.com/#other-sample-url  17h38m  1e9fef63fee3baaf54ce
+3  https://example.com/#sample-share-url       37m30s  8eb28bc1bc85cfdab0e4
 
 # Change the password after uploading
-$ ffsend password https://send.vis.ee/#sample-share-url
+$ ffsend password https://send.firefox.com/#sample-share-url
 Password: ******
 
 # Delete a file
-$ ffsend delete https://send.vis.ee/#sample-share-url
+$ ffsend delete https://send.firefox.com/#sample-share-url
 ```
 
 Use the `--help` flag, `help` subcommand, or see the [help](#help) section for
 all available subcommands.
 
 ## Requirements
-- Linux, macOS, Windows, FreeBSD, Android (other BSDs might work)
+- Linux, macOS or Windows
 - A terminal :sunglasses:
-- Internet connection
-- Linux:
-  - OpenSSL & CA certificates:
-    - Ubuntu, Debian and derivatives: `apt install openssl ca-certificates`
-  - Optional: `xclip` or `xsel` for clipboard support
-    - Ubuntu, Debian and derivatives: `apt install xclip`
+- Linux specific:
+  - `xclip` for clipboard support (optional)
+    - Ubuntu/Debian: `apt install xclip`
     - CentOS/Red Hat/openSUSE/Fedora: `yum install xclip`
     - Arch: `pacman -S xclip`
-- Windows specific:
-  - Optional OpenSSL with `crypto-openssl` feature: [» Installer][openssl-windows-installer] (`v1.1.0j` or above)
-- macOS specific:
-  - Optional OpenSSL with `crypto-openssl` feature: `brew install openssl@1.1`
-- FreeBSD specific:
-  - OpenSSL: `pkg install openssl`
-  - CA certificates: `pkg install ca_root_nss`
-  - Optional `xclip` & `xsel` for clipboard support: `pkg install xclip xsel-conrad`
-- Android specific:
-  - Termux: [» Termux][termux]
+- Internet connection for uploading and downloading
 
 ## Install
-Because `ffsend` is still in early stages, only limited installation options are
-available right now. Feel free to contribute additional packages.
+<!-- Before installing, make sure you meet all requirements listed
+[here](#requirements) -->
 
-Make sure you meet and install the [requirements](#requirements).
+Because `ffsend` is still in alpha, only limited installation options are
+available right now.  
 
-See the operating system specific instructions below:
-- [Linux](#linux-all-distributions)
-- [macOS](#macos)
-- [Windows](#windows)
-- [FreeBSD](#freebsd)
-- [Android](#android)
-- [_Other OS or architecture_](#other-os-or-architecture)
+A set of pre-build binaries for Linux and macOS can be found as asset of the
+[latest release][github-latest-release]. When downloading such release, mark
+the binary as executable using `chmod a+x ffsend`, and move it into `/usr/bin/`.
 
-### Linux (all distributions)
-Using the [snap](#linux-snap-package) package is recommended if supported.  
-Alternatively you may install it manually using the
-[prebuilt binaries](#linux-prebuilt-binaries).
+A Windows binary and packaged versions for various Linux distributions is
+currently being worked on.
 
-Only 64-bit (`x86_64`) packages and binaries are provided.
-For other architectures and configurations you may [compile from source](#build).
-
-More packages options will be coming soon.
-
-#### Linux: snap package
-_Note: The `ffsend` `snap` package is isolated, and can only access files in
-your home directory. Choose a different installation option if you don't want
-this limitation._
-
-_Note: due to how `snap` is configured by default, you won't be able to use the
-package from some contexts such as through SSH without manual modifications. If
-you're experiencing problems, please refer to a different installation method
-such as the [prebuilt binaries](#linux-prebuilt-binaries), or open an issue._
-
-[» `ffsend`][snapcraft-ffsend]
-
-```bash
-snap install ffsend
-ffsend --help
-```
-
-#### Linux: Arch AUR packages
-[» `ffsend-bin`][aur-ffsend-bin] (precompiled binary, latest release, recommended)  
-[» `ffsend`][aur-ffsend] (compiles from source, latest release)  
-[» `ffsend-git`][aur-ffsend-git] (compiles from source, latest `master` commit)
-
-```bash
-yay -S ffsend
-# or
-aurto add ffsend-bin
-sudo pacman -S ffsend-bin
-# or using any other AUR helper
-
-ffsend --help
-```
-
-#### Linux: Nix package
-_Note: The Nix package is currently not automatically updated, and might be
-slightly outdated._
-
-[» ffsend][nix-ffsend]
-
-```bash
-nix-channel --update
-nix-env --install ffsend
-
-ffsend --help
-```
-
-#### Linux: Fedora package
-_Note: The Fedora package is maintained by contributors, and might be
-slightly outdated._
-
-[» ffsend][fedora-ffsend]
-
-```bash
-sudo dnf install ffsend
-
-ffsend --help
-```
-
-#### Linux: Alpine package
-_Note: The Alpine package is maintained by contributors, it might be outdated.
-Choose a different installation method if an important update is missing._
-
-[» ffsend][alpine-ffsend]
-
-```bash
-apk add ffsend --repository=http://dl-cdn.alpinelinux.org/alpine/edge/testing
-
-ffsend --help
-```
-
-#### Linux: Prebuilt binaries
-Check out the [latest release][github-latest-release] assets for Linux binaries.  
-Use the `ffsend-v*-linux-x64-static` binary, to minimize the chance for issues.
-If it isn't available yet, you may use an artifact from a
-[previous version][github-releases] instead, until it is available.
-
-Make sure you meet and install the [requirements](#requirements) before you
-continue.
-
-You must make the binary executable, and may want to move it into `/usr/bin` to
-make it easily executable:
-
-```bash
-# Rename binary to ffsend
-mv ./ffsend-* ./ffsend
-
-# Mark binary as executable
-chmod a+x ./ffsend
-
-# Move binary into path, to make it easily usable
-sudo mv ./ffsend /usr/local/bin/
-
-ffsend --help
-```
-
-### macOS
-Using the [`homebrew` package](#macos-homebrew-package) is recommended.  
-Alternatively you may install it via [MacPorts](#macos-macports), or manually using the
-[prebuilt binaries](#macos-prebuilt-binaries).
-
-#### macOS: homebrew package
-Make sure you've [`homebrew`][homebrew] installed, and run:
-
-```bash
-brew install ffsend
-ffsend --help
-```
-
-#### macOS: MacPorts
-_Note: ffsend in MacPorts is currently not automatically updated, and might be
-slightly outdated._
-
-Once you have [MacPorts](https://www.macports.org) installed, you can run:
-
-```bash
-sudo port selfupdate
-sudo port install ffsend
-```
-
-#### macOS: Nix package
-_Note: The Nix package is currently not automatically updated, and might be
-slightly outdated._
-
-```bash
-nix-channel --update
-nix-env --install ffsend
-
-ffsend --help
-```
-
-#### macOS: Prebuilt binaries
-Check out the [latest release][github-latest-release] assets for a macOS binary.
-If it isn't available yet, you may use an artifact from a
-[previous version][github-releases] instead, until it is available.
-
-Then, mark the downloaded binary as an executable.
-You then may want to move it into `/usr/local/bin/` to make the `ffsend` command
-globally available:
-
-```bash
-# Rename file to ffsend
-mv ./ffsend-* ./ffsend
-
-# Mark binary as executable
-chmod a+x ./ffsend
-
-# Move binary into path, to make it easily usable
-sudo mv ./ffsend /usr/local/bin/
-
-ffsend
-```
-
-### Windows
-Using the [`scoop` package](#windows-scoop-package) is recommended.  
-Alternatively you may install it manually using the
-[prebuilt binaries](#windows-prebuilt-binaries).
-
-If you're using the [Windows Subsystem for Linux][wsl], it's highly recommended
-to install the [prebuilt Linux binary](#prebuilt-binaries-for-linux) instead.
-
-Only 64-bit (`x86_64`) binaries are provided.
-For other architectures and configurations you may [compile from source](#build).
-
-A `chocolatey` package along with an `.msi` installer will be coming soon.
-
-#### Windows: scoop package
-Make sure you've [`scoop`][scoop-install] installed, and run:
-
-```bash
-scoop install ffsend
-ffsend --help
-```
-
-#### Windows: Prebuilt binaries
-Check out the [latest release][github-latest-release] assets for Windows binaries.
-Use the `ffsend-v*-windows-x64-static` binary, to minimize the chance for issues.
-If it isn't available yet, you may use an artifact from a
-[previous version][github-releases] instead, until it is available.
-
-You can use `ffsend` from the command line in the same directory:
-```cmd
-.\ffsend.exe --help
-```
-
-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
-```
-
-### FreeBSD
-
-[» `ffsend`][freshports-ffsend]
-
-_Note: The FreeBSD package is currently maintained by FreeBSD contributors,
-and might be slightly outdated._
-
-```sh
-# Precompiled binary.
-pkg install ffsend
-
-# Compiles and installs from source.
-cd /usr/ports/www/ffsend && make install
-```
-
-### Android
-`ffsend` can be used on Android through Termux, install it first:
-[» Termux][termux]
-
-_Note: The Android package is currently maintained by Termux contributors,
-and might be slightly outdated._
-
-```sh
-# Install package.
-pkg install ffsend
-
-ffsend help
-```
-
-### Other OS or architecture
-If your system runs Docker, you can use the [docker image](#docker-image).
-There are currently no other binaries or packages available.
-
-You can [build the project from source](#build) instead.
-
-#### Docker image
-A Docker image is available for using `ffsend` running in a container.
-Mount a directory to `/data`, so it's accessible for `ffsend` in the container,
-and use the command as you normally would.
-
-[» `timvisee/ffsend`][docker-hub-ffsend]
-
-```bash
-# Invoke without arguments
-docker run --rm -it -v $(pwd):/data timvisee/ffsend
-
-# Upload my-file.txt
-docker run --rm -it -v $(pwd):/data timvisee/ffsend upload my-file.txt
-
-# Download from specified link
-docker run --rm -it -v $(pwd):/data timvisee/ffsend download https://send.vis.ee/#sample-share-url
-
-# Show help
-docker run --rm -it -v $(pwd):/data timvisee/ffsend help
-
-# To update the used image
-docker pull timvisee/ffsend
-```
-
-On Linux or macOS you might define a alias in your shell configuration, to make
-it invocable as `ffsend`:
-
-```bash
-alias ffsend='docker run --rm -it -v "$(pwd):/data" timvisee/ffsend'
-```
-
-_Note: This implementation is limited to accessing the paths you make available
-through the specified mount._
+It is recommended to build and install `ffsend` yourself using these fairly
+easy steps [here](#build).
 
 ## Build
 To build and install `ffsend` yourself, you meet the following requirements
 before proceeding:
 
 ### Build requirements
-- Runtime [requirements](#requirements)
+- Regular [requirements](#requirements)
 - [`git`][git]
-- [`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`
-    - CentOS/Red Hat/openSUSE: `yum install gcc gcc-c++ make cmake openssl-devel`
-    - Arch: `pacman -S openssl base-devel`
-    - Gentoo: `emerge -a dev-util/pkgconfig dev-util/cmake dev-libs/openssl`
-    - Fedora: `dnf install gcc gcc-c++ make cmake openssl-devel`
-    - Or see instructions [here](https://github.com/sfackler/rust-openssl#linux)
-  - Windows:
-    - Optional with `crypto-openssl` feature: See instructions here [here](https://github.com/sfackler/rust-openssl#windows-msvc)
-  - macOS:
-    - Optional with `crypto-openssl` feature: `brew install cmake pkg-config openssl` or see instructions [here](https://github.com/sfackler/rust-openssl#osx)
-  - FreeBSD:
-    - `pkg install rust gmake pkgconf python36 libxcb xclip ca_root_nss xsel-conrad`
-    - It is a better idea to use & modify the existing `ffsend` port, which manages dependencies for you.
+- [`rust`][rust] `v1.26` or higher (install using [`rustup`][rustup])
+- [OpenSSL][openssl] or [LibreSSL][libressl] libraries and headers must be available
+	- Linux:
+		- Ubuntu/Debian: `apt install pkg-config libssl-dev`
+		- CentOS/Red Hat/openSUSE: `yum install openssl-devel`
+		- Arch: `pacman -S openssl`
+		- Fedora: `dnf install openssl-devel`
+		- Or see instructions [here](https://github.com/sfackler/rust-openssl#linux)
+	- macOS:
+		- Using `brew`: `brew install openssl`
+		- Or see instructions [here](https://github.com/sfackler/rust-openssl#osx)
+	- Windows:
+		- See instructions here [here](https://github.com/sfackler/rust-openssl#windows-msvc)
 
 ### Compile and install
 Then, walk through one of the following steps to compile and install `ffsend`:
 
 - Compile and install it directly from cargo:
 
-  ```bash
-  # Compile and install from cargo
-  cargo install ffsend -f
+	```bash
+	# Compile and install from cargo
+	cargo install ffsend -f
 
-  # Start using ffsend
-  ffsend --help
-  ```
+	# Start using ffsend
+	ffsend --help
+	```
 
 - Or clone the repository and install it with `cargo`:
 
-  ```bash
-  # Clone the project
-  git clone https://github.com/timvisee/ffsend.git
-  cd ffsend
+	```bash
+	# Clone the project
+	git clone https://github.com/timvisee/ffsend.git
+	cd ffsend
 
-  # Compile and install
-  cargo install --path . -f
+	# Compile and install
+	cargo install -f
 
-  # Start using ffsend
-  ffsend --help
+	# Start using ffsend
+	ffsend --help
 
-  # or run it directly from cargo
-  cargo run --release -- --help
-  ```
+	# or run it directly from cargo
+	cargo run --release -- --help 
+	```
 
 - Or clone the repository and invoke the binary directly (Linux/macOS):
 
-  ```bash
-  # Clone the project
-  git clone https://github.com/timvisee/ffsend.git
-  cd ffsend
+	```bash
+	# Clone the project
+	git clone https://github.com/timvisee/ffsend.git
+	cd ffsend
 
-  # Build the project (release version)
-  cargo build --release
+	# Build the project (release version)
+	cargo build --release
 
-  # Start using ffsend
-  ./target/release/ffsend --help
-  ```
+	# Start using ffsend
+	./target/release/ffsend --help
+	``` 
 
 ### Compile features / use flags
 Different use flags are available for `ffsend` to toggle whether to include
 various features.
 The following features are available, some of which are enabled by default:
 
-| Feature         | Enabled | Description                                                |
-| :-------------: | :-----: | :--------------------------------------------------------- |
-| `send2`         | Default | Support for Send v2 servers                                |
-| `send3`         | Default | Support for Send v3 servers                                |
-| `crypto-ring`   | Default | Use ring as cryptography backend                           |
-| `crypto-openssl`|         | Use OpenSSL as cryptography backend                        |
-| `clipboard`     | Default | Support for copying links to the clipboard                 |
-| `history`       | Default | Support for tracking files in history                      |
-| `archive`       | Default | Support for archiving and extracting uploads and downloads |
-| `qrcode`        | Default | Support for rendering a QR code for a share URL            |
-| `urlshorten`    | Default | Support for shortening share URLs                          |
-| `infer-command` | Default | Support for inferring subcommand based on binary name      |
-| `no-color`      |         | Compile without color support in error and help messages   |
+| Feature     | Enabled | Description                                                |
+| :---------: | :-----: | :--------------------------------------------------------- |
+| `clipboard` | Default | Support for copying links to the clipboard                 |
+| `history`   | Default | Support for tracking files in history                      |
+| `archive`   | Default | Support for archiving and extracting uploads and downloads |
+| `no-color`  |         | Compile without color support in error and help messages   |
 
 To enable features during building or installation, specify them with
-`--features <features...>` when using `cargo`.
-You may want to disable default features first using
+`--features <features, >` when using `cargo`.
+You may want to disable alisl default features first using
 `--no-default-features`.
 Here are some examples:
 
@@ -535,172 +242,46 @@ Here are some examples:
 cargo install --features no-color
 cargo build --release --features no-color
 
-# No default features, except required
-cargo install --no-default-features --features send3,crypto-ring
+# None of the features
+cargo install --no-default-features
 
-# With history and clipboard support
-cargo install --no-default--features --features send3,crypto-ring,history,clipboard
+# Only history and clipboard support
+cargo install --no-default--features --features history,clipboard
 ```
 
-For Windows systems it is recommended to provide the `no-color` flag, as color
-support in Windows terminals is flaky.
-
 ## Configuration and environment
 The following environment variables may be used to configure the following
 defaults. The CLI flag is shown along with it, to better describe the relation
 to command line arguments:
 
-| Variable                  | CLI flag                       | Description                                   |
-| :------------------------ | :----------------------------: | :-------------------------------------------- |
-| `FFSEND_HISTORY`          | `--history <FILE>`             | History file path                             |
-| `FFSEND_HOST`             | `--host <URL>`                 | Upload host                                   |
-| `FFSEND_TIMEOUT`          | `--timeout <SECONDS>`          | Request timeout (0 to disable)                |
-| `FFSEND_TRANSFER_TIMEOUT` | `--transfer-timeout <SECONDS>` | Transfer timeout (0 to disable)               |
-| `FFSEND_EXPIRY_TIME`      | `--expiry-time <SECONDS>`      | Default upload expiry time                    |
-| `FFSEND_DOWNLOAD_LIMIT`   | `--download-limit <DOWNLOADS>` | Default download limit                        |
-| `FFSEND_API`              | `--api <VERSION>`              | Server API version, `-` to lookup             |
-| `FFSEND_BASIC_AUTH`       | `--basic-auth <USER:PASSWORD>` | Basic HTTP authentication credentials to use. |
+| Variable         | CLI flag           | Description       |
+| :--------------- | :----------------: | :---------------- |
+| `FFSEND_HISTORY` | `--history <FILE>` | History file path |
+| `FFSEND_HOST`    | `--host <URL>`     | Upload host       |
 
 These environment variables may be used to toggle a flag, simply by making them
 available. The actual value of these variables is ignored, and variables may be
 empty.
 
-| Variable             | CLI flag        | Description                        |
-| :------------------- | :-------------: | :--------------------------------- |
-| `FFSEND_FORCE`       | `--force`       | Force operations                   |
-| `FFSEND_NO_INTERACT` | `--no-interact` | No interaction for prompts         |
-| `FFSEND_YES`         | `--yes`         | Assume yes for prompts             |
-| `FFSEND_INCOGNITO`   | `--incognito`   | Incognito mode, don't use history  |
-| `FFSEND_OPEN`        | `--open`        | Open share link of uploaded file   |
-| `FFSEND_ARCHIVE`     | `--archive`     | Archive files uploaded             |
-| `FFSEND_EXTRACT`     | `--extract`     | Extract files downloaded           |
-| `FFSEND_COPY`        | `--copy`        | Copy share link to clipboard       |
-| `FFSEND_COPY_CMD`    | `--copy-cmd`    | Copy download command to clipboard |
-| `FFSEND_QUIET`       | `--quiet`       | Log quiet information              |
-| `FFSEND_VERBOSE`     | `--verbose`     | Log verbose information            |
-
-Some environment variables may be set at compile time to tweak some defaults.
-
-| Variable     | Description                                                                |
-| :----------- | :------------------------------------------------------------------------- |
-| `XCLIP_PATH` | Set fixed `xclip` binary path when using `clipboard-bin` (Linux, &ast;BSD) |
-| `XSEL_PATH`  | Set fixed `xsel` binary path when using `clipboard-bin` (Linux, &ast;BSD)  |
+| Variable             | CLI flag        | Description                       |
+| :------------------- | :-------------: | :-------------------------------- |
+| `FFSEND_FORCE`       | `--force`       | Force operations                  |
+| `FFSEND_NO_INTERACT` | `--no-interact` | No interaction for prompts        |
+| `FFSEND_YES`         | `--yes`         | Assume yes for prompts            |
+| `FFSEND_INCOGNITO`   | `--incognito`   | Incognito mode, don't use history |
+| `FFSEND_OPEN`        | `--open`        | Open share link of uploaded file  |
+| `FFSEND_ARCHIVE`     | `--archive`     | Archive files uploaded            |
+| `FFSEND_EXTRACT`     | `--extract`     | Extract files downloaded          |
+| `FFSEND_COPY`        | `--copy`        | Copy share link to clipboard      |
+| `FFSEND_VERBOSE`     | `--verbose`     | Log verbose information           |
 
 At this time, no configuration or _dotfile_ file support is available.
 This will be something added in a later release.
 
-### Binary for each subcommand: `ffput`, `ffget`
-`ffsend` supports having a separate binaries for single subcommands, such as
-having `ffput` and `ffget` just for to upload and download using `ffsend`.
-This allows simple and direct commands like:
-```bash
-ffput my-file.txt
-ffget https://send.vis.ee/#sample-share-url
-```
-
-This works for a predefined list of binary names:
-
-- `ffput` → `ffsend upload ...`
-- `ffget` → `ffsend download ...`
-- `ffdel` → `ffsend delete ...`
-- _This list is defined in [`src/config.rs`](./src/config.rs) as `INFER_COMMANDS`_
-
-You can use the following methods to set up these single-command binaries:
-
-- Create a properly named symbolic link (recommended)
-- Create a properly named hard link
-- Clone the `ffsend` binary, and rename it
-
-On Linux and macOS you can use the following command to set up symbolic links in
-the current directory:
-
-```bash
-ln -s $(which ffsend) ./ffput
-ln -s $(which ffsend) ./ffget
-```
-
-Support for this feature is only available when `ffsend` is compiled with the
-[`infer-command`](#compile-features--use-flags) feature flag.
-This is usually enabled by default.
-To verify support is available with an existing installation, make sure the
-feature is listed when invoking `ffsend debug`.
-
-Note that the `snap` package does currently not support this due to how this
-package format works.
-
-### Scriptability
-`ffsend` is optimized for use in automated scripts. It provides some specialized
-arguments to control `ffsend` without user interaction.
-
-- `--no-interact` (`-I`): do not allow user interaction. For prompts not having
-    a default value, the application will quit with an error, unless `--yes`
-    or `--force` is provided.
-    This should **always** be given when using automated scripting.  
-    Example: when uploading a directory, providing this flag will stop the
-    archive question prompt form popping up, and will archive the directory as
-    default option.
-- `--yes` (`-y`): assume the yes option for yes/no prompt by default.  
-    Example: when downloading a file that already exists, providing this flag
-    will assume yes when asking to overwrite a file.
-- `--force` (`-f`): force to continue with the action, skips any warnings that
-    would otherwise quit the application.  
-    Example: when uploading a file that is too big, providing this flag will
-    ignore the file size warning and forcefully continues.
-- `--quiet` (`-q`): be quiet, print as little information as possible.  
-    Example: when uploading a file, providing this flag will only output the
-    final share URL.
-
-Generally speaking, use the following rules when automating:
-- Always provide `--no-interact` (`-I`).
-- Provide any combination of `--yes` (`-y`) and `--force` (`-f`) for actions you
-  want to complete no matter what.
-- When passing share URLs along, provide the `--quiet` (`-q`) flag, when
-  uploading for example.
-
-These flags can also automatically be set by defining environment variables as
-specified here:  
-[» Configuration and environment](#configuration-and-environment)
-
-Here are some examples commands in `bash`:
-
-```bash
-# Stop on error
-set -e
-
-# Upload a file
-# -I: no interaction
-# -y: assume yes
-# -q: quiet output, just return the share link
-URL=$(ffsend -Iy upload -q my-file.txt)
-
-# Render file information
-# -I: no interaction
-# -f: force, just show the info
-ffsend -If info $URL
-
-# Set a password for the uploaded file
-ffsend -I password $URL --password="secret"
-
-# Use the following flags automatically from now on
-# -I: no interaction
-# -f: force
-# -y: yes
-export FFSEND_NO_INTERACT=1 FFSEND_FORCE=1 FFSEND_YES=1
-
-# Download the uploaded file, overwriting the local variant due to variables
-ffsend download $URL --password="secret"
-```
-
-For more information on these arguments, invoke `ffsend help` and check out:
-[» Configuration and environment](#configuration-and-environment)
-
-For other questions regarding automation or feature requests, be sure to
-[open](https://github.com/timvisee/ffsend/issues/) an issue.
-
 ## Security
 In short; the `ffsend` tool and the [Send][send] service can be considered
 secure, and may be used to share sensitive files. Note though that the
-created share link for an upload will allow anyone to download the file.
+created share link for an upload will allow anyone to download the file. 
 Make sure you don't share this link with unauthorized people.
 
 For more detailed information on encryption, please read the rest of the
@@ -714,7 +295,7 @@ somehow got decrypted without proper authorization._
 `ffsend` uses client side encryption, to ensure your files are securely
 encrypted before they are uploaded to the remote host. This makes it impossible
 for third parties to decrypt your file without having the secret (encryption
-key). The file and its metadata are encrypted using `128-bit AES-GCM`, and a
+key). The file and it's metadata are encrypted using `128-bit AES-GCM`, and a
 `HMAC SHA-256` signing key is used for request authentication.
 This is consistent with the encryption documentation provided by the
 [Send][send] service, `ffsend` is a tool for.
@@ -744,13 +325,10 @@ documentation [here][send-encryption].
 ```
 $ ffsend help
 
-ffsend 0.2.72
-Tim Visee <3a4fb3964f@sinenomine.email>
+ffsend 0.0.7
+Tim Visee <https://timvisee.com/>
 Easily and securely share files from the command line.
-A fully featured Send client.
-
-The default public Send host is provided by Tim Visee, @timvisee.
-Please consider to donate and help keep it running: https://vis.ee/donate
+A fully featured Firefox Send client.
 
 USAGE:
     ffsend [FLAGS] [OPTIONS] [SUBCOMMAND]
@@ -760,76 +338,51 @@ FLAGS:
     -h, --help           Prints help information
     -i, --incognito      Don't update local history for actions
     -I, --no-interact    Not interactive, do not prompt
-    -q, --quiet          Produce output suitable for logging and automation
     -V, --version        Prints version information
     -v, --verbose        Enable verbose information and logging
     -y, --yes            Assume yes for prompts
 
 OPTIONS:
-    -A, --api <VERSION>                 Server API version to use, '-' to lookup [env: FFSEND_API]
-        --basic-auth <USER:PASSWORD>    Protected proxy HTTP basic authentication credentials (not FxA) [env: FFSEND_BASIC_AUTH]
-    -H, --history <FILE>                Use the specified history file [env: FFSEND_HISTORY]
-    -t, --timeout <SECONDS>             Request timeout (0 to disable) [env: FFSEND_TIMEOUT]
-    -T, --transfer-timeout <SECONDS>    Transfer timeout (0 to disable) [env: FFSEND_TRANSFER_TIMEOUT]
+    -H, --history <FILE>    Use the specified history file [env: FFSEND_HISTORY]
 
 SUBCOMMANDS:
     upload        Upload files [aliases: u, up]
     download      Download files [aliases: d, down]
     debug         View debug information [aliases: dbg]
-    delete        Delete a shared file [aliases: del, rm]
+    delete        Delete a shared file [aliases: del]
     exists        Check whether a remote file exists [aliases: e]
-    generate      Generate assets [aliases: gen]
     help          Prints this message or the help of the given subcommand(s)
     history       View file history [aliases: h]
     info          Fetch info about a shared file [aliases: i]
     parameters    Change parameters of a shared file [aliases: params]
     password      Change the password of a shared file [aliases: pass, p]
-    version       Determine the Send server version [aliases: v]
 
-This application is not affiliated with Firefox or Mozilla.
+The public Send service that is used as default host is provided by Mozilla.
+This application is not affiliated with Mozilla, Firefox or Firefox Send.
 ```
 
 ## Special thanks
-- to all `ffsend` source/package contributors
-- to [Mozilla][mozilla] for building the amazing [Firefox Send][mozilla-send] service ([fork][timvisee-send])
+- to [Mozilla][mozilla] for building and hosting the amazing
+  [Firefox Send][send] service
 - to everyone involved with [asciinema][asciinema] and [svg-term][svg-term] for
   providing tools to make great visual demos
 - to everyone involved in all crate dependencies used
 
 ## License
 This project is released under the GNU GPL-3.0 license.
-Check out the [LICENSE](LICENSE) file for more information.
+Check out the [LICENSE](LICENSE) file for more information. 
 
 [usage-demo-asciinema]: https://asciinema.org/a/182225
 [usage-demo-svg]: https://cdn.rawgit.com/timvisee/ffsend/6e8ef55b/res/demo.svg
 [firefox]: https://firefox.com/
 [git]: https://git-scm.com/
 [libressl]: https://libressl.org/
-[mozilla]: https://mozilla.org/
+[mozilla]: https://mozzilla.org/
 [openssl]: https://www.openssl.org/
-[openssl-windows-installer]: https://u.visee.me/dl/openssl/Win64OpenSSL_Light-1_1_0j.exe
-[termux]: https://termux.com/
 [rust]: https://rust-lang.org/
 [rustup]: https://rustup.rs/
-[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
+[send]: https://send.firefox.com/
+[send-encryption]: https://github.com/mozilla/send/blob/master/docs/encryption.md
 [asciinema]: https://asciinema.org/
 [svg-term]: https://github.com/marionebl/svg-term-cli
-[github-releases]: https://github.com/timvisee/ffsend/releases
 [github-latest-release]: https://github.com/timvisee/ffsend/releases/latest
-[nix-ffsend]: https://nixos.org/nixos/packages.html?attr=ffsend&channel=nixos-unstable&query=ffsend
-[fedora-ffsend]: https://src.fedoraproject.org/rpms/rust-ffsend
-[aur-ffsend]: https://aur.archlinux.org/packages/ffsend/
-[aur-ffsend-bin]: https://aur.archlinux.org/packages/ffsend-bin/
-[aur-ffsend-git]: https://aur.archlinux.org/packages/ffsend-git/
-[alpine-ffsend]: https://pkgs.alpinelinux.org/packages?name=ffsend&branch=edge
-[snapcraft-ffsend]: https://snapcraft.io/ffsend
-[homebrew]: https://brew.sh/
-[wsl]: https://docs.microsoft.com/en-us/windows/wsl/install-win10
-[docker-hub-ffsend]: https://hub.docker.com/r/timvisee/ffsend
-[scoop-install]: https://scoop.sh/#installs-in-seconds
-[freshports-ffsend]: https://www.freshports.org/www/ffsend
-[timvisee]: https://timvisee.com/
-[donate]: https://timvisee.com/donate

ROADMAP.md

@@ -0,0 +1,60 @@
+# Alpha release 0.0.1 (private feedback)
+The first release used for gathering feedback on the application by selected
+people.
+
+Features:
+- Do not show default values for `--host`, see `ffsend help upload`
+- History clear command
+- Ask to remove a file when downloading failed
+- Polish command outputs, make it consistent (format, color)
+- Automated releases through CI
+- Release binaries on GitHub
+- Ubuntu PPA package
+- Gentoo portage package
+- Arch AUR package
+- Windows, macOS and Redox support
+- Implement verbose logging with `-v`
+- Make use of stdout and stderr consistent
+- Allow empty owner token for info command
+- Check and validate all errors, are some too verbose?
+
+# Beta release 0.1 (public)
+The first public release.
+
+Features:
+- Do not write archives to the disk (temporarily), stream their contents
+- Implement error handling everywhere properly
+- Extract utility module
+- Embed/wrap request errors with failure
+- Box errors
+- Allow piping input/output files
+- Allow hiding the progress bar, and/or showing simple progress (with `-q`)
+- Implement a quiet `-q` mode
+- Update all dependencies
+- Check all TODOs, solve them when possible
+- Allow multi file uploads (select more than one file or directory)
+
+# Future releases
+- Color usage flag
+- A status command, to check the server status using `/__version__` and
+  heartbeat endpoints
+- Host configuration file for host tags, to easily upload to other hosts
+
+# Other ideas
+- Check if extracting an archive overwrites files 
+- Flag to disable logging to stderr
+- Rework encrypted reader/writer
+- API actions contain duplicate code, create centralized functions
+- Only allow file extension renaming on upload with `-f` flag
+- Quick upload/download without `upload` or `download` subcommands?
+- Flag to explicitly delete file after download
+- Allow file deletion by consuming all download slots
+- Download to a temporary location first
+- Document all code components
+- Dotfile for default properties
+- Generate man pages
+- Rename host to server?
+- Ask to add MIME extension to downloaded files without one on Windows
+- Fetch max file size from `server/jsconfig.js`
+- Define a redirect policy (allow setting max redirects)
+- Support servers that are hosted on a sub path (URL builder resets path)

SECURITY.md

@@ -1,18 +0,0 @@
-# Security Policy
-
-## Supported Versions
-
-| Version | Supported          |
-| ------- | ------------------ |
-| 0.2.x   | :white_check_mark: |
-
-## Reporting a Vulnerability
-
-To report a vulnerability in this project, or in one if it's dependency;
-please [open](https://gitlab.com/timvisee/ffsend/issues/new) a new issue
-on GitLab (or on [GitHub](https://github.com/timvisee/ffsend/issues/new)) describing the situation.
-
-For confidential issues, you may send an email to the main developer (@timvisee) at: `3a4fb3964f@sinenomine.email`  
-Or see other methods of contacting over on: [timvisee.com/contact](https://timvisee.com/contact)
-
-To contribute code for fixing a vulnerability, please refer to the [contribution](./CONTRIBUTING.md) document.

appveyor.yml

@@ -1,79 +0,0 @@
-# AppVeyor CI configuration for building Windows binaries for ffsend.
-# These Windows binaries are published on GitHub as release files.
-#
-# The main CI runs on GitLab CI at: https://gitlab.com/timvisee/ffsend/pipelines
-
-# Only build version tags
-skip_non_tags: true
-branches:
-  only:
-    - /v\d*\.\d*\.\d*/
-
-# Build for the x86_64 Windows target
-platform: x64
-environment:
-  RUSTUP_USE_HYPER: 1
-  CARGO_HTTP_CHECK_REVOKE: false
-  GITHUB_TOKEN:
-    secure: jqZ4q5oOthKX/pBL1tRsBJsfGPIee3q+N/UBSCZNjCrlFUNfQSfibBPzzICYg1he
-  CHOCOLATEY_TOKEN:
-    secure: k5Q57xoXa6qSFScSpRaww2puW0yjYoH19uIq3qS1emOG+lNs9TYCnWYhUzQ2gzfc
-
-  matrix:
-    - TARGET: x86_64-pc-windows-msvc
-      BITS: 64
-
-# Extract release binary artifacts
-artifacts:
-- path: .\ffsend*.exe
-- path: .\ffsend.*.nupkg
-
-# Install dependencies: Rust
-install:
-  # Install Rust
-  - appveyor-retry appveyor DownloadFile https://win.rustup.rs/ -FileName rustup-init.exe
-  - rustup-init.exe -y --default-host x86_64-pc-windows-msvc --default-toolchain stable
-  - set PATH=%PATH%;C:\Users\appveyor\.cargo\bin
-  - rustc -V
-  - cargo -V
-  - git submodule update --init
-
-# Build dynamic and static Windows binaries, release on GitHub
-build_script:
-  # Build dynamic release binary
-  - cargo build --release --features no-color --verbose
-  - copy .\target\release\ffsend.exe .\ffsend-%TARGET%.exe
-
-  # Build static release binary
-  - set RUSTFLAGS=-Ctarget-feature=+crt-static
-  - cargo build --release --features no-color --verbose
-  - copy .\target\release\ffsend.exe .\ffsend-%TARGET%-static.exe
-
-  # Install github-release
-  - appveyor DownloadFile https://github.com/tfausak/github-release/releases/download/1.2.4/github-release-windows.zip -FileName github-release.zip
-  - 7z e github-release.zip
-
-  # Collect binary, set package version and build chocolatey package
-  - copy .\ffsend-%TARGET%-static.exe .\pkg\choco\ffsend\tools\ffsend.exe
-  - cd .\pkg\choco\ffsend\
-  - ps: echo $env:APPVEYOR_REPO_TAG_NAME
-  - ps: ((Get-Content -path .\ffsend.nuspec -Raw) -replace "0.0.0",$env:APPVEYOR_REPO_TAG_NAME.Substring(1)) | Set-Content -Path .\ffsend.nuspec
-  - choco pack
-  - copy ffsend.*.nupkg ..\..\..\
-  - cd ..\..\..\
-
-  # Create the release, upload the binaries
-  # TODO: fix the line below, which is causing CI to error
-  # - ps: Invoke-Expression -Command '$ErrorActionPreference = "SilentlyContinue"; .\github-release.exe release --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --title "ffsend $env:APPVEYOR_REPO_TAG_NAME"; exit 0'
-  - ps: .\github-release.exe upload --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --file .\ffsend-$env:TARGET.exe --name ffsend-$env:APPVEYOR_REPO_TAG_NAME-windows-x64.exe
-  - ps: .\github-release.exe upload --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --file .\ffsend-$env:TARGET-static.exe --name ffsend-$env:APPVEYOR_REPO_TAG_NAME-windows-x64-static.exe
-  - ps: .\github-release.exe upload --token $env:GITHUB_TOKEN --owner timvisee --repo ffsend --tag $env:APPVEYOR_REPO_TAG_NAME --file (Get-Item .\ffsend.*.nupkg).FullName --name ffsend-$env:APPVEYOR_REPO_TAG_NAME.nupkg
-
-  # Publish the chocolatey package
-  # TODO: re-enable when chocolatey is properly accepting packages again
-  # - cd .\pkg\choco\ffsend\
-  # - choco push --api-key %CHOCOLATEY_TOKEN%
-  # - cd ..\..\..\
-
-# We don't test anything here
-test: false

build.rs

@@ -1,37 +0,0 @@
-fn main() {
-    #[cfg(all(
-        feature = "clipboard",
-        any(
-            target_os = "linux",
-            target_os = "freebsd",
-            target_os = "dragonfly",
-            target_os = "openbsd",
-            target_os = "netbsd",
-        )
-    ))]
-    {
-        // Select clipboard binary method
-        #[cfg(not(feature = "clipboard-crate"))]
-        println!("cargo:rustc-cfg=feature=\"clipboard-bin\"");
-
-        // xclip and xsel paths are inserted at compile time
-        println!("cargo:rerun-if-env-changed=XCLIP_PATH");
-        println!("cargo:rerun-if-env-changed=XSEL_PATH");
-    }
-
-    #[cfg(all(
-        feature = "clipboard",
-        not(any(
-            target_os = "linux",
-            target_os = "freebsd",
-            target_os = "dragonfly",
-            target_os = "openbsd",
-            target_os = "netbsd",
-        ))
-    ))]
-    {
-        // Select clipboard crate method
-        #[cfg(not(feature = "clipboard-bin"))]
-        println!("cargo:rustc-cfg=feature=\"clipboard-crate\"");
-    }
-}

contrib/completions/_ffsend.ps1

@@ -1,515 +0,0 @@
-
-using namespace System.Management.Automation
-using namespace System.Management.Automation.Language
-
-Register-ArgumentCompleter -Native -CommandName 'ffsend' -ScriptBlock {
-    param($wordToComplete, $commandAst, $cursorPosition)
-
-    $commandElements = $commandAst.CommandElements
-    $command = @(
-        'ffsend'
-        for ($i = 1; $i -lt $commandElements.Count; $i++) {
-            $element = $commandElements[$i]
-            if ($element -isnot [StringConstantExpressionAst] -or
-                $element.StringConstantType -ne [StringConstantType]::BareWord -or
-                $element.Value.StartsWith('-')) {
-                break
-        }
-        $element.Value
-    }) -join ';'
-
-    $completions = @(switch ($command) {
-        'ffsend' {
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('debug', 'debug', [CompletionResultType]::ParameterValue, 'View debug information')
-            [CompletionResult]::new('delete', 'delete', [CompletionResultType]::ParameterValue, 'Delete a shared file')
-            [CompletionResult]::new('download', 'download', [CompletionResultType]::ParameterValue, 'Download files')
-            [CompletionResult]::new('exists', 'exists', [CompletionResultType]::ParameterValue, 'Check whether a remote file exists')
-            [CompletionResult]::new('generate', 'generate', [CompletionResultType]::ParameterValue, 'Generate assets')
-            [CompletionResult]::new('info', 'info', [CompletionResultType]::ParameterValue, 'Fetch info about a shared file')
-            [CompletionResult]::new('parameters', 'parameters', [CompletionResultType]::ParameterValue, 'Change parameters of a shared file')
-            [CompletionResult]::new('password', 'password', [CompletionResultType]::ParameterValue, 'Change the password of a shared file')
-            [CompletionResult]::new('upload', 'upload', [CompletionResultType]::ParameterValue, 'Upload files')
-            [CompletionResult]::new('version', 'version', [CompletionResultType]::ParameterValue, 'Determine the Send server version')
-            [CompletionResult]::new('history', 'history', [CompletionResultType]::ParameterValue, 'View file history')
-            [CompletionResult]::new('help', 'help', [CompletionResultType]::ParameterValue, 'Prints this message or the help of the given subcommand(s)')
-            break
-        }
-        'ffsend;debug' {
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'The remote host to upload to')
-            [CompletionResult]::new('--host', 'host', [CompletionResultType]::ParameterName, 'The remote host to upload to')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;delete' {
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('--owner', 'owner', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;download' {
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Unlock a password protected file')
-            [CompletionResult]::new('--password', 'password', [CompletionResultType]::ParameterName, 'Unlock a password protected file')
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Output file or directory')
-            [CompletionResult]::new('--output', 'output', [CompletionResultType]::ParameterName, 'Output file or directory')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-e', 'e', [CompletionResultType]::ParameterName, 'Extract an archived file')
-            [CompletionResult]::new('--extract', 'extract', [CompletionResultType]::ParameterName, 'Extract an archived file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;exists' {
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;generate' {
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('completions', 'completions', [CompletionResultType]::ParameterValue, 'Shell completions')
-            [CompletionResult]::new('help', 'help', [CompletionResultType]::ParameterValue, 'Prints this message or the help of the given subcommand(s)')
-            break
-        }
-        'ffsend;generate;completions' {
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Shell completion files output directory')
-            [CompletionResult]::new('--output', 'output', [CompletionResultType]::ParameterName, 'Shell completion files output directory')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;generate;help' {
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;info' {
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('--owner', 'owner', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Unlock a password protected file')
-            [CompletionResult]::new('--password', 'password', [CompletionResultType]::ParameterName, 'Unlock a password protected file')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;parameters' {
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('--owner', 'owner', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'The file download limit')
-            [CompletionResult]::new('--download-limit', 'download-limit', [CompletionResultType]::ParameterName, 'The file download limit')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;password' {
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Specify a password, do not prompt')
-            [CompletionResult]::new('--password', 'password', [CompletionResultType]::ParameterName, 'Specify a password, do not prompt')
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('--owner', 'owner', [CompletionResultType]::ParameterName, 'Specify the file owner token')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-P', 'P', [CompletionResultType]::ParameterName, 'Protect the file with a generated passphrase')
-            [CompletionResult]::new('--gen-passphrase', 'gen-passphrase', [CompletionResultType]::ParameterName, 'Protect the file with a generated passphrase')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;upload' {
-            [CompletionResult]::new('-p', 'p', [CompletionResultType]::ParameterName, 'Protect the file with a password')
-            [CompletionResult]::new('--password', 'password', [CompletionResultType]::ParameterName, 'Protect the file with a password')
-            [CompletionResult]::new('-d', 'd', [CompletionResultType]::ParameterName, 'The file download limit')
-            [CompletionResult]::new('--download-limit', 'download-limit', [CompletionResultType]::ParameterName, 'The file download limit')
-            [CompletionResult]::new('-e', 'e', [CompletionResultType]::ParameterName, 'The file expiry time')
-            [CompletionResult]::new('--expiry-time', 'expiry-time', [CompletionResultType]::ParameterName, 'The file expiry time')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'The remote host to upload to')
-            [CompletionResult]::new('--host', 'host', [CompletionResultType]::ParameterName, 'The remote host to upload to')
-            [CompletionResult]::new('-n', 'n', [CompletionResultType]::ParameterName, 'Rename the file being uploaded')
-            [CompletionResult]::new('--name', 'name', [CompletionResultType]::ParameterName, 'Rename the file being uploaded')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-P', 'P', [CompletionResultType]::ParameterName, 'Protect the file with a generated passphrase')
-            [CompletionResult]::new('--gen-passphrase', 'gen-passphrase', [CompletionResultType]::ParameterName, 'Protect the file with a generated passphrase')
-            [CompletionResult]::new('-o', 'o', [CompletionResultType]::ParameterName, 'Open the share link in your browser')
-            [CompletionResult]::new('--open', 'open', [CompletionResultType]::ParameterName, 'Open the share link in your browser')
-            [CompletionResult]::new('-D', 'D', [CompletionResultType]::ParameterName, 'Delete local file after upload')
-            [CompletionResult]::new('--delete', 'delete', [CompletionResultType]::ParameterName, 'Delete local file after upload')
-            [CompletionResult]::new('-a', 'a', [CompletionResultType]::ParameterName, 'Archive the upload in a single file')
-            [CompletionResult]::new('--archive', 'archive', [CompletionResultType]::ParameterName, 'Archive the upload in a single file')
-            [CompletionResult]::new('-c', 'c', [CompletionResultType]::ParameterName, 'Copy the share link to your clipboard')
-            [CompletionResult]::new('--copy', 'copy', [CompletionResultType]::ParameterName, 'Copy the share link to your clipboard')
-            [CompletionResult]::new('-C', 'C', [CompletionResultType]::ParameterName, 'Copy the ffsend download command to your clipboard')
-            [CompletionResult]::new('--copy-cmd', 'copy-cmd', [CompletionResultType]::ParameterName, 'Copy the ffsend download command to your clipboard')
-            [CompletionResult]::new('-S', 'S', [CompletionResultType]::ParameterName, 'Shorten share URLs with a public service')
-            [CompletionResult]::new('--shorten', 'shorten', [CompletionResultType]::ParameterName, 'Shorten share URLs with a public service')
-            [CompletionResult]::new('-Q', 'Q', [CompletionResultType]::ParameterName, 'Print a QR code for the share URL')
-            [CompletionResult]::new('--qrcode', 'qrcode', [CompletionResultType]::ParameterName, 'Print a QR code for the share URL')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;version' {
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'The remote host to upload to')
-            [CompletionResult]::new('--host', 'host', [CompletionResultType]::ParameterName, 'The remote host to upload to')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;history' {
-            [CompletionResult]::new('-R', 'R', [CompletionResultType]::ParameterName, 'Remove history entry')
-            [CompletionResult]::new('--rm', 'rm', [CompletionResultType]::ParameterName, 'Remove history entry')
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-C', 'C', [CompletionResultType]::ParameterName, 'Clear all history')
-            [CompletionResult]::new('--clear', 'clear', [CompletionResultType]::ParameterName, 'Clear all history')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-        'ffsend;help' {
-            [CompletionResult]::new('-t', 't', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('--timeout', 'timeout', [CompletionResultType]::ParameterName, 'Request timeout (0 to disable)')
-            [CompletionResult]::new('-T', 'T', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('--transfer-timeout', 'transfer-timeout', [CompletionResultType]::ParameterName, 'Transfer timeout (0 to disable)')
-            [CompletionResult]::new('-A', 'A', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--api', 'api', [CompletionResultType]::ParameterName, 'Server API version to use, ''-'' to lookup')
-            [CompletionResult]::new('--basic-auth', 'basic-auth', [CompletionResultType]::ParameterName, 'Protected proxy HTTP basic authentication credentials (not FxA)')
-            [CompletionResult]::new('-H', 'H', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('--history', 'history', [CompletionResultType]::ParameterName, 'Use the specified history file')
-            [CompletionResult]::new('-h', 'h', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('--help', 'help', [CompletionResultType]::ParameterName, 'Prints help information')
-            [CompletionResult]::new('-V', 'V', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('--version', 'version', [CompletionResultType]::ParameterName, 'Prints version information')
-            [CompletionResult]::new('-f', 'f', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('--force', 'force', [CompletionResultType]::ParameterName, 'Force the action, ignore warnings')
-            [CompletionResult]::new('-I', 'I', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('--no-interact', 'no-interact', [CompletionResultType]::ParameterName, 'Not interactive, do not prompt')
-            [CompletionResult]::new('-y', 'y', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('--yes', 'yes', [CompletionResultType]::ParameterName, 'Assume yes for prompts')
-            [CompletionResult]::new('-q', 'q', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('--quiet', 'quiet', [CompletionResultType]::ParameterName, 'Produce output suitable for logging and automation')
-            [CompletionResult]::new('-v', 'v', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('--verbose', 'verbose', [CompletionResultType]::ParameterName, 'Enable verbose information and logging')
-            [CompletionResult]::new('-i', 'i', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            [CompletionResult]::new('--incognito', 'incognito', [CompletionResultType]::ParameterName, 'Don''t update local history for actions')
-            break
-        }
-    })
-
-    $completions.Where{ $_.CompletionText -like "$wordToComplete*" } |
-        Sort-Object -Property ListItemText
-}

contrib/completions/ffsend.elv

@@ -1,493 +0,0 @@
-
-edit:completion:arg-completer[ffsend] = [@words]{
-    fn spaces [n]{
-        repeat $n ' ' | joins ''
-    }
-    fn cand [text desc]{
-        edit:complex-candidate $text &display-suffix=' '(spaces (- 14 (wcswidth $text)))$desc
-    }
-    command = 'ffsend'
-    for word $words[1:-1] {
-        if (has-prefix $word '-') {
-            break
-        }
-        command = $command';'$word
-    }
-    completions = [
-        &'ffsend'= {
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand debug 'View debug information'
-            cand delete 'Delete a shared file'
-            cand download 'Download files'
-            cand exists 'Check whether a remote file exists'
-            cand generate 'Generate assets'
-            cand info 'Fetch info about a shared file'
-            cand parameters 'Change parameters of a shared file'
-            cand password 'Change the password of a shared file'
-            cand upload 'Upload files'
-            cand version 'Determine the Send server version'
-            cand history 'View file history'
-            cand help 'Prints this message or the help of the given subcommand(s)'
-        }
-        &'ffsend;debug'= {
-            cand -h 'The remote host to upload to'
-            cand --host 'The remote host to upload to'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;delete'= {
-            cand -o 'Specify the file owner token'
-            cand --owner 'Specify the file owner token'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;download'= {
-            cand -p 'Unlock a password protected file'
-            cand --password 'Unlock a password protected file'
-            cand -o 'Output file or directory'
-            cand --output 'Output file or directory'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -e 'Extract an archived file'
-            cand --extract 'Extract an archived file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;exists'= {
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;generate'= {
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-            cand completions 'Shell completions'
-            cand help 'Prints this message or the help of the given subcommand(s)'
-        }
-        &'ffsend;generate;completions'= {
-            cand -o 'Shell completion files output directory'
-            cand --output 'Shell completion files output directory'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;generate;help'= {
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;info'= {
-            cand -o 'Specify the file owner token'
-            cand --owner 'Specify the file owner token'
-            cand -p 'Unlock a password protected file'
-            cand --password 'Unlock a password protected file'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;parameters'= {
-            cand -o 'Specify the file owner token'
-            cand --owner 'Specify the file owner token'
-            cand -d 'The file download limit'
-            cand --download-limit 'The file download limit'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;password'= {
-            cand -p 'Specify a password, do not prompt'
-            cand --password 'Specify a password, do not prompt'
-            cand -o 'Specify the file owner token'
-            cand --owner 'Specify the file owner token'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -P 'Protect the file with a generated passphrase'
-            cand --gen-passphrase 'Protect the file with a generated passphrase'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;upload'= {
-            cand -p 'Protect the file with a password'
-            cand --password 'Protect the file with a password'
-            cand -d 'The file download limit'
-            cand --download-limit 'The file download limit'
-            cand -e 'The file expiry time'
-            cand --expiry-time 'The file expiry time'
-            cand -h 'The remote host to upload to'
-            cand --host 'The remote host to upload to'
-            cand -n 'Rename the file being uploaded'
-            cand --name 'Rename the file being uploaded'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -P 'Protect the file with a generated passphrase'
-            cand --gen-passphrase 'Protect the file with a generated passphrase'
-            cand -o 'Open the share link in your browser'
-            cand --open 'Open the share link in your browser'
-            cand -D 'Delete local file after upload'
-            cand --delete 'Delete local file after upload'
-            cand -a 'Archive the upload in a single file'
-            cand --archive 'Archive the upload in a single file'
-            cand -c 'Copy the share link to your clipboard'
-            cand --copy 'Copy the share link to your clipboard'
-            cand -C 'Copy the ffsend download command to your clipboard'
-            cand --copy-cmd 'Copy the ffsend download command to your clipboard'
-            cand -S 'Shorten share URLs with a public service'
-            cand --shorten 'Shorten share URLs with a public service'
-            cand -Q 'Print a QR code for the share URL'
-            cand --qrcode 'Print a QR code for the share URL'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;version'= {
-            cand -h 'The remote host to upload to'
-            cand --host 'The remote host to upload to'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;history'= {
-            cand -R 'Remove history entry'
-            cand --rm 'Remove history entry'
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -C 'Clear all history'
-            cand --clear 'Clear all history'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-        &'ffsend;help'= {
-            cand -t 'Request timeout (0 to disable)'
-            cand --timeout 'Request timeout (0 to disable)'
-            cand -T 'Transfer timeout (0 to disable)'
-            cand --transfer-timeout 'Transfer timeout (0 to disable)'
-            cand -A 'Server API version to use, ''-'' to lookup'
-            cand --api 'Server API version to use, ''-'' to lookup'
-            cand --basic-auth 'Protected proxy HTTP basic authentication credentials (not FxA)'
-            cand -H 'Use the specified history file'
-            cand --history 'Use the specified history file'
-            cand -h 'Prints help information'
-            cand --help 'Prints help information'
-            cand -V 'Prints version information'
-            cand --version 'Prints version information'
-            cand -f 'Force the action, ignore warnings'
-            cand --force 'Force the action, ignore warnings'
-            cand -I 'Not interactive, do not prompt'
-            cand --no-interact 'Not interactive, do not prompt'
-            cand -y 'Assume yes for prompts'
-            cand --yes 'Assume yes for prompts'
-            cand -q 'Produce output suitable for logging and automation'
-            cand --quiet 'Produce output suitable for logging and automation'
-            cand -v 'Enable verbose information and logging'
-            cand --verbose 'Enable verbose information and logging'
-            cand -i 'Don''t update local history for actions'
-            cand --incognito 'Don''t update local history for actions'
-        }
-    ]
-    $completions[$command]
-}

contrib/completions/ffsend.fish

@@ -1,238 +0,0 @@
-complete -c ffsend -n "__fish_use_subcommand" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_use_subcommand" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_use_subcommand" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_use_subcommand" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_use_subcommand" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_use_subcommand" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_use_subcommand" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_use_subcommand" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_use_subcommand" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_use_subcommand" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_use_subcommand" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_use_subcommand" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_use_subcommand" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "debug" -d 'View debug information'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "delete" -d 'Delete a shared file'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "download" -d 'Download files'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "exists" -d 'Check whether a remote file exists'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "generate" -d 'Generate assets'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "info" -d 'Fetch info about a shared file'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "parameters" -d 'Change parameters of a shared file'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "password" -d 'Change the password of a shared file'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "upload" -d 'Upload files'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "version" -d 'Determine the Send server version'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "history" -d 'View file history'
-complete -c ffsend -n "__fish_use_subcommand" -f -a "help" -d 'Prints this message or the help of the given subcommand(s)'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s h -l host -d 'The remote host to upload to'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from debug" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s o -l owner -d 'Specify the file owner token'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from delete" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s p -l password -d 'Unlock a password protected file'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s o -l output -d 'Output file or directory'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s e -l extract -d 'Extract an archived file'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from download" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from exists" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -f -a "completions" -d 'Shell completions'
-complete -c ffsend -n "__fish_seen_subcommand_from generate" -f -a "help" -d 'Prints this message or the help of the given subcommand(s)'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s o -l output -d 'Shell completion files output directory'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from completions" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s o -l owner -d 'Specify the file owner token'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s p -l password -d 'Unlock a password protected file'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from info" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s o -l owner -d 'Specify the file owner token'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s d -l download-limit -d 'The file download limit'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from parameters" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s p -l password -d 'Specify a password, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s o -l owner -d 'Specify the file owner token'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s P -l gen-passphrase -d 'Protect the file with a generated passphrase'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from password" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s p -l password -d 'Protect the file with a password'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s d -l download-limit -d 'The file download limit'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s e -l expiry-time -d 'The file expiry time'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s h -l host -d 'The remote host to upload to'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s n -l name -d 'Rename the file being uploaded'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s P -l gen-passphrase -d 'Protect the file with a generated passphrase'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s o -l open -d 'Open the share link in your browser'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s D -l delete -d 'Delete local file after upload'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s a -l archive -d 'Archive the upload in a single file'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s c -l copy -d 'Copy the share link to your clipboard'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s C -l copy-cmd -d 'Copy the ffsend download command to your clipboard'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s S -l shorten -d 'Shorten share URLs with a public service'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s Q -l qrcode -d 'Print a QR code for the share URL'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from upload" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s h -l host -d 'The remote host to upload to'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from version" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s R -l rm -d 'Remove history entry'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s C -l clear -d 'Clear all history'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from history" -s i -l incognito -d 'Don\'t update local history for actions'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s t -l timeout -d 'Request timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s T -l transfer-timeout -d 'Transfer timeout (0 to disable)'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s A -l api -d 'Server API version to use, \'-\' to lookup'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -l basic-auth -d 'Protected proxy HTTP basic authentication credentials (not FxA)'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s H -l history -d 'Use the specified history file'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s h -l help -d 'Prints help information'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s V -l version -d 'Prints version information'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s f -l force -d 'Force the action, ignore warnings'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s I -l no-interact -d 'Not interactive, do not prompt'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s y -l yes -d 'Assume yes for prompts'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s q -l quiet -d 'Produce output suitable for logging and automation'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s v -l verbose -d 'Enable verbose information and logging'
-complete -c ffsend -n "__fish_seen_subcommand_from help" -s i -l incognito -d 'Don\'t update local history for actions'

contrib/completions/gen_completions

@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Stop on error
-set -e
-
-echo "Generating all completions using cargo debug binary..."
-cargo run -q -- generate completions all --output "$PWD"
-echo "Done."

contrib/util/nautilus/README.md

@@ -1,6 +0,0 @@
-`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

@@ -1,46 +0,0 @@
-#!/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/alpine/APKBUILD

@@ -1,65 +0,0 @@
-# Contributor: Rasmus Thomsen <oss@cogitri.dev>
-# Maintainer: Rasmus Thomsen <oss@cogitri.dev>
-pkgname=ffsend
-pkgver=0.2.62
-pkgrel=0
-pkgdesc=" A fully featured Send client"
-url="https://gitlab.com/timvisee/ffsend"
-arch="x86_64 x86 armhf armv7 aarch64 ppc64le" # limited by cargo
-license="GPL-3.0-only"
-makedepends="cargo openssl-dev"
-subpackages="
-	$pkgname-zsh-completion:zshcomp:noarch
-	$pkgname-fish-completion:fishcomp:noarch
-	$pkgname-bash-completion:bashcomp:noarch
-	"
-source="https://gitlab.com/timvisee/ffsend/-/archive/v$pkgver/ffsend-v$pkgver.tar.gz"
-builddir="$srcdir/$pkgname-v$pkgver"
-
-case "$CARCH" in
-	x86)
-		export CFLAGS="$CFLAGS -fno-stack-protector"
-		;;
-esac
-
-build() {
-	cargo build --release
-}
-
-check() {
-	cargo test --release
-}
-
-package() {
-	cargo install --path . --root="$pkgdir/usr"
-	rm "$pkgdir"/usr/.crates.toml
-}
-
-bashcomp() {
-	depends=""
-	pkgdesc="Bash completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel bash-completion"
-
-	install -Dm644 "$builddir"/contrib/completions/ffsend.bash \
-			"$subpkgdir"/usr/share/bash-completion/completions/ffsend
-}
-
-zshcomp() {
-	depends=""
-	pkgdesc="Zsh compltions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel zsh"
-
-	install -Dm644 "$builddir"/contrib/completions/_ffsend \
-			"$subpkgdir"/usr/share/zsh/site-functions/_ffsend
-}
-
-fishcomp() {
-	depends=""
-	pkgdesc="Fish completions for $pkgname"
-	install_if="$pkgname=$pkgver-r$pkgrel fish"
-
-	install -Dm644 "$builddir"/contrib/completions/ffsend.fish \
-			"$subpkgdir"/usr/share/fish/completions/ffsend.fish
-}
-
-sha512sums="97477f59a498f4805340647c50c139d70ddbabaebb49b4acbae595ed9987fa2941b8d4dfd2edf76264b2a500fa10ac10f8583938fb29013936d9c092fe7fe7f1  ffsend-v0.2.51.tar.gz"

pkg/aur/aur.pub

@@ -1 +0,0 @@
-ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDHfiNi+rOCPKGLB6v9uuYR6GkN6Zd+CdaRbV82A26AUzs48ZG0xZGXHsoRuZY/yCUhcrS2u9xZ16fsAxnyf1QCF1hZVABUYtNhL1eEbSbLNiG9vIWJzbRjgegN/yyiG9ZVhFfNqXtPeapvuM3H44a2XeeFJcvTOfj/alkVjypi/DY/+XpC1IlX+CARC/e0zXHa3KZohn+CfBj8kWZWQEr7+EtKT59pslNxuJPcDUw7sKYLcBBz00BT0vv3lntyvZI1rRsD7AvItOwSZPp6or78Tgp8+O0HvFpjrlNipPEqDPpETIPcjTIVAlvlPFK1J0Rpzud38YdoWGfPiM77k7L7 timvisee@aur

pkg/aur/ffsend-bin/PKGBUILD

@@ -1,37 +0,0 @@
-# Maintainer: Tim Visee <tim@visee.me>
-# Contributor: Ariel AxionL <i at axionl dot me>
-#
-# This PKGBUILD is managed externally, and is automatically updated here:
-# - https://gitlab.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-bin/PKGBUILD
-# - Mirror: https://github.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-bin/PKGBUILD
-
-pkgname=ffsend-bin
-pkgver=0.0.0 # automatically set in CI, see: /.gitlab-ci.yml
-pkgrel=1
-pkgdesc="Easily and securely share files from the command line. A Send client."
-url="https://gitlab.com/timvisee/ffsend"
-license=('GPL3')
-source=("ffsend-v$pkgver::https://github.com/timvisee/ffsend/releases/download/v$pkgver/ffsend-v$pkgver-linux-x64-static"
-        "ffsend-v$pkgver.bash::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/ffsend.bash"
-        "ffsend-v$pkgver.zsh::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/_ffsend"
-        "ffsend-v$pkgver.fish::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/contrib/completions/ffsend.fish"
-        "LICENSE-v$pkgver::https://raw.githubusercontent.com/timvisee/ffsend/v$pkgver/LICENSE") # automatically set in CI, see: /.gitlab-ci.yml
-sha256sums=('SKIP')
-arch=('x86_64')
-provides=('ffsend')
-conflicts=('ffsend')
-depends=('ca-certificates')
-optdepends=('xclip: clipboard support'
-            'bash-completion: support auto completion for bash')
-
-package() {
-    cd "$srcdir"
-
-    install -Dm755 "ffsend-v$pkgver" "$pkgdir/usr/bin/ffsend"
-
-    # Shell completions and LICENSE file
-    install -Dm644 "ffsend-v$pkgver.bash" "$pkgdir/usr/share/bash-completion/completions/ffsend"
-    install -Dm644 "ffsend-v$pkgver.zsh" "$pkgdir/usr/share/zsh/site-functions/_ffsend"
-    install -Dm644 "ffsend-v$pkgver.fish" "$pkgdir/usr/share/fish/vendor_completions.d/ffsend.fish"
-    install -Dm644 "LICENSE-v$pkgver" "$pkgdir/usr/share/licenses/ffsend/LICENSE"
-}

pkg/aur/ffsend-git/PKGBUILD

@@ -1,57 +0,0 @@
-# Maintainer: Tim Visee <tim@visee.me>
-#
-# This PKGBUILD is managed externally, and is automatically updated here:
-# - https://gitlab.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-git/PKGBUILD
-# - Mirror: https://github.com/timvisee/ffsend/blob/master/pkg/aur/ffsend-git/PKGBUILD
-
-pkgname=ffsend-git
-pkgver=0.0.0 # automatically set in CI, see: /.gitlab-ci.yml
-pkgrel=1
-pkgdesc="Easily and securely share files from the command line. A Send client."
-url="https://gitlab.com/timvisee/ffsend"
-license=('GPL3')
-source=("git+${url}")
-sha256sums=('SKIP')
-arch=('x86_64' 'i686')
-provides=('ffsend')
-conflicts=('ffsend')
-depends=('ca-certificates')
-makedepends=('cargo' 'cmake' 'openssl>=1.0')
-optdepends=('xclip: clipboard support')
-
-prepare() {
-    cd "${pkgname%-git}"
-
-    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-}
-
-build() {
-    cd "${pkgname%-git}"
-
-    export RUSTUP_TOOLCHAIN=stable
-    export CARGO_TARGET_DIR=target
-    cargo build --frozen --release
-}
-
-check() {
-    cd "${pkgname%-git}"
-
-    export RUSTUP_TOOLCHAIN=stable
-    cargo test --frozen
-}
-
-package() {
-    cd "${pkgname%-git}"
-
-    install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/ffsend"
-
-    # Shell completions and LICENSE file
-    install -Dm644 "contrib/completions/ffsend.bash" \
-        "$pkgdir/etc/bash_completion.d/ffsend"
-	install -Dm644 "contrib/completions/_ffsend" \
-        "$pkgdir/usr/share/zsh/site-functions/_ffsend"
-	install -Dm644 "contrib/completions/ffsend.fish" \
-        "$pkgdir/usr/share/fish/vendor_completions.d/ffsend.fish"
-    install -Dm644 "LICENSE" \
-        "$pkgdir/usr/share/licenses/ffsend/LICENSE"
-}

pkg/aur/ffsend/PKGBUILD

@@ -1,55 +0,0 @@
-# Maintainer: Tim Visee <tim@visee.me>
-#
-# This PKGBUILD is managed externally, and is automatically updated here:
-# - https://gitlab.com/timvisee/ffsend/blob/master/pkg/aur/ffsend/PKGBUILD
-# - Mirror: https://github.com/timvisee/ffsend/blob/master/pkg/aur/ffsend/PKGBUILD
-
-pkgname=ffsend
-pkgver=0.0.0 # automatically set in CI, see: /.gitlab-ci.yml
-pkgrel=1
-pkgdesc="Easily and securely share files from the command line. A Send client."
-url="https://gitlab.com/timvisee/ffsend"
-license=('GPL3')
-source=("$url/-/archive/v$pkgver/ffsend-v$pkgver.tar.gz") # automatically set in CI, see: /.gitlab-ci.yml
-sha256sums=('SKIP') # automatically set in CI, see: /.gitlab-ci.yml
-arch=('x86_64' 'i686')
-depends=('ca-certificates')
-makedepends=('cargo' 'cmake' 'openssl>=1.0')
-optdepends=('xclip: clipboard support')
-
-prepare() {
-    cd "$pkgname-v$pkgver"
-
-    cargo fetch --locked --target "$CARCH-unknown-linux-gnu"
-}
-
-build() {
-    cd "$pkgname-v$pkgver"
-
-    export RUSTUP_TOOLCHAIN=stable
-    export CARGO_TARGET_DIR=target
-    cargo build --frozen --release
-}
-
-check() {
-    cd "$pkgname-v$pkgver"
-
-    export RUSTUP_TOOLCHAIN=stable
-    cargo test --frozen
-}
-
-package() {
-    cd "$pkgname-v$pkgver"
-
-    install -Dm0755 -t "$pkgdir/usr/bin/" "target/release/$pkgname"
-
-    # Shell completions and LICENSE file
-    install -Dm644 "contrib/completions/ffsend.bash" \
-        "$pkgdir/etc/bash_completion.d/ffsend"
-	install -Dm644 "contrib/completions/_ffsend" \
-        "$pkgdir/usr/share/zsh/site-functions/_ffsend"
-	install -Dm644 "contrib/completions/ffsend.fish" \
-        "$pkgdir/usr/share/fish/vendor_completions.d/ffsend.fish"
-    install -Dm644 "LICENSE" \
-        "$pkgdir/usr/share/licenses/ffsend/LICENSE"
-}

pkg/choco/ffsend/ffsend.nuspec

@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Read this before creating packages: https://chocolatey.org/docs/create-packages -->
-<!-- It is especially important to read the above link to understand additional requirements when publishing packages to the community feed aka dot org (https://chocolatey.org/packages). -->
-
-<!-- Test your packages in a test environment: https://github.com/chocolatey/chocolatey-test-environment -->
-
-<!--
-This is a nuspec. It mostly adheres to https://docs.nuget.org/create/Nuspec-Reference. Chocolatey uses a special version of NuGet.Core that allows us to do more than was initially possible. As such there are certain things to be aware of:
-
-* the package xmlns schema url may cause issues with nuget.exe
-* Any of the following elements can ONLY be used by choco tools - projectSourceUrl, docsUrl, mailingListUrl, bugTrackerUrl, packageSourceUrl, provides, conflicts, replaces 
-* nuget.exe can still install packages with those elements but they are ignored. Any authoring tools or commands will error on those elements 
--->
-
-<!-- You can embed software files directly into packages, as long as you are not bound by distribution rights. -->
-<!-- * If you are an organization making private packages, you probably have no issues here -->
-<!-- * If you are releasing to the community feed, you need to consider distribution rights. -->
-<!-- Do not remove this test for UTF-8: if “Ω” doesn’t appear as greek uppercase omega letter enclosed in quotation marks, you should use an editor that supports UTF-8, not this one. -->
-<package xmlns="http://schemas.microsoft.com/packaging/2015/06/nuspec.xsd">
-  <metadata>
-    <!-- == PACKAGE SPECIFIC SECTION == -->
-    <!-- This section is about this package, although id and version have ties back to the software -->
-    <!-- id is lowercase and if you want a good separator for words, use '-', not '.'. Dots are only acceptable as suffixes for certain types of packages, e.g. .install, .portable, .extension, .template -->
-    <!-- If the software is cross-platform, attempt to use the same id as the debian/rpm package(s) if possible. -->
-    <id>ffsend</id>
-    <!-- version should MATCH as closely as possible with the underlying software -->
-    <!-- Is the version a prerelease of a version? https://docs.nuget.org/create/versioning#creating-prerelease-packages -->
-    <!-- Note that unstable versions like 0.0.1 can be considered a released version, but it's possible that one can release a 0.0.1-beta before you release a 0.0.1 version. If the version number is final, that is considered a released version and not a prerelease. -->
-    <version>0.0.0</version>
-    <packageSourceUrl>https://github.com/timvisee/ffsend/tree/master/pkg/choco/ffsend</packageSourceUrl>
-    <!-- owners is a poor name for maintainers of the package. It sticks around by this name for compatibility reasons. It basically means you. -->
-    <owners>Tim Visee</owners>
-    <!-- ============================== -->
-
-    <!-- == SOFTWARE SPECIFIC SECTION == -->
-    <!-- This section is about the software itself -->
-    <title>ffsend (Install)</title>
-    <authors>Tim Visee</authors>
-    <projectUrl>https://github.com/timvisee/ffsend</projectUrl>
-    <iconUrl>http://cdn.rawgit.com/timvisee/ffsend/master/res/ffsend.png</iconUrl>
-    <copyright>2017-2019 Tim Visee</copyright>
-    <licenseUrl>https://raw.githubusercontent.com/timvisee/ffsend/master/LICENSE</licenseUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <projectSourceUrl>https://github.com/timvisee/ffsend</projectSourceUrl>
-    <docsUrl>https://github.com/timvisee/ffsend</docsUrl>
-    <bugTrackerUrl>https://gitlab.com/timvisee/ffsend/issues</bugTrackerUrl>
-    <tags>ffsend firefox-send cli file-sharing file-upload encryption rust</tags>
-    <summary>Easily and securely share files from the command line. A fully featured Send client.</summary>
-    <description>Easily and securely share files from the command line. A fully featured Send client.</description>
-    <!-- =============================== -->      
-
-    <!-- Specifying dependencies and version ranges? https://docs.nuget.org/create/versioning#specifying-version-ranges-in-.nuspec-files -->
-    <dependencies></dependencies>
-  </metadata>
-  <files>
-    <!-- this section controls what actually gets packaged into the Chocolatey package -->
-    <file src="tools\**" target="tools" />
-    <!-- Building from Linux? You may need this instead: <file src="tools/**" target="tools" /> -->
-  </files>
-</package>

pkg/choco/ffsend/tools/LICENSE.txt

@@ -1,678 +0,0 @@
-From: https://www.gnu.org/licenses/gpl-3.0.en.html
-
-LICENSE
-
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 3, 29 June 2007
-
- Copyright (C) 2018 Tim Visee. <https://timvisee.com/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU General Public License is a free, copyleft license for
-software and other kinds of works.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-the GNU General Public License is intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.  We, the Free Software Foundation, use the
-GNU General Public License for most of our software; it applies also to
-any other work released this way by its authors.  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  To protect your rights, we need to prevent others from denying you
-these rights or asking you to surrender the rights.  Therefore, you have
-certain responsibilities if you distribute copies of the software, or if
-you modify it: responsibilities to respect the freedom of others.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must pass on to the recipients the same
-freedoms that you received.  You must make sure that they, too, receive
-or can get the source code.  And you must show them these terms so they
-know their rights.
-
-  Developers that use the GNU GPL protect your rights with two steps:
-(1) assert copyright on the software, and (2) offer you this License
-giving you legal permission to copy, distribute and/or modify it.
-
-  For the developers' and authors' protection, the GPL clearly explains
-that there is no warranty for this free software.  For both users' and
-authors' sake, the GPL requires that modified versions be marked as
-changed, so that their problems will not be attributed erroneously to
-authors of previous versions.
-
-  Some devices are designed to deny users access to install or run
-modified versions of the software inside them, although the manufacturer
-can do so.  This is fundamentally incompatible with the aim of
-protecting users' freedom to change the software.  The systematic
-pattern of such abuse occurs in the area of products for individuals to
-use, which is precisely where it is most unacceptable.  Therefore, we
-have designed this version of the GPL to prohibit the practice for those
-products.  If such problems arise substantially in other domains, we
-stand ready to extend this provision to those domains in future versions
-of the GPL, as needed to protect the freedom of users.
-
-  Finally, every program is threatened constantly by software patents.
-States should not allow patents to restrict development and use of
-software on general-purpose computers, but in those that do, we wish to
-avoid the special danger that patents applied to a free program could
-make it effectively proprietary.  To prevent this, the GPL assures that
-patents cannot be used to render the program non-free.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Use with the GNU Affero General Public License.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU Affero General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the special requirements of the GNU Affero General Public License,
-section 13, concerning interaction through a network will apply to the
-combination as such.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If the program does terminal interaction, make it output a short
-notice like this when it starts in an interactive mode:
-
-    <program>  Copyright (C) <year>  <name of author>
-    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, your program's commands
-might be different; for a GUI interface, you would use an "about box".
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU GPL, see
-<http://www.gnu.org/licenses/>.
-
-  The GNU General Public License does not permit incorporating your program
-into proprietary programs.  If your program is a subroutine library, you
-may consider it more useful to permit linking proprietary applications with
-the library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.  But first, please read
-<http://www.gnu.org/philosophy/why-not-lgpl.html>.

pkg/choco/ffsend/tools/VERIFICATION.txt

@@ -1,5 +0,0 @@
-VERIFICATION
-Verification is intended to assist the Chocolatey moderators and community
-in verifying that this package's contents are trustworthy.
- 
-Binaries can be compared to versions available at: https://github.com/timvisee/ffsend/releases

pkg/create_deb

@@ -9,13 +9,13 @@ if [[ ! $TRAVIS_TAG =~ ^v([0-9]+\.)*[0-9]+$ ]]; then
 fi
 
 # Ensure the debian architecture is set
-if [[ -z $DEB_ARCH ]]; then
+if [[ -z "$DEB_ARCH" ]]; then
     echo "Error: debian architecture not configured in \$DEB_ARCH"
     exit 1
 fi
 
 # Define some useful variables
-DIR=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 VERSION=${TRAVIS_TAG:1}
 
 # Ensure the binary file exists
@@ -25,23 +25,23 @@ if [[ ! -f "$DIR/../ffsend" ]]; then
 fi
 
 # Create an application directory, copy the binary into it
-mkdir -p "$DIR/ffsend-$VERSION"
-cp -- "$DIR/../ffsend" "$DIR/ffsend-$VERSION/ffsend"
+mkdir -p $DIR/ffsend-$VERSION
+cp $DIR/../ffsend $DIR/ffsend-$VERSION/ffsend
 
-# Create an application tarball
-cd -- "$DIR/.."
-git archive --format tar.gz -o "$DIR/ffsend-$VERSION/ffsend-$VERSION.tar.gz" "$TRAVIS_TAG"
+# Create an application tarbal
+cd $DIR/..
+git archive --format tar.gz -o $DIR/ffsend-$VERSION/ffsend-$VERSION.tar.gz $TRAVIS_TAG
 
 # Change into the app directory
-cd -- "$DIR/ffsend-$VERSION"
+cd $DIR/ffsend-$VERSION
 
 # Build the debian package
 # TODO: define GPG?
-dh_make -e "timvisee@gmail.com" -c gpl3 -f "ffsend-$VERSION.tar.gz" -s -y
-rm -- *.ex README.Debian README.source
+dh_make -e "timvisee@gmail.com" -c gpl3 -f ffsend-$VERSION.tar.gz -s -y
+rm *.ex README.Debian README.source
 
 # Remove the project tar ball, we're not using it anymore
-rm -- "$DIR/ffsend-$VERSION/ffsend-$VERSION.tar.gz"
+rm $DIR/ffsend-$VERSION/ffsend-$VERSION.tar.gz
 
 # TODO: configure the debian/control file
 # TODO: configure copyright file

pkg/deb/prerm

@@ -2,7 +2,7 @@
 
 # Unlink the ffs alias if it links to ffsend
 if [[ -L /usr/bin/ffs ]] \
-    && [[ $(realpath /usr/bin/ffs) == "/usr/bin/ffsend" ]]; \
+    && [[ $(ls -l /usr/bin/ffs | sed -e 's/.* -> //') == "/usr/bin/ffsend" ]]; \
 then
     echo "Removing ffs alias for ffsend..."
     unlink /usr/bin/ffs

pkg/docker/Dockerfile

@@ -1,7 +0,0 @@
-FROM alpine:latest
-LABEL maintainer="Tim Visée <3a4fb3964f@sinenomine.email>"
-
-COPY ./ffsend /
-
-WORKDIR /data/
-ENTRYPOINT ["/ffsend"]

pkg/scoop/README.md

@@ -1,8 +0,0 @@
-# scoop manifest for ffsend
-This directory contains a [`scoop`][scoop] manifest template for `ffsend`.
-
-The currently published manifest can be found in the `scoop` repository,
-and is automatically updated:  
-https://github.com/ScoopInstaller/Main/blob/master/bucket/ffsend.json
-
-[scoop]: https://scoop.rs/

pkg/scoop/ffsend.json

@@ -1,21 +0,0 @@
-{
-    "homepage": "https://github.com/timvisee/ffsend",
-    "description": "Easily and securely share files from the command line. A fully featured Send client.",
-    "license": "GPL-3.0-only",
-    "version": "0.0.0",
-    "architecture": {
-        "64bit": {
-            "url": "https://github.com/timvisee/ffsend/releases/download/v0.2.30/ffsend-v0.2.30-windows-x64-static.exe#/ffsend.exe",
-            "hash": "297f1405bacdc34948cd94ba785336c48e1ac862984268d66a8928abd3e322e1"
-        }
-    },
-    "bin": "ffsend.exe",
-    "checkver": "github",
-    "autoupdate": {
-        "architecture": {
-            "64bit": {
-                "url": "https://github.com/timvisee/ffsend/releases/download/v$version/ffsend-v$version-windows-x64-static.exe#/ffsend.exe"
-            }
-        }
-    }
-}

pkg/snap/.gitignore

@@ -1,4 +0,0 @@
-parts/
-prime/
-snap/
-stage/

pkg/snap/snapcraft.yaml

@@ -1,35 +0,0 @@
-name: ffsend
-version: git
-summary: Easily and securely share files from the command line.
-description: |
-  Easily and securely share files and directories from the command line through
-  a safe, private and encrypted link using a single simple command.
-  Files are shared using the Send service and may be up to 2GB.
-  Others are able to download these files with this tool
-  or through their web browser.
-
-  All files are always encrypted on the client,
-  and secrets are never shared with the remote host.
-  An optional password may be specified, and a default file lifetime of 1
-  (up to 20) download or 24 hours is enforced to ensure your stuff does not
-  remain online forever. This provides a secure platform to share your files.
-# license: GPL-3.0
-
-architectures:
-  - amd64
-
-grade: stable
-confinement: strict
-
-apps:
-  ffsend:
-    command: ffsend
-    plugs: [desktop, home, network, removable-media, x11]
-
-parts:
-  ffsend:
-    source: ../../
-    plugin: rust
-    build-attributes: [no-system-libraries]
-    build-packages: [make, cmake, pkg-config, libssl-dev]
-    stage-packages: [libssl1.0.0, xclip]

res/asciinema-demo.json

@@ -4,7 +4,7 @@
   "height": 19,
   "duration": 78.431135,
   "command": null,
-  "title": "ffsend v0.0.9 demo",
+  "title": "ffsend v0.0.1 demo",
   "env": {
     "TERM": "xterm-256color",
     "SHELL": "/bin/bash"
@@ -44,7 +44,7 @@
     ],
     [
       0.004048,
-      "ffsend 0.0.7\r\nUsage: ffsend [FLAGS] <SUBCOMMAND> ...\r\n\r\nSecurely and easily share files from the command line.\r\nA fully featured Firefox Send client.\r\n\r\nMissing subcommand. Here are the most used:\r\n"
+      "ffsend 0.0.1\r\nUsage: ffsend [FLAGS] <SUBCOMMAND> ...\r\n\r\nSecurely and easily share files from the command line.\r\nA fully featured Firefox Send client.\r\n\r\nMissing subcommand. Here are the most used:\r\n"
     ],
     [
       0.000148,

res/asciinema-to-svg

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 
 # Ensure svg-term is installed
 if ! [ -x "$(command -v svg-term)" ]; then

snapcraft.login

@@ -1 +0,0 @@
-eyJyIjogIk1EQXlPV3h2WTJGMGFXOXVJRzE1WVhCd2N5NWtaWFpsYkc5d1pYSXVkV0oxYm5SMUxtTnZiUW93TURFMmFXUmxiblJwWm1sbGNpQk5lVUZ3Y0hNS01EQTBZbU5wWkNCdGVXRndjSE11WkdWMlpXeHZjR1Z5TG5WaWRXNTBkUzVqYjIxOGRtRnNhV1JmYzJsdVkyVjhNakF5TWkwd05pMHlNRlF3T0Rvd016b3hNaTQwTlRreU9EUUtNREUzWkdOcFpDQjdJblpsY25OcGIyNGlPaUF4TENBaWMyVmpjbVYwSWpvZ0ltOWFVRzlpVG1vdlJYTmhkazlYUVZoRmNIQlRNM1JNY0RGak1tdFZaVU5NYzFaWlNUQmFaa1JFZERkcVozaHhTVlI2VEhselFtOVZjV3N5VURad1JXdFFRblpNUkhOMFkwTTNSRlU1VUVFMGFXVlpPV0U0WWxGU2VtNHJNbTQxVEVsRWMwY3ZTVEphVEM4eU1uSTBjakZDYmlzM1VqRnhUVWt2WjNoR1kzVnVVV05pUlZkeVVWQXdZV3BrUTBrd1pWRmxOVEZsVmpWSVJrbzNjMlZGU0c5WVpFRlZTVVZ1Vm1GNU5sRnFVMDQzTW1SSFpWSlVabVZvYVVacmFWbFFaVVJJZVN0d1VqbHVjMXBNZW5aMFNYbHNPRnBYYVhkSVdIcFpRVTl2T0Rob1VXdFhZakZ6UzNGSGFYWjZWRFZEWlZoV1IyaElaalJSUVdRNVIwOWxLMjUxUmpWM2JHMWtaRlIwY1U1YWNWQnNjVkZHYjBoelprUk9jRFpvVFd4dWFHbDVMMGxvY2tOclZscENUVzFMYld0cFIwVk1VWFZMTUVSUVFtdFFNSE5RVWpaVVdsWnFjVGQzZVRaaFdIa3dVM1ZyZDBaclp6MDlJbjBLTURBMU1YWnBaQ0ExYU5mbjFKU3NBa1VoMFM1NXB4bnp2VUxESlRtcldMLTZSa3B0c3kzbFdVSG02T0hVQnJHeGtfYmlnbnEtbkxIMm9hYVdwaENKRkM1YzNod1BqWjBXUl83bUZ5QWN2QlFLTURBeE9HTnNJR3h2WjJsdUxuVmlkVzUwZFM1amIyMEtNREJoT1dOcFpDQnRlV0Z3Y0hNdVpHVjJaV3h2Y0dWeUxuVmlkVzUwZFM1amIyMThZV05zZkZzaWNHRmphMkZuWlY5aFkyTmxjM01pTENBaWNHRmphMkZuWlY5dFlXNWhaMlVpTENBaWNHRmphMkZuWlY5dFpYUnlhV056SWl3Z0luQmhZMnRoWjJWZmNIVnphQ0lzSUNKd1lXTnJZV2RsWDNKbFoybHpkR1Z5SWl3Z0luQmhZMnRoWjJWZmNtVnNaV0Z6WlNJc0lDSndZV05yWVdkbFgzVndaR0YwWlNKZENqQXdORGRqYVdRZ2JYbGhjSEJ6TG1SbGRtVnNiM0JsY2k1MVluVnVkSFV1WTI5dGZHVjRjR2x5WlhOOE1qQXlNeTB3TmkweU1GUXdPRG93TXpveE1pNHdNREF3TVRjS01EQXlabk5wWjI1aGRIVnlaU0JOYm05MFAyTkpYV3RON0I1aktWbkVBQUZqM0c3dzItLWNhOGloR2lJWUhRbyIsICJkIjogIk1EQXhaV3h2WTJGMGFXOXVJR3h2WjJsdUxuVmlkVzUwZFM1amIyMEtNREU0Tkdsa1pXNTBhV1pwWlhJZ2V5SjJaWEp6YVc5dUlqb2dNU3dnSW5ObFkzSmxkQ0k2SUNKdldsQnZZazVxTDBWellYWlBWMEZZUlhCd1V6TjBUSEF4WXpKclZXVkRUSE5XV1Vrd1dtWkVSSFEzYW1kNGNVbFVla3g1YzBKdlZYRnJNbEEyY0VWclVFSjJURVJ6ZEdORE4wUlZPVkJCTkdsbFdUbGhPR0pSVW5wdUt6SnVOVXhKUkhOSEwwa3lXa3d2TWpKeU5ISXhRbTRyTjFJeGNVMUpMMmQ0Um1OMWJsRmpZa1ZYY2xGUU1HRnFaRU5KTUdWUlpUVXhaVlkxU0VaS04zTmxSVWh2V0dSQlZVbEZibFpoZVRaUmFsTk9OekprUjJWU1ZHWmxhR2xHYTJsWlVHVkVTSGtyY0ZJNWJuTmFUSHAyZEVsNWJEaGFWMmwzU0ZoNldVRlBiemc0YUZGclYySXhjMHR4UjJsMmVsUTFRMlZZVmtkb1NHWTBVVUZrT1VkUFpTdHVkVVkxZDJ4dFpHUlVkSEZPV25GUWJIRlJSbTlJYzJaRVRuQTJhRTFzYm1ocGVTOUphSEpEYTFaYVFrMXRTMjFyYVVkRlRGRjFTekJFVUVKclVEQnpVRkkyVkZwV2FuRTNkM2syWVZoNU1GTjFhM2RHYTJjOVBTSjlDakF3WkRaamFXUWdiRzluYVc0dWRXSjFiblIxTG1OdmJYeGhZMk52ZFc1MGZHVjVTakZqTWxaNVltMUdkRnBUU1RaSlEwb3dZVmN4TW1GWVRteGFVMGx6U1VOS2RtTkhWblZoVjFGcFQybEJhVlZ1WkV4UlZXaDBVME5KYzBsRFNtdGhXRTUzWWtkR05XSnRSblJhVTBrMlNVTktWV0ZYTUdkV2JXeDZXRWhWZDAxSFZUVmFVMGx6U1VOS2JHSlhSbkJpUTBrMlNVTktNR0ZYTUhKa1Ywb3hZbTVTTVdJeU5XeFJTRnB3WXpKV2JFeHRNV3hKYVhkblNXMXNlbGd6V214amJXeHRZVmRXYTBscWIyZGtTRW94V2xnd1BRb3dNRFF3WTJsa0lHeHZaMmx1TG5WaWRXNTBkUzVqYjIxOGRtRnNhV1JmYzJsdVkyVjhNakF5TWkwd05pMHlNRlF3T0Rvd016b3hNeTR5T0RJd09UTUtNREF6WldOcFpDQnNiMmRwYmk1MVluVnVkSFV1WTI5dGZHeGhjM1JmWVhWMGFId3lNREl5TFRBMkxUSXdWREE0T2pBek9qRXpMakk0TWpBNU13b3dNREptYzJsbmJtRjBkWEpsSVBtdzV2aGZjWXhjRVFzX1RHV2VHWUFrQWhxdkJONVJjOFpHTEpnVFZ2eGxDZyJ9

src/action/debug.rs

@@ -1,14 +1,20 @@
 use chrono::Duration;
 use clap::ArgMatches;
 use ffsend_api::config::SEND_DEFAULT_EXPIRE_TIME;
-use prettytable::{format::FormatBuilder, Cell, Row, Table};
+use prettytable::{
+    cell::Cell,
+    format::FormatBuilder,
+    row::Row,
+    Table,
+};
 
-use crate::client::to_duration;
-use crate::cmd::matcher::{debug::DebugMatcher, main::MainMatcher, Matcher};
-use crate::error::ActionError;
-#[cfg(feature = "clipboard-bin")]
-use crate::util::ClipboardType;
-use crate::util::{api_version_list, features_list, format_bool, format_duration};
+use cmd::matcher::{
+    debug::DebugMatcher,
+    main::MainMatcher,
+    Matcher,
+};
+use error::ActionError;
+use util::{features_list, format_bool, format_duration};
 
 /// A file debug action.
 pub struct Debug<'a> {
@@ -18,7 +24,9 @@ pub struct Debug<'a> {
 impl<'a> Debug<'a> {
     /// Construct a new debug action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the debug action.
@@ -32,12 +40,6 @@ impl<'a> Debug<'a> {
         let mut table = Table::new();
         table.set_format(FormatBuilder::new().padding(0, 2).build());
 
-        // The crate version
-        table.add_row(Row::new(vec![
-            Cell::new("Version:"),
-            Cell::new(crate_version!()),
-        ]));
-
         // The default host
         table.add_row(Row::new(vec![
             Cell::new("Host:"),
@@ -51,39 +53,10 @@ impl<'a> Debug<'a> {
             Cell::new(matcher_main.history().to_str().unwrap_or("?")),
         ]));
 
-        // The timeouts
-        table.add_row(Row::new(vec![
-            Cell::new("Timeout:"),
-            Cell::new(
-                &to_duration(matcher_main.timeout())
-                    .map(|t| {
-                        format_duration(
-                            Duration::from_std(t).expect("failed to convert timeout duration"),
-                        )
-                    })
-                    .unwrap_or("disabled".into()),
-            ),
-        ]));
-        table.add_row(Row::new(vec![
-            Cell::new("Transfer timeout:"),
-            Cell::new(
-                &to_duration(matcher_main.transfer_timeout())
-                    .map(|t| {
-                        format_duration(
-                            Duration::from_std(t)
-                                .expect("failed to convert transfer timeout duration"),
-                        )
-                    })
-                    .unwrap_or("disabled".into()),
-            ),
-        ]));
-
         // The default host
         table.add_row(Row::new(vec![
             Cell::new("Default expiry:"),
-            Cell::new(&format_duration(Duration::seconds(
-                SEND_DEFAULT_EXPIRE_TIME as i64,
-            ))),
+            Cell::new(&format_duration(Duration::seconds(SEND_DEFAULT_EXPIRE_TIME))),
         ]));
 
         // Render a list of compiled features
@@ -92,34 +65,6 @@ impl<'a> Debug<'a> {
             Cell::new(&features_list().join(", ")),
         ]));
 
-        // Render a list of compiled features
-        table.add_row(Row::new(vec![
-            Cell::new("API support:"),
-            Cell::new(&api_version_list().join(", ")),
-        ]));
-
-        // Show used crypto backend
-        table.add_row(Row::new(vec![
-            Cell::new("Crypto backend:"),
-            #[cfg(feature = "crypto-ring")]
-            Cell::new("ring"),
-            #[cfg(feature = "crypto-openssl")]
-            Cell::new("OpenSSL"),
-        ]));
-
-        // Clipboard information
-        #[cfg(feature = "clipboard-bin")]
-        table.add_row(Row::new(vec![
-            Cell::new("Clipboard:"),
-            Cell::new(&format!("{}", ClipboardType::select())),
-        ]));
-
-        // Show whether quiet is used
-        table.add_row(Row::new(vec![
-            Cell::new("Quiet:"),
-            Cell::new(format_bool(matcher_main.quiet())),
-        ]));
-
         // Show whether verbose is used
         table.add_row(Row::new(vec![
             Cell::new("Verbose:"),

src/action/delete.rs

@@ -1,13 +1,23 @@
 use clap::ArgMatches;
-use ffsend_api::action::delete::{Delete as ApiDelete, Error as DeleteError};
-use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
+use ffsend_api::action::delete::{
+    Error as DeleteError,
+    Delete as ApiDelete,
+};
+use ffsend_api::file::remote_file::{
+    FileParseError,
+    RemoteFile,
+};
+use ffsend_api::reqwest::Client;
 
-use crate::client::create_config;
-use crate::cmd::matcher::{delete::DeleteMatcher, main::MainMatcher, Matcher};
-use crate::error::ActionError;
+use cmd::matcher::{
+    Matcher,
+    delete::DeleteMatcher,
+    main::MainMatcher,
+};
+use error::ActionError;
 #[cfg(feature = "history")]
-use crate::history_tool;
-use crate::util::{ensure_owner_token, print_success};
+use history_tool;
+use util::{ensure_owner_token, print_success};
 
 /// A file delete action.
 pub struct Delete<'a> {
@@ -17,7 +27,9 @@ pub struct Delete<'a> {
 impl<'a> Delete<'a> {
     /// Construct a new delete action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the delete action.
@@ -30,9 +42,8 @@ impl<'a> Delete<'a> {
         // Get the share link
         let url = matcher_delete.url();
 
-        // Create client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.client(false);
+        // Create a reqwest client
+        let client = Client::new();
 
         // Parse the remote file based on the share link, derive the owner token from history
         let mut file = RemoteFile::parse_url(url, matcher_delete.owner())?;
@@ -40,7 +51,7 @@ impl<'a> Delete<'a> {
         history_tool::derive_file_properties(&matcher_main, &mut file);
 
         // Ensure the owner token is set
-        ensure_owner_token(file.owner_token_mut(), &matcher_main, false);
+        ensure_owner_token(file.owner_token_mut(), &matcher_main);
 
         // Send the file deletion request
         let result = ApiDelete::new(&file, None).invoke(&client);

src/action/download.rs

@@ -7,26 +7,45 @@ use std::sync::{Arc, Mutex};
 
 use clap::ArgMatches;
 use failure::Fail;
-use ffsend_api::action::download::{Download as ApiDownload, Error as DownloadError};
-use ffsend_api::action::exists::{Error as ExistsError, Exists as ApiExists};
-use ffsend_api::action::metadata::{Error as MetadataError, Metadata as ApiMetadata};
-use ffsend_api::action::version::Error as VersionError;
+use ffsend_api::action::download::{
+    Download as ApiDownload,
+    Error as DownloadError,
+};
+use ffsend_api::action::exists::{
+    Error as ExistsError,
+    Exists as ApiExists,
+};
+use ffsend_api::action::metadata::{
+    Error as MetadataError,
+    Metadata as ApiMetadata,
+};
 use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
-use ffsend_api::pipe::ProgressReporter;
+use ffsend_api::reader::ProgressReporter;
+use ffsend_api::reqwest::Client;
 #[cfg(feature = "archive")]
-use tempfile::{Builder as TempBuilder, NamedTempFile};
+use tempfile::{
+    Builder as TempBuilder,
+    NamedTempFile,
+};
 
-use super::select_api_version;
 #[cfg(feature = "archive")]
-use crate::archive::archive::Archive;
-use crate::client::create_config;
-use crate::cmd::matcher::{download::DownloadMatcher, main::MainMatcher, Matcher};
+use archive::archive::Archive;
+use cmd::matcher::{
+    Matcher,
+    download::DownloadMatcher,
+    main::MainMatcher,
+};
 #[cfg(feature = "history")]
-use crate::history_tool;
-use crate::progress::ProgressBar;
-use crate::util::{
-    ensure_enough_space, ensure_password, follow_url, print_error, prompt_yes, quit, quit_error,
-    quit_error_msg, ErrorHints,
+use history_tool;
+use progress::ProgressBar;
+use util::{
+    ensure_enough_space,
+    ensure_password,
+    ErrorHints,
+    prompt_yes,
+    quit,
+    quit_error,
+    quit_error_msg,
 };
 
 /// A file download action.
@@ -37,7 +56,9 @@ pub struct Download<'a> {
 impl<'a> Download<'a> {
     /// Construct a new download action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the download action.
@@ -47,27 +68,11 @@ impl<'a> Download<'a> {
         let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
         let matcher_download = DownloadMatcher::with(self.cmd_matches).unwrap();
 
-        // Create a regular client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.clone().client(false);
-
-        // Get the share URL, attempt to follow it
+        // Get the share URL
         let url = matcher_download.url();
-        let url = match follow_url(&client, &url) {
-            Ok(url) => url,
-            Err(err) => {
-                print_error(err.context("failed to follow share URL, ignoring").compat());
-                url
-            }
-        };
 
-        // Guess the host
-        let host = matcher_download.guess_host(Some(url.clone()));
-
-        // Determine the API version to use
-        let mut desired_version = matcher_main.api();
-        select_api_version(&client, host, &mut desired_version)?;
-        let api_version = desired_version.version().unwrap();
+        // Create a reqwest client
+        let client = Client::new();
 
         // Parse the remote file based on the share URL
         let file = RemoteFile::parse_url(url, None)?;
@@ -87,15 +92,14 @@ impl<'a> Download<'a> {
         }
 
         // Ensure a password is set when required
-        ensure_password(
-            &mut password,
-            exists.requires_password(),
-            &matcher_main,
-            false,
-        );
+        ensure_password(&mut password, exists.has_password(), &matcher_main);
 
         // Fetch the file metadata
-        let metadata = ApiMetadata::new(&file, password.clone(), false).invoke(&client)?;
+        let metadata = ApiMetadata::new(
+            &file,
+            password.clone(),
+            false,
+        ).invoke(&client)?;
 
         // A temporary archive file, only used when archiving
         // The temporary file is stored here, to ensure it's lifetime exceeds the upload process
@@ -106,8 +110,7 @@ impl<'a> Download<'a> {
         #[cfg(feature = "archive")]
         let mut extract = matcher_download.extract();
 
-        #[cfg(feature = "archive")]
-        {
+        #[cfg(feature = "archive")] {
             // Ask to extract if downloading an archive
             if !extract && metadata.metadata().is_archive() {
                 if prompt_yes(
@@ -135,11 +138,10 @@ impl<'a> Download<'a> {
         #[cfg(feature = "archive")]
         let output_path = target.clone();
 
-        #[cfg(feature = "archive")]
-        {
+        #[cfg(feature = "archive")] {
             // Allocate an archive file, and update the download and target paths
             if extract {
-                // TODO: select the extension dynamically
+                // TODO: select the extention dynamically
                 let archive_extention = ".tar";
 
                 // Allocate a temporary file to download the archive to
@@ -148,7 +150,7 @@ impl<'a> Download<'a> {
                         .prefix(&format!(".{}-archive-", crate_name!()))
                         .suffix(archive_extention)
                         .tempfile()
-                        .map_err(ExtractError::TempFile)?,
+                        .map_err(ExtractError::TempFile)?
                 );
                 if let Some(tmp_archive) = &tmp_archive {
                     target = tmp_archive.path().to_path_buf();
@@ -163,23 +165,19 @@ impl<'a> Download<'a> {
 
         // Create a progress bar reporter
         let progress_bar = Arc::new(Mutex::new(ProgressBar::new_download()));
-        let progress_reader: Arc<Mutex<dyn ProgressReporter>> = progress_bar;
-
-        // Create a transfer client
-        let transfer_client = client_config.client(true);
+        let progress_reader: Arc<Mutex<ProgressReporter>> = progress_bar;
 
         // Execute an download action
-        let progress = if !matcher_main.quiet() {
-            Some(progress_reader)
-        } else {
-            None
-        };
-        ApiDownload::new(api_version, &file, target, password, false, Some(metadata))
-            .invoke(&transfer_client, progress)?;
+        ApiDownload::new(
+            &file,
+            target,
+            password,
+            false,
+            Some(metadata),
+        ).invoke(&client, &progress_reader)?;
 
         // Extract the downloaded file if working with an archive
-        #[cfg(feature = "archive")]
-        {
+        #[cfg(feature = "archive")] {
             if extract {
                 eprintln!("Extracting...");
 
@@ -210,7 +208,7 @@ impl<'a> Download<'a> {
     ///
     /// The full path including the name is returned.
     ///
-    /// This method will check whether a file is overwritten, and whether
+    /// This method will check whether a file is overwitten, and whether
     /// parent directories must be created.
     ///
     /// The program will quit with an error message if a problem occurs.
@@ -245,7 +243,10 @@ impl<'a> Download<'a> {
             let dir = if file {
                 match target.parent() {
                     Some(parent) => parent,
-                    None => quit_error_msg("invalid output file path", ErrorHints::default()),
+                    None => quit_error_msg(
+                        "invalid output file path",
+                        ErrorHints::default(),
+                    ),
                 }
             } else {
                 &target
@@ -267,10 +268,9 @@ impl<'a> Download<'a> {
 
                 // Create the parent directories
                 if let Err(err) = create_dir_all(dir) {
-                    quit_error(
-                        err.context("failed to create parent directories for output file"),
-                        ErrorHints::default(),
-                    );
+                    quit_error(err.context(
+                        "failed to create parent directories for output file",
+                    ), ErrorHints::default());
                 }
             }
         }
@@ -313,15 +313,16 @@ impl<'a> Download<'a> {
         // Get the path string
         let path = target.to_str();
 
-        // If the path is empty, use the working directory with the name hint
-        let use_workdir = path.map(|path| path.trim().is_empty()).unwrap_or(true);
+        // If the path is emtpy, use the working directory with the name hint
+        let use_workdir = path
+            .map(|path| path.trim().is_empty())
+            .unwrap_or(true);
         if use_workdir {
             match current_dir() {
                 Ok(target) => return target.join(name_hint),
-                Err(err) => quit_error(
-                    err.context("failed to determine working directory to use for the output file"),
-                    ErrorHints::default(),
-                ),
+                Err(err) => quit_error(err.context(
+                    "failed to determine working directory to use for the output file"
+                ), ErrorHints::default()),
             }
         }
         let path = path.unwrap();
@@ -338,10 +339,9 @@ impl<'a> Download<'a> {
         if target.is_relative() {
             match current_dir() {
                 Ok(workdir) => target = workdir.join(target),
-                Err(err) => quit_error(
-                    err.context("failed to determine working directory to use for the output file"),
-                    ErrorHints::default(),
-                ),
+                Err(err) => quit_error(err.context(
+                        "failed to determine working directory to use for the output file"
+                    ), ErrorHints::default()),
             }
         }
 
@@ -351,11 +351,6 @@ impl<'a> Download<'a> {
 
 #[derive(Debug, Fail)]
 pub enum Error {
-    /// Selecting the API version to use failed.
-    // TODO: enable `api` hint!
-    #[fail(display = "failed to select API version to use")]
-    Version(#[cause] VersionError),
-
     /// Failed to parse a share URL, it was invalid.
     /// This error is not related to a specific action.
     #[fail(display = "invalid share link")]
@@ -383,12 +378,6 @@ pub enum Error {
     Expired,
 }
 
-impl From<VersionError> for Error {
-    fn from(err: VersionError) -> Error {
-        Error::Version(err)
-    }
-}
-
 impl From<FileParseError> for Error {
     fn from(err: FileParseError) -> Error {
         Error::InvalidUrl(err)

src/action/exists.rs

@@ -1,13 +1,17 @@
 use clap::ArgMatches;
-use ffsend_api::action::exists::{Error as ExistsError, Exists as ApiExists};
+use ffsend_api::action::exists::{
+    Error as ExistsError,
+    Exists as ApiExists,
+};
 use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
+use ffsend_api::reqwest::Client;
 
-use crate::client::create_config;
-use crate::cmd::matcher::main::MainMatcher;
-use crate::cmd::matcher::{exists::ExistsMatcher, Matcher};
-use crate::error::ActionError;
+use cmd::matcher::{Matcher, exists::ExistsMatcher};
 #[cfg(feature = "history")]
-use crate::history_tool;
+use cmd::matcher::main::MainMatcher;
+use error::ActionError;
+#[cfg(feature = "history")]
+use history_tool;
 
 /// A file exists action.
 pub struct Exists<'a> {
@@ -17,7 +21,9 @@ pub struct Exists<'a> {
 impl<'a> Exists<'a> {
     /// Construct a new exists action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the exists action.
@@ -25,26 +31,27 @@ impl<'a> Exists<'a> {
     pub fn invoke(&self) -> Result<(), ActionError> {
         // Create the command matchers
         let matcher_exists = ExistsMatcher::with(self.cmd_matches).unwrap();
+        #[cfg(feature = "history")]
         let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
 
         // Get the share URL
         let url = matcher_exists.url();
 
         // Create a reqwest client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.client(false);
+        let client = Client::new();
 
         // Parse the remote file based on the share URL
         let file = RemoteFile::parse_url(url, None)?;
 
         // Make sure the file exists
-        let exists_response = ApiExists::new(&file).invoke(&client)?;
+        let exists_response = ApiExists::new(&file)
+            .invoke(&client)?;
         let exists = exists_response.exists();
 
         // Print the results
         println!("Exists: {:?}", exists);
         if exists {
-            println!("Password: {:?}", exists_response.requires_password());
+            println!("Password: {:?}", exists_response.has_password());
         }
 
         // Add or remove the file from the history

src/action/generate/completions.rs

@@ -1,61 +0,0 @@
-use std::fs;
-use std::io;
-
-use clap::ArgMatches;
-
-use crate::cmd::matcher::{generate::completions::CompletionsMatcher, main::MainMatcher, Matcher};
-use crate::error::ActionError;
-
-/// A file completions action.
-pub struct Completions<'a> {
-    cmd_matches: &'a ArgMatches<'a>,
-}
-
-impl<'a> Completions<'a> {
-    /// Construct a new completions action.
-    pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
-    }
-
-    /// Invoke the completions action.
-    // TODO: create a trait for this method
-    pub fn invoke(&self) -> Result<(), ActionError> {
-        // Create the command matchers
-        let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
-        let matcher_completions = CompletionsMatcher::with(self.cmd_matches).unwrap();
-
-        // Obtain shells to generate completions for, build application definition
-        let shells = matcher_completions.shells();
-        let dir = matcher_completions.output();
-        let quiet = matcher_main.quiet();
-        let mut app = crate::cmd::handler::Handler::build();
-
-        // If the directory does not exist yet, attempt to create it
-        if !dir.is_dir() {
-            fs::create_dir_all(&dir).map_err(Error::CreateOutputDir)?;
-        }
-
-        // Generate completions
-        for shell in shells {
-            if !quiet {
-                eprint!(
-                    "Generating completions for {}...",
-                    format!("{}", shell).to_lowercase()
-                );
-            }
-            app.gen_completions(crate_name!(), shell, &dir);
-            if !quiet {
-                eprintln!(" done.");
-            }
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    /// An error occurred while creating the output directory.
-    #[fail(display = "failed to create output directory, it doesn't exist")]
-    CreateOutputDir(#[cause] io::Error),
-}

src/action/generate/mod.rs

@@ -1,34 +0,0 @@
-pub mod completions;
-
-use clap::ArgMatches;
-
-use crate::cmd::matcher::{generate::GenerateMatcher, Matcher};
-use crate::error::ActionError;
-use completions::Completions;
-
-/// A file generate action.
-pub struct Generate<'a> {
-    cmd_matches: &'a ArgMatches<'a>,
-}
-
-impl<'a> Generate<'a> {
-    /// Construct a new generate action.
-    pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
-    }
-
-    /// Invoke the generate action.
-    // TODO: create a trait for this method
-    pub fn invoke(&self) -> Result<(), ActionError> {
-        // Create the command matcher
-        let matcher_generate = GenerateMatcher::with(self.cmd_matches).unwrap();
-
-        // Match shell completions
-        if matcher_generate.matcher_completions().is_some() {
-            return Completions::new(self.cmd_matches).invoke();
-        }
-
-        // Unreachable, clap will print help for missing sub command instead
-        unreachable!()
-    }
-}

src/action/history.rs

@@ -1,11 +1,21 @@
 use clap::ArgMatches;
-use failure::Fail;
-use prettytable::{format::FormatBuilder, Cell, Row, Table};
+use prettytable::{
+    cell::Cell,
+    format::FormatBuilder,
+    row::Row,
+    Table,
+};
 
-use crate::cmd::matcher::{history::HistoryMatcher, main::MainMatcher, Matcher};
-use crate::error::ActionError;
-use crate::history::{History as HistoryManager, LoadError as HistoryLoadError};
-use crate::util::{format_duration, quit_error, quit_error_msg, ErrorHintsBuilder};
+use cmd::matcher::{
+    Matcher,
+    main::MainMatcher,
+};
+use error::ActionError;
+use history::{
+    History as HistoryManager,
+    LoadError as HistoryLoadError,
+};
+use util::format_duration;
 
 /// A history action.
 pub struct History<'a> {
@@ -15,7 +25,9 @@ pub struct History<'a> {
 impl<'a> History<'a> {
     /// Construct a new history action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the history action.
@@ -23,121 +35,63 @@ impl<'a> History<'a> {
     pub fn invoke(&self) -> Result<(), ActionError> {
         // Create the command matchers
         let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
-        let matcher_history = HistoryMatcher::with(self.cmd_matches).unwrap();
 
         // Get the history path, make sure it exists
         let history_path = matcher_main.history();
         if !history_path.is_file() {
-            if !matcher_main.quiet() {
-                eprintln!("No files in history");
-            }
+            eprintln!("No files in history");
             return Ok(());
         }
 
         // History
-        let mut history = HistoryManager::load(history_path)?;
+        let history = HistoryManager::load(history_path)?;
 
         // Do not report any files if there aren't any
         if history.files().is_empty() {
-            if !matcher_main.quiet() {
-                eprintln!("No files in history");
-            }
+            eprintln!("No files in history");
             return Ok(());
         }
 
-        // Clear all history
-        if matcher_history.clear() {
-            history.clear();
-
-            // Save history
-            if let Err(err) = history.save() {
-                quit_error(
-                    err,
-                    ErrorHintsBuilder::default().verbose(true).build().unwrap(),
-                );
-            }
-
-            eprintln!("History cleared");
-            return Ok(());
-        }
-
-        // Remove history item
-        if let Some(url) = matcher_history.rm() {
-            // Remove item, print error if no item with URL was found
-            match history.remove_url(url) {
-                Ok(removed) if !removed => quit_error_msg(
-                    "could not remove item from history, no item matches given URL",
-                    ErrorHintsBuilder::default().verbose(true).build().unwrap(),
-                ),
-                Err(err) => quit_error(
-                    err.context("could not remove item from history"),
-                    ErrorHintsBuilder::default().verbose(true).build().unwrap(),
-                ),
-                _ => {}
-            }
-
-            // Save history
-            if let Err(err) = history.save() {
-                quit_error(
-                    err,
-                    ErrorHintsBuilder::default().verbose(true).build().unwrap(),
-                );
-            }
-
-            eprintln!("Item removed from history");
-            return Ok(());
-        }
+        // Create a new table
+        let mut table = Table::new();
+        table.set_format(FormatBuilder::new().padding(0, 2).build());
+        table.add_row(Row::new(vec![
+            Cell::new("#"),
+            Cell::new("LINK"),
+            Cell::new("EXPIRY"),
+            Cell::new("OWNER TOKEN"),
+        ]));
 
         // Get the list of files, and sort the first expiring files to be last
         let mut files = history.files().clone();
         files.sort_by(|a, b| b.expire_at().cmp(&a.expire_at()));
 
-        // Log a history table, or just the URLs in quiet mode
-        if !matcher_main.quiet() {
-            // Build the list of column names
-            let mut columns = vec!["#", "LINK", "EXPIRE"];
-            if matcher_main.verbose() {
-                columns.push("OWNER TOKEN");
+        // Add an entry for each file
+        for (i, file) in files.iter().enumerate() {
+            // Build the expiry time string
+            let mut expiry = format_duration(&file.expire_duration());
+            if file.expire_uncertain() {
+                expiry.insert(0, '~');
             }
 
-            // Create a new table
-            let mut table = Table::new();
-            table.set_format(FormatBuilder::new().padding(0, 2).build());
-            table.add_row(Row::new(columns.into_iter().map(Cell::new).collect()));
+            // Get the owner token
+            let owner_token: String = match file.owner_token() {
+                Some(token) => token.clone(),
+                None => "?".into(),
+            };
 
-            // Add an entry for each file
-            for (i, file) in files.iter().enumerate() {
-                // Build the expiry time string
-                let mut expiry = format_duration(&file.expire_duration());
-                if file.expire_uncertain() {
-                    expiry.insert(0, '~');
-                }
-
-                // Get the owner token
-                let owner_token: String = match file.owner_token() {
-                    Some(token) => token.clone(),
-                    None => "?".into(),
-                };
-
-                // Define the cell values
-                let mut cells: Vec<String> =
-                    vec![format!("{}", i + 1), file.download_url(true).into(), expiry];
-                if matcher_main.verbose() {
-                    cells.push(owner_token);
-                }
-
-                // Add the row
-                table.add_row(Row::new(cells.into_iter().map(|c| Cell::new(&c)).collect()));
-            }
-
-            // Print the table
-            table.printstd();
-        } else {
-            files
-                .iter()
-                .for_each(|f| println!("{}", f.download_url(true)));
+            // Add the row
+            table.add_row(Row::new(vec![
+                Cell::new(&format!("{}", i + 1)),
+                Cell::new(file.download_url(true).as_str()),
+                Cell::new(&expiry),
+                Cell::new(&owner_token),
+            ]));
         }
 
+        // Print the table
+        table.printstd();
+
         Ok(())
     }
 }

src/action/info.rs

@@ -1,18 +1,41 @@
 use chrono::Duration;
 use clap::ArgMatches;
 use failure::Fail;
-use ffsend_api::action::exists::{Error as ExistsError, Exists as ApiExists};
-use ffsend_api::action::info::{Error as InfoError, Info as ApiInfo};
+use ffsend_api::action::exists::{
+    Error as ExistsError,
+    Exists as ApiExists,
+};
+use ffsend_api::action::info::{
+    Error as InfoError,
+    Info as ApiInfo,
+};
 use ffsend_api::action::metadata::Metadata as ApiMetadata;
-use ffsend_api::file::remote_file::{FileParseError, RemoteFile};
-use prettytable::{format::FormatBuilder, Cell, Row, Table};
+use ffsend_api::file::remote_file::{
+    FileParseError,
+    RemoteFile,
+};
+use ffsend_api::reqwest::Client;
+use prettytable::{
+    cell::Cell,
+    format::FormatBuilder,
+    row::Row,
+    Table,
+};
 
-use crate::client::create_config;
-use crate::cmd::matcher::{info::InfoMatcher, main::MainMatcher, Matcher};
+
+use cmd::matcher::{
+    Matcher,
+    info::InfoMatcher,
+    main::MainMatcher,
+};
 #[cfg(feature = "history")]
-use crate::history_tool;
-use crate::util::{
-    ensure_owner_token, ensure_password, format_bytes, format_duration, print_error,
+use history_tool;
+use util::{
+    ensure_owner_token,
+    ensure_password,
+    format_bytes,
+    format_duration,
+    print_error,
 };
 
 /// A file info action.
@@ -23,7 +46,9 @@ pub struct Info<'a> {
 impl<'a> Info<'a> {
     /// Construct a new info action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the info action.
@@ -37,16 +62,15 @@ impl<'a> Info<'a> {
         let url = matcher_info.url();
 
         // Create a reqwest client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.client(false);
+        let client = Client::new();
 
         // Parse the remote file based on the share URL, derive the owner token from history
         let mut file = RemoteFile::parse_url(url, matcher_info.owner())?;
         #[cfg(feature = "history")]
         history_tool::derive_file_properties(&matcher_main, &mut file);
 
-        // Ask the user to set the owner token for more detailed information
-        let has_owner = ensure_owner_token(file.owner_token_mut(), &matcher_main, true);
+        // Ensure the owner token is set
+        ensure_owner_token(file.owner_token_mut(), &matcher_main);
 
         // Check whether the file exists
         let exists = ApiExists::new(&file).invoke(&client)?;
@@ -58,38 +82,27 @@ impl<'a> Info<'a> {
             return Err(Error::Expired);
         }
 
-        // Get the password, ensure the password is set when required
+        // Get the password
         let mut password = matcher_info.password();
-        let has_password = ensure_password(
-            &mut password,
-            exists.requires_password(),
-            &matcher_main,
-            true,
-        );
+
+        // Ensure a password is set when required
+        ensure_password(&mut password, exists.has_password(), &matcher_main);
 
         // Fetch both file info and metadata
-        let info = if has_owner {
-            Some(ApiInfo::new(&file, None).invoke(&client)?)
-        } else {
-            None
-        };
-        let metadata = if has_password {
-            ApiMetadata::new(&file, password, false)
-                .invoke(&client)
-                .map_err(|err| {
-                    print_error(err.context("failed to fetch file metadata, showing limited info"))
-                })
-                .ok()
-        } else {
-            None
-        };
+        let info = ApiInfo::new(&file, None).invoke(&client)?;
+        let metadata = ApiMetadata::new(&file, password, false)
+            .invoke(&client)
+            .map_err(|err| print_error(err.context(
+                "failed to fetch file metadata, showing limited info",
+            )))
+            .ok();
 
-        // Update history file TTL if info is known
-        if let Some(info) = &info {
-            let ttl_millis = info.ttl_millis() as i64;
-            let ttl = Duration::milliseconds(ttl_millis);
-            file.set_expire_duration(ttl);
-        }
+        // Get the TTL duration
+        let ttl_millis = info.ttl_millis() as i64;
+        let ttl = Duration::milliseconds(ttl_millis);
+
+        // Update file properties
+        file.set_expire_duration(ttl);
 
         // Add the file to the history
         #[cfg(feature = "history")]
@@ -100,10 +113,13 @@ impl<'a> Info<'a> {
         table.set_format(FormatBuilder::new().padding(0, 2).build());
 
         // Add the ID
-        table.add_row(Row::new(vec![Cell::new("ID:"), Cell::new(file.id())]));
+        table.add_row(Row::new(vec![
+            Cell::new("ID:"),
+            Cell::new(file.id()),
+        ]));
 
-        // Show file metadata if available
-        if let Some(metadata) = &metadata {
+        // Metadata related details
+        if let Some(metadata) = metadata {
             // The file name
             table.add_row(Row::new(vec![
                 Cell::new("Name:"),
@@ -114,11 +130,13 @@ impl<'a> Info<'a> {
             let size = metadata.size();
             table.add_row(Row::new(vec![
                 Cell::new("Size:"),
-                Cell::new(&if size >= 1024 {
-                    format!("{} ({} B)", format_bytes(size), size)
-                } else {
-                    format_bytes(size)
-                }),
+                Cell::new(
+                    &if size >= 1024 {
+                        format!("{} ({} B)", format_bytes(size), size)
+                    } else {
+                        format_bytes(size)
+                    }
+                ),
             ]));
 
             // The file MIME
@@ -128,30 +146,23 @@ impl<'a> Info<'a> {
             ]));
         }
 
-        // Show file info if available
-        if let Some(info) = &info {
-            // The download count
-            table.add_row(Row::new(vec![
-                Cell::new("Downloads:"),
-                Cell::new(&format!(
-                    "{} of {}",
-                    info.download_count(),
-                    info.download_limit()
-                )),
-            ]));
+        // The download count
+        table.add_row(Row::new(vec![
+            Cell::new("Downloads:"),
+            Cell::new(&format!("{} of {}", info.download_count(), info.download_limit())),
+        ]));
 
-            // The time to live
-            let ttl_millis = info.ttl_millis() as i64;
-            let ttl = Duration::milliseconds(ttl_millis);
-            table.add_row(Row::new(vec![
-                Cell::new("Expiry:"),
-                Cell::new(&if ttl_millis >= 60 * 1000 {
+        // The time to live
+        table.add_row(Row::new(vec![
+            Cell::new("Expiry:"),
+            Cell::new(
+                &if ttl_millis >= 60 * 1000 {
                     format!("{} ({}s)", format_duration(&ttl), ttl.num_seconds())
                 } else {
                     format_duration(&ttl)
-                }),
-            ]));
-        }
+                }
+            ),
+        ]));
 
         // Print the info table
         table.printstd();

src/action/mod.rs

@@ -2,57 +2,9 @@ pub mod debug;
 pub mod delete;
 pub mod download;
 pub mod exists;
-pub mod generate;
 #[cfg(feature = "history")]
 pub mod history;
 pub mod info;
 pub mod params;
 pub mod password;
 pub mod upload;
-pub mod version;
-
-use ffsend_api::action::version::{Error as VersionError, Version as ApiVersion};
-use ffsend_api::api::DesiredVersion;
-use ffsend_api::client::Client;
-use ffsend_api::url::Url;
-
-use crate::config::API_VERSION_ASSUME;
-use crate::util::print_warning;
-
-/// Based on the given desired API version, select a version we can use.
-///
-/// If the current desired version is set to the `DesiredVersion::Lookup` variant, this method
-/// will look up the server API version. It it's `DesiredVersion::Use` it will return and
-/// attempt to use the specified version.
-fn select_api_version(
-    client: &Client,
-    host: Url,
-    desired: &mut DesiredVersion,
-) -> Result<(), VersionError> {
-    // Break if already specified
-    if let DesiredVersion::Use(_) = desired {
-        return Ok(());
-    }
-
-    // TODO: only lookup if `DesiredVersion::Assume` after first operation attempt failed
-
-    // Look up the version
-    match ApiVersion::new(host).invoke(&client) {
-        // Use the probed version
-        Ok(v) => *desired = DesiredVersion::Use(v),
-
-        // If unknown, just assume the default version
-        Err(VersionError::Unknown) => {
-            *desired = DesiredVersion::Use(API_VERSION_ASSUME);
-            print_warning(format!(
-                "server API version could not be determined, assuming v{}",
-                API_VERSION_ASSUME,
-            ));
-        }
-
-        // Propagate other errors
-        Err(e) => return Err(e),
-    }
-
-    Ok(())
-}

src/action/params.rs

@@ -1,14 +1,21 @@
 use clap::ArgMatches;
-use ffsend_api::action::params::{Error as ParamsError, Params as ApiParams, ParamsDataBuilder};
+use ffsend_api::action::params::{
+    Error as ParamsError,
+    Params as ApiParams,
+    ParamsDataBuilder,
+};
 use ffsend_api::file::remote_file::RemoteFile;
+use ffsend_api::reqwest::Client;
 
-use super::select_api_version;
-use crate::client::create_config;
-use crate::cmd::matcher::{main::MainMatcher, params::ParamsMatcher, Matcher};
-use crate::error::ActionError;
+use cmd::matcher::{
+    Matcher,
+    main::MainMatcher,
+    params::ParamsMatcher,
+};
+use error::ActionError;
 #[cfg(feature = "history")]
-use crate::history_tool;
-use crate::util::{ensure_owner_token, print_success};
+use history_tool;
+use util::{ensure_owner_token, print_success};
 
 /// A file parameters action.
 pub struct Params<'a> {
@@ -18,7 +25,9 @@ pub struct Params<'a> {
 impl<'a> Params<'a> {
     /// Construct a new parameters action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the parameters action.
@@ -28,22 +37,11 @@ impl<'a> Params<'a> {
         let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
         let matcher_params = ParamsMatcher::with(self.cmd_matches).unwrap();
 
-        // Get the share URL and the host
-        // TODO: derive host through helper function
+        // Get the share URL
         let url = matcher_params.url();
-        let mut host = url.clone();
-        host.set_path("");
-        host.set_query(None);
-        host.set_fragment(None);
 
         // Create a reqwest client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.client(false);
-
-        // Determine the API version to use
-        let mut desired_version = matcher_main.api();
-        select_api_version(&client, host, &mut desired_version)?;
-        let api_version = desired_version.version().unwrap();
+        let client = Client::new();
 
         // Parse the remote file based on the share URL, derive the owner token from history
         let mut file = RemoteFile::parse_url(url, matcher_params.owner())?;
@@ -51,18 +49,11 @@ impl<'a> Params<'a> {
         history_tool::derive_file_properties(&matcher_main, &mut file);
 
         // Ensure the owner token is set
-        ensure_owner_token(file.owner_token_mut(), &matcher_main, false);
-
-        // We don't authenticate for now
-        let auth = false;
+        ensure_owner_token(file.owner_token_mut(), &matcher_main);
 
         // Build the parameters data object
         let data = ParamsDataBuilder::default()
-            .download_limit(
-                matcher_params
-                    .download_limit(&matcher_main, api_version, auth)
-                    .map(|d| d as u8),
-            )
+            .download_limit(matcher_params.download_limit())
             .build()
             .unwrap();
 

src/action/password.rs

@@ -1,14 +1,20 @@
 use clap::ArgMatches;
-use ffsend_api::action::password::{Error as PasswordError, Password as ApiPassword};
+use ffsend_api::action::password::{
+    Error as PasswordError,
+    Password as ApiPassword,
+};
 use ffsend_api::file::remote_file::RemoteFile;
-use prettytable::{format::FormatBuilder, Cell, Row, Table};
+use ffsend_api::reqwest::Client;
 
-use crate::client::create_config;
-use crate::cmd::matcher::{main::MainMatcher, password::PasswordMatcher, Matcher};
-use crate::error::ActionError;
+use cmd::matcher::{
+    main::MainMatcher,
+    Matcher,
+    password::PasswordMatcher,
+};
+use error::ActionError;
 #[cfg(feature = "history")]
-use crate::history_tool;
-use crate::util::{ensure_owner_token, print_success};
+use history_tool;
+use util::{ensure_owner_token, print_success};
 
 /// A file password action.
 pub struct Password<'a> {
@@ -18,7 +24,9 @@ pub struct Password<'a> {
 impl<'a> Password<'a> {
     /// Construct a new password action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the password action.
@@ -32,8 +40,7 @@ impl<'a> Password<'a> {
         let url = matcher_password.url();
 
         // Create a reqwest client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.client(false);
+        let client = Client::new();
 
         // Parse the remote file based on the share URL, derive the owner token from history
         let mut file = RemoteFile::parse_url(url, matcher_password.owner())?;
@@ -41,13 +48,14 @@ impl<'a> Password<'a> {
         history_tool::derive_file_properties(&matcher_main, &mut file);
 
         // Ensure the owner token is set
-        ensure_owner_token(file.owner_token_mut(), &matcher_main, false);
-
-        // Get the password to use and whether it was generated
-        let (password, password_generated) = matcher_password.password();
+        ensure_owner_token(file.owner_token_mut(), &matcher_main);
 
         // Execute an password action
-        let result = ApiPassword::new(&file, &password, None).invoke(&client);
+        let result = ApiPassword::new(
+            &file,
+            &matcher_password.password(),
+            None,
+        ).invoke(&client);
         if let Err(PasswordError::Expired) = result {
             // Remove the file from the history if expired
             #[cfg(feature = "history")]
@@ -59,17 +67,6 @@ impl<'a> Password<'a> {
         #[cfg(feature = "history")]
         history_tool::add(&matcher_main, file, true);
 
-        // Print the passphrase if one was generated
-        if password_generated {
-            let mut table = Table::new();
-            table.set_format(FormatBuilder::new().padding(0, 2).build());
-            table.add_row(Row::new(vec![
-                Cell::new("Passphrase:"),
-                Cell::new(&password),
-            ]));
-            table.printstd();
-        }
-
         // Print a success message
         print_success("Password set");
 

src/action/upload.rs

@@ -1,42 +1,49 @@
-use std::env::current_dir;
-use std::fs;
-use std::io::{Error as IoError, Write};
+use std::fs::File;
+#[cfg(feature = "archive")]
+use std::io::Error as IoError;
 use std::path::Path;
-#[cfg(feature = "archive")]
-use std::path::PathBuf;
-#[cfg(feature = "archive")]
-use std::process::exit;
 use std::sync::{Arc, Mutex};
 
 use clap::ArgMatches;
 use failure::Fail;
 use ffsend_api::action::params::ParamsDataBuilder;
-use ffsend_api::action::upload::{Error as UploadError, Upload as ApiUpload};
-use ffsend_api::action::version::Error as VersionError;
-use ffsend_api::config::{upload_size_max, UPLOAD_SIZE_MAX_RECOMMENDED};
-use ffsend_api::pipe::ProgressReporter;
-use pathdiff::diff_paths;
-use prettytable::{format::FormatBuilder, Cell, Row, Table};
-#[cfg(feature = "qrcode")]
-use qr2term::print_qr;
-use tempfile::{Builder as TempBuilder, NamedTempFile};
-
-use super::select_api_version;
-#[cfg(feature = "archive")]
-use crate::archive::archiver::Archiver;
-use crate::client::create_config;
-use crate::cmd::matcher::{MainMatcher, Matcher, UploadMatcher};
-#[cfg(feature = "history")]
-use crate::history_tool;
-use crate::progress::ProgressBar;
-#[cfg(feature = "urlshorten")]
-use crate::urlshorten;
-#[cfg(feature = "clipboard")]
-use crate::util::set_clipboard;
-use crate::util::{
-    format_bytes, open_url, print_error, print_error_msg, prompt_yes, quit, quit_error_msg,
-    rand_alphanum_string, stdin_read_file, ErrorHintsBuilder, StdinErr,
+use ffsend_api::action::upload::{
+    Error as UploadError,
+    Upload as ApiUpload,
 };
+use ffsend_api::config::{UPLOAD_SIZE_MAX, UPLOAD_SIZE_MAX_RECOMMENDED};
+use ffsend_api::reader::ProgressReporter;
+use ffsend_api::reqwest::Client;
+use prettytable::{
+    cell::Cell,
+    format::FormatBuilder,
+    row::Row,
+    Table,
+};
+#[cfg(feature = "archive")]
+use tempfile::{
+    Builder as TempBuilder,
+    NamedTempFile,
+};
+
+#[cfg(feature = "archive")]
+use archive::archiver::Archiver;
+use cmd::matcher::{Matcher, MainMatcher, UploadMatcher};
+#[cfg(feature = "history")]
+use history_tool;
+use progress::ProgressBar;
+use util::{
+    ErrorHintsBuilder,
+    format_bytes,
+    open_url,
+    print_error,
+    print_error_msg,
+    prompt_yes,
+    quit,
+    quit_error_msg,
+};
+#[cfg(feature = "clipboard")]
+use util::set_clipboard;
 
 /// A file upload action.
 pub struct Upload<'a> {
@@ -46,7 +53,9 @@ pub struct Upload<'a> {
 impl<'a> Upload<'a> {
     /// Construct a new upload action.
     pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
+        Self {
+            cmd_matches,
+        }
     }
 
     /// Invoke the upload action.
@@ -56,93 +65,93 @@ impl<'a> Upload<'a> {
         let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
         let matcher_upload = UploadMatcher::with(self.cmd_matches).unwrap();
 
+        // Get API parameters
+        #[allow(unused_mut)]
+        let mut path = Path::new(matcher_upload.file()).to_path_buf();
+        let host = matcher_upload.host();
+
+        // TODO: ensure the file exists and is accessible
+
+        // Get the file size to warn about large files
+        if let Ok(size) = File::open(&path)
+            .and_then(|f| f.metadata())
+            .map(|m| m.len())
+        {
+            if size > UPLOAD_SIZE_MAX && !matcher_main.force() {
+                // The file is too large, show an error and quit
+                quit_error_msg(
+                    format!(
+                        "the file size is {}, bigger than the maximum allowed of {}",
+                        format_bytes(size),
+                        format_bytes(UPLOAD_SIZE_MAX),
+                    ),
+                    ErrorHintsBuilder::default()
+                        .force(true)
+                        .verbose(false)
+                        .build()
+                        .unwrap(),
+                );
+            } else if size > UPLOAD_SIZE_MAX_RECOMMENDED && !matcher_main.force() {
+                // The file is larger than the recommended maximum, warn
+                eprintln!(
+                    "The file size is {}, bigger than the recommended maximum of {}",
+                    format_bytes(size),
+                    format_bytes(UPLOAD_SIZE_MAX_RECOMMENDED),
+                );
+
+                // Prompt the user to continue, quit if the user answered no
+                if !prompt_yes("Continue uploading?", Some(true), &matcher_main) {
+                    println!("Upload cancelled");
+                    quit();
+                }
+            }
+        } else {
+            print_error_msg("failed to check the file size, ignoring");
+        }
+
+        // Create a reqwest client
+        let client = Client::new();
+
+        // Create a progress bar reporter
+        let progress_bar = Arc::new(Mutex::new(ProgressBar::new_upload()));
+
+        // Build a parameters object to set for the file
+        let params = {
+            // Build the parameters data object
+            let mut params = ParamsDataBuilder::default()
+                .download_limit(matcher_upload.download_limit())
+                .build()
+                .unwrap();
+
+            // Wrap the data in an option if not empty
+            if params.is_empty() {
+                None
+            } else {
+                Some(params)
+            }
+        };
+
         // The file name to use
         #[allow(unused_mut)]
         let mut file_name = matcher_upload.name().map(|s| s.to_owned());
 
-        // The selected files
-        let mut files = matcher_upload.files();
-
-        // If file is `-`, upload from stdin
-        // TODO: write stdin directly to file, or directly to upload buffer
-        let mut tmp_stdin: Option<NamedTempFile> = None;
-        if files.len() == 1 && files[0] == "-" {
-            // Obtain data from stdin
-            let data = stdin_read_file(!matcher_main.quiet()).map_err(Error::Stdin)?;
-
-            // Create temporary stdin buffer file
-            tmp_stdin = Some(
-                TempBuilder::new()
-                    .prefix(&format!(".{}-stdin-", crate_name!()))
-                    .tempfile()
-                    .map_err(Error::StdinTempFile)?,
-            );
-            let file = tmp_stdin.as_ref().unwrap();
-
-            // Fill temporary file with data, update list of files we upload, suggest name
-            file.as_file()
-                .write_all(&data)
-                .map_err(Error::StdinTempFile)?;
-            files = vec![file
-                .path()
-                .to_str()
-                .expect("failed to obtain file name for stdin buffer file")];
-            file_name = file_name.or_else(|| Some("stdin.txt".into()));
-        }
-
-        // Get API parameters
-        #[allow(unused_mut)]
-        let mut paths: Vec<_> = files
-            .into_iter()
-            .map(|p| Path::new(p).to_path_buf())
-            .collect();
-        let mut path = Path::new(paths.first().unwrap()).to_path_buf();
-        let host = matcher_upload.host();
-
-        // All paths must exist
-        // TODO: ensure the file exists and is accessible
-        for path in &paths {
-            if !path.exists() {
-                quit_error_msg(
-                    format!("the path '{}' does not exist", path.to_str().unwrap_or("?")),
-                    ErrorHintsBuilder::default().build().unwrap(),
-                );
-            }
-        }
-
         // A temporary archive file, only used when archiving
         // The temporary file is stored here, to ensure it's lifetime exceeds the upload process
         #[allow(unused_mut)]
         #[cfg(feature = "archive")]
         let mut tmp_archive: Option<NamedTempFile> = None;
 
-        #[cfg(feature = "archive")]
-        {
-            // Determine whether to archive, we must archive for multiple files/directory
+        #[cfg(feature = "archive")] {
+            // Determine whether to archive, ask if a directory was selected
             let mut archive = matcher_upload.archive();
-            if !archive {
-                if paths.len() > 1 {
-                    if prompt_yes(
-                        "You've selected multiple files, only a single file may be uploaded.\n\
-                         Archive the files into a single file?",
-                        Some(true),
-                        &matcher_main,
-                    ) {
-                        archive = true;
-                    } else {
-                        exit(1);
-                    }
-                } else if path.is_dir() {
-                    if prompt_yes(
-                        "You've selected a directory, only a single file may be uploaded.\n\
-                         Archive the directory into a single file?",
-                        Some(true),
-                        &matcher_main,
-                    ) {
-                        archive = true;
-                    } else {
-                        exit(1);
-                    }
+            if !archive && path.is_dir() {
+                if prompt_yes(
+                    "You've selected a directory, only a single file may be uploaded.\n\
+                        Archive the directory into a single file?",
+                    Some(true),
+                    &matcher_main,
+                ) {
+                    archive = true;
                 }
             }
 
@@ -157,297 +166,72 @@ impl<'a> Upload<'a> {
                         .prefix(&format!(".{}-archive-", crate_name!()))
                         .suffix(archive_extention)
                         .tempfile()
-                        .map_err(ArchiveError::TempFile)?,
+                        .map_err(ArchiveError::TempFile)?
                 );
                 if let Some(tmp_archive) = &tmp_archive {
                     // Get the path, and the actual file
                     let archive_path = tmp_archive.path().to_path_buf();
-                    let archive_file = tmp_archive
-                        .as_file()
+                    let archive_file = tmp_archive.as_file()
                         .try_clone()
                         .map_err(ArchiveError::CloneHandle)?;
 
                     // Select the file name to use if not set
                     if file_name.is_none() {
-                        // Derive name from given file
-                        if paths.len() == 1 {
-                            file_name = Some(
-                                path.canonicalize()
-                                    .map_err(|err| ArchiveError::FileName(Some(err)))?
-                                    .file_name()
-                                    .ok_or(ArchiveError::FileName(None))?
-                                    .to_str()
-                                    .map(|s| s.to_owned())
-                                    .ok_or(ArchiveError::FileName(None))?,
-                            );
-                        } else {
-                            // Unable to derive file name from paths, generate random
-                            file_name = Some(format!("ffsend-archive-{}", rand_alphanum_string(8)));
-                        }
+                        file_name = Some(
+                            path.canonicalize()
+                                .map_err(|err| ArchiveError::FileName(Some(err)))?
+                                .file_name()
+                                .ok_or(ArchiveError::FileName(None))?
+                                .to_str()
+                                .map(|s| s.to_owned())
+                                .ok_or(ArchiveError::FileName(None))?
+                        );
                     }
 
-                    // Get the current working directory, including working directory as highest possible root, canonicalize it
-                    let working_dir =
-                        current_dir().expect("failed to get current working directory");
-                    let shared_dir = {
-                        let mut paths = paths.clone();
-                        paths.push(working_dir.clone());
-                        match shared_dir(paths) {
-                            Some(p) => p,
-                            None => quit_error_msg(
-                                "when archiving, all files must be within a same directory",
-                                ErrorHintsBuilder::default().verbose(false).build().unwrap(),
-                            ),
-                        }
-                    };
-
-                    // Build an archiver, append each file
+                    // Build an archiver and append the file
                     let mut archiver = Archiver::new(archive_file);
-                    for path in &paths {
-                        // Canonicalize the path
-                        let mut path = Path::new(path).to_path_buf();
-                        if let Ok(p) = path.canonicalize() {
-                            path = p;
-                        }
-
-                        // Find relative name to share dir, used to derive name from
-                        let name = diff_paths(&path, &shared_dir)
-                            .expect("failed to determine relative path of file to archive");
-                        let name = name.to_str().expect("failed to get file path");
-
-                        // Add file to archiver
-                        archiver
-                            .append_path(name, &path)
-                            .map_err(ArchiveError::AddFile)?;
-                    }
+                    archiver.append_path(file_name.as_ref().unwrap(), &path)
+                        .map_err(ArchiveError::AddFile)?;
 
                     // Finish the archival process, writes the archive file
                     archiver.finish().map_err(ArchiveError::Write)?;
 
-                    // Append archive extension to name, set to upload archived file
+                    // Append archive extention to name, set to upload archived file
                     if let Some(ref mut file_name) = file_name {
                         file_name.push_str(archive_extention);
                     }
                     path = archive_path;
-                    paths.clear();
                 }
             }
         }
 
-        // Quit with error when uploading multiple files or directory, if we cannot archive
-        #[cfg(not(feature = "archive"))]
-        {
-            if paths.len() > 1 {
-                quit_error_msg(
-                    "uploading multiple files is not supported, ffsend must be compiled with 'archive' feature for this",
-                    ErrorHintsBuilder::default()
-                        .verbose(false)
-                        .build()
-                        .unwrap(),
-                );
-            }
-            if path.is_dir() {
-                quit_error_msg(
-                    "uploading a directory is not supported, ffsend must be compiled with 'archive' feature for this",
-                    ErrorHintsBuilder::default()
-                        .verbose(false)
-                        .build()
-                        .unwrap(),
-                );
-            }
-        }
-
-        // Create a reqwest client capable for uploading files
-        let client_config = create_config(&matcher_main);
-        let client = client_config.clone().client(false);
-
-        // Determine the API version to use
-        let mut desired_version = matcher_main.api();
-        select_api_version(&client, host.clone(), &mut desired_version)?;
-        let api_version = desired_version.version().unwrap();
-
-        // We do not authenticate for now
-        let auth = false;
-
-        // TODO: extract this into external function
-        {
-            // Determine the max file size
-            // TODO: set false parameter to authentication state
-            let max_size = upload_size_max(api_version, auth);
-
-            // Get the file size, fail on empty files, warn about large files
-            if let Ok(size) = path.metadata().map(|m| m.len()) {
-                // Enforce files not being 0 bytes
-                if size == 0 && !matcher_main.force() {
-                    quit_error_msg(
-                        "uploading a file with a size of 0 bytes is not supported",
-                        ErrorHintsBuilder::default()
-                            .force(true)
-                            .verbose(false)
-                            .build()
-                            .unwrap(),
-                    )
-                }
-
-                // Enforce maximum file size
-                if size > max_size && !matcher_main.force() {
-                    // The file is too large, show an error and quit
-                    quit_error_msg(
-                        format!(
-                            "the file size is {}, bigger than the maximum allowed of {}",
-                            format_bytes(size),
-                            format_bytes(max_size),
-                        ),
-                        ErrorHintsBuilder::default()
-                            .force(true)
-                            .verbose(false)
-                            .build()
-                            .unwrap(),
-                    );
-                }
-
-                // Enforce maximum recommended size
-                if size > UPLOAD_SIZE_MAX_RECOMMENDED && !matcher_main.force() {
-                    // The file is larger than the recommended maximum, warn
-                    eprintln!(
-                        "The file size is {}, bigger than the recommended maximum of {}",
-                        format_bytes(size),
-                        format_bytes(UPLOAD_SIZE_MAX_RECOMMENDED),
-                    );
-
-                    // Prompt the user to continue, quit if the user answered no
-                    if !prompt_yes("Continue uploading?", Some(true), &matcher_main) {
-                        eprintln!("Upload cancelled");
-                        quit();
-                    }
-                }
-            } else {
-                print_error_msg("failed to check the file size, ignoring");
-            }
-        }
-
-        // TODO: assert max expiry time for file
-
-        // Create a reqwest client capable for uploading files
-        let transfer_client = client_config.client(true);
-
-        // Create a progress bar reporter
-        let progress_bar = Arc::new(Mutex::new(ProgressBar::new_upload()));
-
-        // Build a parameters object to set for the file
-        let params = {
-            // Build the parameters data object
-            let params = ParamsDataBuilder::default()
-                .download_limit(
-                    matcher_upload
-                        .download_limit(&matcher_main, api_version, auth)
-                        .map(|d| d as u8),
-                )
-                .expiry_time(matcher_upload.expiry_time(&matcher_main, api_version, auth))
-                .build()
-                .unwrap();
-
-            // Wrap the data in an option if not empty
-            if params.is_empty() {
-                None
-            } else {
-                Some(params)
-            }
-        };
-
         // Build the progress reporter
-        let progress_reporter: Arc<Mutex<dyn ProgressReporter>> = progress_bar;
+        let progress_reporter: Arc<Mutex<ProgressReporter>> = progress_bar;
 
-        // Get the password to use and whether it was generated
-        let password = matcher_upload.password();
-        let (password, password_generated) =
-            password.map(|(p, g)| (Some(p), g)).unwrap_or((None, false));
-
-        // Execute an upload action, obtain the URL
-        let reporter = if !matcher_main.quiet() {
-            Some(&progress_reporter)
-        } else {
-            None
-        };
+        // Execute an upload action
         let file = ApiUpload::new(
-            api_version,
             host,
             path.clone(),
             file_name,
-            password.clone(),
+            matcher_upload.password(),
             params,
-        )
-        .invoke(&transfer_client, reporter)?;
-        #[allow(unused_mut)]
-        let mut url = file.download_url(true);
+        ).invoke(&client, &progress_reporter)?;
 
-        // Shorten the share URL if requested, prompt the user to confirm
-        #[cfg(feature = "urlshorten")]
-        {
-            if matcher_upload.shorten() {
-                if prompt_yes("URL shortening is a security risk. This shares the secret URL with a 3rd party.\nDo you want to shorten the share URL?", Some(false), &matcher_main) {
-                    match urlshorten::shorten_url(&client, &url) {
-                        Ok(short) => url = short,
-                        Err(err) => print_error(
-                            err.context("failed to shorten share URL, ignoring")
-                                .compat(),
-                        ),
-                    }
-                }
-            }
-        }
-
-        // Report the result
-        if !matcher_main.quiet() {
-            // Create a table
-            let mut table = Table::new();
-            table.set_format(FormatBuilder::new().padding(0, 2).build());
-
-            // Show the original URL when shortening, verbose and different
-            #[cfg(feature = "urlshorten")]
-            {
-                let full_url = file.download_url(true);
-                if matcher_main.verbose() && matcher_upload.shorten() && url != full_url {
-                    table.add_row(Row::new(vec![
-                        Cell::new("Full share link:"),
-                        Cell::new(full_url.as_str()),
-                    ]));
-                }
-            }
-
-            if matcher_main.verbose() {
-                // Show the share URL
-                table.add_row(Row::new(vec![
-                    Cell::new("Share link:"),
-                    Cell::new(url.as_str()),
-                ]));
-
-                // Show a generate passphrase
-                if password_generated {
-                    table.add_row(Row::new(vec![
-                        Cell::new("Passphrase:"),
-                        Cell::new(&password.unwrap_or("?".into())),
-                    ]));
-                }
-
-                // Show the owner token
-                table.add_row(Row::new(vec![
-                    Cell::new("Owner token:"),
-                    Cell::new(file.owner_token().unwrap()),
-                ]));
-            } else {
-                table.add_row(Row::new(vec![Cell::new(url.as_str())]));
-
-                // Show a generate passphrase
-                if password_generated {
-                    table.add_row(Row::new(vec![Cell::new(&password.unwrap_or("?".into()))]));
-                }
-            }
-
-            table.printstd();
-        } else {
-            println!("{}", url);
+        // Get the download URL, and report it in the console in a table
+        let url = file.download_url(true);
+        let mut table = Table::new();
+        table.set_format(FormatBuilder::new().padding(0, 2).build());
+        table.add_row(Row::new(vec![
+            Cell::new("Share link:"),
+            Cell::new(url.as_str()),
+        ]));
+        if matcher_main.verbose() {
+            table.add_row(Row::new(vec![
+                Cell::new("Owner token:"),
+                Cell::new(file.owner_token().unwrap()),
+            ]));
         }
+        table.printstd();
 
         // Add the file to the history manager
         #[cfg(feature = "history")]
@@ -456,157 +240,38 @@ impl<'a> Upload<'a> {
         // Open the URL in the browser
         if matcher_upload.open() {
             if let Err(err) = open_url(&url) {
-                print_error(err.context("failed to open the share link in the browser"));
+                print_error(
+                    err.context("failed to open the share link in the browser")
+                );
             };
         }
 
-        // Copy the URL or command to the user's clipboard
-        #[cfg(feature = "clipboard")]
-        {
-            if let Some(copy_mode) = matcher_upload.copy() {
-                if let Err(err) = set_clipboard(copy_mode.build(url.as_str())) {
-                    print_error(
-                        err.context("failed to copy the share link to the clipboard, ignoring"),
-                    );
+        // Copy the URL in the user's clipboard
+        #[cfg(feature = "clipboard")] {
+            if matcher_upload.copy() {
+                if let Err(err) = set_clipboard(url.as_str().to_owned()) {
+                    print_error(err.context("failed to copy the share link to the clipboard, ignoring"));
                 }
             }
         }
 
-        // Print a QR code for the share URL
-        #[cfg(feature = "qrcode")]
-        {
-            if matcher_upload.qrcode() {
-                if let Err(err) = print_qr(url.as_str()) {
-                    print_error(err.context("failed to print QR code, ignoring").compat());
-                }
-            }
-        }
-
-        // Close the temporary stdin buffer file, to ensure it's removed
-        if let Some(tmp_stdin) = tmp_stdin.take() {
-            if let Err(err) = tmp_stdin.close() {
-                print_error(
-                    err.context("failed to clean up temporary stdin buffer file, ignoring")
-                        .compat(),
-                );
-            }
-        }
-
-        #[cfg(feature = "archive")]
-        {
+        #[cfg(feature = "archive")] {
             // Close the temporary zip file, to ensure it's removed
             if let Some(tmp_archive) = tmp_archive.take() {
                 if let Err(err) = tmp_archive.close() {
                     print_error(
-                        err.context("failed to clean up temporary archive file, ignoring")
-                            .compat(),
+                        err.context("failed to clean up temporary archive file, ignoring").compat(),
                     );
                 }
             }
         }
 
-        // Delete local files after uploading
-        if matcher_upload.delete() {
-            for path in &paths {
-                if path.is_file() {
-                    if let Err(err) = fs::remove_file(path) {
-                        print_error(
-                            Error::Delete(err)
-                                .context("failed to delete local file after upload, ignoring")
-                                .compat(),
-                        );
-                    }
-                } else {
-                    if let Err(err) = fs::remove_dir_all(path) {
-                        print_error(
-                            Error::Delete(err)
-                                .context("failed to delete local directory after upload, ignoring")
-                                .compat(),
-                        );
-                    }
-                }
-            }
-        }
-
         Ok(())
     }
 }
 
-/// Find the deepest directory all given paths share.
-///
-/// This function canonicalizes the paths, make sure the paths exist.
-///
-/// Returns `None` if paths are using a different root.
-///
-/// # Examples
-///
-/// If the following paths are given:
-///
-/// - `/home/user/git/ffsend/src`
-/// - `/home/user/git/ffsend/src/main.rs`
-/// - `/home/user/git/ffsend/Cargo.toml`
-///
-/// The following is returned:
-///
-/// `/home/user/git/ffsend`
-#[cfg(feature = "archive")]
-fn shared_dir(paths: Vec<PathBuf>) -> Option<PathBuf> {
-    // Any path must be given
-    if paths.is_empty() {
-        return None;
-    }
-
-    // Build vector
-    let c: Vec<Vec<PathBuf>> = paths
-        .into_iter()
-        .map(|p| p.canonicalize().expect("failed to canonicalize path"))
-        .map(|mut p| {
-            // Start with parent if current path is file
-            if p.is_file() {
-                p = match p.parent() {
-                    Some(p) => p.to_path_buf(),
-                    None => return vec![],
-                };
-            }
-
-            // Build list of path buffers for each path component
-            let mut items = vec![p];
-            #[allow(mutable_borrow_reservation_conflict)]
-            while let Some(item) = items.last().unwrap().parent() {
-                items.push(item.to_path_buf());
-            }
-
-            // Reverse as we built it in the wrong order
-            items.reverse();
-            items
-        })
-        .collect();
-
-    // Find the index at which the paths are last shared at by walking through indices
-    let i = (0..)
-        .take_while(|i| {
-            // Get path for first item, stop if none
-            let base = &c[0].get(*i);
-            if base.is_none() {
-                return false;
-            };
-
-            // All other paths must equal at this index
-            c.iter().skip(1).all(|p| &p.get(*i) == base)
-        })
-        .last();
-
-    // Find the shared path
-    i.map(|i| c[0][i].to_path_buf())
-}
-
 #[derive(Debug, Fail)]
 pub enum Error {
-    /// Selecting the API version to use failed.
-    // TODO: enable `api` hint!
-    #[fail(display = "failed to select API version to use")]
-    Version(#[cause] VersionError),
-
     /// An error occurred while archiving the file to upload.
     #[cfg(feature = "archive")]
     #[fail(display = "failed to archive file to upload")]
@@ -615,24 +280,6 @@ pub enum Error {
     /// An error occurred while uploading the file.
     #[fail(display = "")]
     Upload(#[cause] UploadError),
-
-    /// An error occurred while deleting a local file after upload.
-    #[fail(display = "failed to delete local file")]
-    Delete(#[cause] IoError),
-
-    /// An error occurred while reading data from stdin.
-    #[fail(display = "failed to read data from stdin")]
-    Stdin(#[cause] StdinErr),
-
-    /// An error occurred while creating the temporary stdin file.
-    #[fail(display = "failed to create temporary stdin buffer file")]
-    StdinTempFile(#[cause] IoError),
-}
-
-impl From<VersionError> for Error {
-    fn from(err: VersionError) -> Error {
-        Error::Version(err)
-    }
 }
 
 #[cfg(feature = "archive")]

src/action/version.rs

@@ -1,60 +0,0 @@
-use clap::ArgMatches;
-use ffsend_api::action::version::{Error as VersionError, Version as ApiVersion};
-
-use crate::client::create_config;
-use crate::cmd::matcher::main::MainMatcher;
-use crate::cmd::matcher::{version::VersionMatcher, Matcher};
-use crate::error::ActionError;
-
-/// A file version action.
-pub struct Version<'a> {
-    cmd_matches: &'a ArgMatches<'a>,
-}
-
-impl<'a> Version<'a> {
-    /// Construct a new version action.
-    pub fn new(cmd_matches: &'a ArgMatches<'a>) -> Self {
-        Self { cmd_matches }
-    }
-
-    /// Invoke the version action.
-    // TODO: create a trait for this method
-    pub fn invoke(&self) -> Result<(), ActionError> {
-        // Create the command matchers
-        let matcher_version = VersionMatcher::with(self.cmd_matches).unwrap();
-        let matcher_main = MainMatcher::with(self.cmd_matches).unwrap();
-
-        // Get the host
-        let host = matcher_version.host();
-
-        // Create a reqwest client
-        let client_config = create_config(&matcher_main);
-        let client = client_config.client(false);
-
-        // Make sure the file version
-        let response = ApiVersion::new(host).invoke(&client);
-
-        // Print the result
-        match response {
-            Ok(v) => println!("API version: {}", v),
-            Err(VersionError::Unknown) => println!("Version: unknown"),
-            Err(VersionError::Unsupported(v)) => println!("Version: {} (unsupported)", v),
-            Err(e) => return Err(e.into()),
-        }
-
-        Ok(())
-    }
-}
-
-#[derive(Debug, Fail)]
-pub enum Error {
-    /// An error occurred while attempting to determine the Send server version.
-    #[fail(display = "failed to check the server version")]
-    Version(#[cause] VersionError),
-}
-
-impl From<VersionError> for Error {
-    fn from(err: VersionError) -> Error {
-        Error::Version(err)
-    }
-}

src/archive/archive.rs

@@ -1,7 +1,10 @@
-use std::io::{Error as IoError, Read};
+use std::io::{
+    Error as IoError,
+    Read,
+};
 use std::path::Path;
 
-use tar::Archive as TarArchive;
+use super::tar::Archive as TarArchive;
 
 pub type Result<T> = ::std::result::Result<T, IoError>;
 

src/archive/archiver.rs

@@ -1,8 +1,11 @@
 use std::fs::File;
-use std::io::{Error as IoError, Write};
+use std::io::{
+    Error as IoError,
+    Write,
+};
 use std::path::Path;
 
-use tar::Builder as TarBuilder;
+use super::tar::Builder as TarBuilder;
 
 pub type Result<T> = ::std::result::Result<T, IoError>;
 
@@ -26,9 +29,9 @@ impl<W: Write> Archiver<W> {
     ///
     /// If no entry exists at the given `src_path`, an error is returned.
     pub fn append_path<P, Q>(&mut self, path: P, src_path: Q) -> Result<()>
-    where
-        P: AsRef<Path>,
-        Q: AsRef<Path>,
+        where
+            P: AsRef<Path>,
+            Q: AsRef<Path>,
     {
         // Append the path as file or directory
         if src_path.as_ref().is_file() {
@@ -43,8 +46,8 @@ impl<W: Write> Archiver<W> {
 
     /// Append a file to the archive builder.
     pub fn append_file<P>(&mut self, path: P, file: &mut File) -> Result<()>
-    where
-        P: AsRef<Path>,
+        where
+            P: AsRef<Path>,
     {
         self.inner.append_file(path, file)
     }
@@ -52,9 +55,9 @@ impl<W: Write> Archiver<W> {
     /// Append a directory to the archive builder.
     // TODO: Define a flag to add recursively or not
     pub fn append_dir<P, Q>(&mut self, path: P, src_path: Q) -> Result<()>
-    where
-        P: AsRef<Path>,
-        Q: AsRef<Path>,
+        where
+            P: AsRef<Path>,
+            Q: AsRef<Path>,
     {
         self.inner.append_dir_all(path, src_path)
     }

src/archive/mod.rs

@@ -1,2 +1,4 @@
+extern crate tar;
+
 pub mod archive;
 pub mod archiver;

src/client.rs

@@ -1,29 +0,0 @@
-use std::time::Duration;
-
-use ffsend_api::client::{ClientConfig, ClientConfigBuilder};
-
-use crate::cmd::matcher::MainMatcher;
-
-/// Create a client configuration for ffsend actions.
-///
-/// A client configuration allows you to build a client, which must be passed to ffsend API
-/// actions.
-// TODO: properly handle errors, do not unwrap
-pub fn create_config(matcher_main: &MainMatcher) -> ClientConfig {
-    // TODO: configure HTTP authentication properties
-    ClientConfigBuilder::default()
-        .timeout(to_duration(matcher_main.timeout()))
-        .transfer_timeout(to_duration(matcher_main.transfer_timeout()))
-        .basic_auth(matcher_main.basic_auth())
-        .build()
-        .expect("failed to create network client configuration")
-}
-
-/// Convert the given number of seconds into an optional duration, used for clients.
-pub fn to_duration(secs: u64) -> Option<Duration> {
-    if secs > 0 {
-        Some(Duration::from_secs(secs))
-    } else {
-        None
-    }
-}

src/cmd/arg/api.rs

@@ -1,65 +0,0 @@
-use clap::{Arg, ArgMatches};
-use ffsend_api::api::{DesiredVersion, Version};
-
-use super::{CmdArg, CmdArgOption};
-use crate::config::API_VERSION_DESIRED_DEFAULT;
-use crate::util::{quit_error_msg, ErrorHints};
-
-/// The api argument.
-pub struct ArgApi {}
-
-impl CmdArg for ArgApi {
-    fn name() -> &'static str {
-        "api"
-    }
-
-    fn build<'b, 'c>() -> Arg<'b, 'c> {
-        Arg::with_name("api")
-            .long("api")
-            .short("A")
-            .value_name("VERSION")
-            .env("FFSEND_API")
-            .hide_env_values(true)
-            .global(true)
-            .help("Server API version to use, '-' to lookup")
-            .long_help(
-                "Server API version to use, one of:\n\
-                 2, 3: Send API versions\n\
-                 auto, -: probe server to determine\
-                 ",
-            )
-    }
-}
-
-impl<'a> CmdArgOption<'a> for ArgApi {
-    type Value = DesiredVersion;
-
-    fn value<'b: 'a>(matches: &'a ArgMatches<'b>) -> Self::Value {
-        // Get the version string
-        let version = match Self::value_raw(matches) {
-            Some(version) => version,
-            None => return API_VERSION_DESIRED_DEFAULT,
-        };
-
-        // Parse the lookup version string
-        if is_auto(version) {
-            return DesiredVersion::Lookup;
-        }
-
-        // Parse the given API version
-        match Version::parse(version) {
-            Ok(version) => DesiredVersion::Use(version),
-            Err(_) => quit_error_msg(
-                "failed to determine given server API version, version unknown",
-                ErrorHints::default(),
-            ),
-        }
-    }
-}
-
-/// Check whether the given API version argument means we've to probe the server for the proper
-/// version.
-fn is_auto(arg: &str) -> bool {
-    let arg = arg.trim().to_lowercase();
-    arg == "a" || arg == "auto" || arg == "-"
-}

src/cmd/arg/basic_auth.rs

@@ -1,44 +0,0 @@
-use clap::{Arg, ArgMatches};
-
-use super::{CmdArg, CmdArgOption};
-
-/// The basicauth argument.
-pub struct ArgBasicAuth {}
-
-impl CmdArg for ArgBasicAuth {
-    fn name() -> &'static str {
-        "basic-auth"
-    }
-
-    fn build<'b, 'c>() -> Arg<'b, 'c> {
-        Arg::with_name("basic-auth")
-            .long("basic-auth")
-            .alias("basic-authentication")
-            .alias("http-basic-authentication")
-            .alias("http-basic-auth")
-            .value_name("USER:PASSWORD")
-            .env("FFSEND_BASIC_AUTH")
-            .hide_env_values(true)
-            .global(true)
-            .help("Protected proxy HTTP basic authentication credentials (not FxA)")
-    }
-}
-
-impl<'a> CmdArgOption<'a> for ArgBasicAuth {
-    type Value = Option<(String, Option<String>)>;
-
-    fn value<'b: 'a>(matches: &'a ArgMatches<'b>) -> Self::Value {
-        // Get the authentication credentials
-        let raw = match Self::value_raw(matches) {
-            Some(raw) => raw,
-            None => return None,
-        };
-
-        // Split the properties
-        let mut iter = raw.splitn(2, ':');
-        Some((
-            iter.next().unwrap_or("").to_owned(),
-            iter.next().map(|pass| pass.to_owned()),
-        ))
-    }
-}

src/cmd/arg/download_limit.rs

@@ -1,60 +1,15 @@
 use clap::{Arg, ArgMatches};
-use ffsend_api::api::Version as ApiVersion;
-use ffsend_api::config::downloads_max;
+use ffsend_api::action::params::{
+    PARAMS_DOWNLOAD_MIN as DOWNLOAD_MIN,
+    PARAMS_DOWNLOAD_MAX as DOWNLOAD_MAX,
+};
 
 use super::{CmdArg, CmdArgFlag, CmdArgOption};
-use crate::cmd::matcher::MainMatcher;
-use crate::util::{highlight, prompt_yes, quit};
+
+use util::{ErrorHintsBuilder, quit_error_msg};
 
 /// The download limit argument.
-pub struct ArgDownloadLimit {}
-
-impl ArgDownloadLimit {
-    pub fn value_checked<'a>(
-        matches: &ArgMatches<'a>,
-        main_matcher: &MainMatcher,
-        api_version: ApiVersion,
-        auth: bool,
-    ) -> Option<usize> {
-        // Get the download value
-        let mut downloads = Self::value(matches)?;
-
-        // Get number of allowed downloads, return if allowed or when forcing
-        let allowed = downloads_max(api_version, auth);
-        if allowed.contains(&downloads) || main_matcher.force() {
-            return Some(downloads);
-        }
-
-        // Prompt the user the specified downloads limit is invalid
-        let allowed_str = allowed
-            .iter()
-            .map(|value| format!("{}", value))
-            .collect::<Vec<_>>()
-            .join(", ");
-        eprintln!("The downloads limit must be one of: {}", allowed_str);
-        if auth {
-            eprintln!("Use '{}' to force", highlight("--force"));
-        } else {
-            eprintln!(
-                "Use '{}' to force, authenticate for higher limits",
-                highlight("--force")
-            );
-        }
-
-        // Ask to use closest limit, quit if user cancelled
-        let closest = closest(allowed, downloads);
-        if !prompt_yes(
-            &format!("Would you like to limit downloads to {} instead?", closest),
-            None,
-            main_matcher,
-        ) {
-            quit();
-        }
-        downloads = closest;
-
-        Some(downloads)
-    }
-}
+pub struct ArgDownloadLimit { }
 
 impl CmdArg for ArgDownloadLimit {
     fn name() -> &'static str {
@@ -68,34 +23,38 @@ impl CmdArg for ArgDownloadLimit {
             .alias("downloads")
             .alias("download")
             .value_name("COUNT")
-            .env("FFSEND_DOWNLOAD_LIMIT")
             .help("The file download limit")
     }
 }
 
-impl CmdArgFlag for ArgDownloadLimit {}
+impl CmdArgFlag for ArgDownloadLimit { }
 
 impl<'a> CmdArgOption<'a> for ArgDownloadLimit {
-    type Value = Option<usize>;
+    type Value = Option<u8>;
 
     fn value<'b: 'a>(matches: &'a ArgMatches<'b>) -> Self::Value {
         // TODO: do not unwrap, report an error
-        Self::value_raw(matches).map(|d| d.parse::<usize>().expect("invalid download limit"))
+        Self::value_raw(matches)
+            .map(|d| d.parse::<u8>().expect("invalid download limit"))
+            .and_then(|d| {
+                // Check the download limit bounds
+                // TODO: somehow allow to force a different number here
+                if d < DOWNLOAD_MIN || d > DOWNLOAD_MAX {
+                    quit_error_msg(
+                        format!(
+                            "invalid download limit, must be between {} and {}",
+                            DOWNLOAD_MIN,
+                            DOWNLOAD_MAX,
+                        ),
+                        ErrorHintsBuilder::default()
+                            .force(false)
+                            .verbose(false)
+                            .build()
+                            .unwrap(),
+                    );
+                }
+
+                Some(d)
+            })
     }
 }
-
-/// Find the closest value to `current` in the given `values` range.
-fn closest(values: &[usize], current: usize) -> usize {
-    // Own the values, sort and reverse, start with biggest first
-    let mut values = values.to_vec();
-    values.sort_unstable();
-
-    // Find the closest value, return it
-    *values
-        .iter()
-        .rev()
-        .map(|value| (value, (current as i64 - *value as i64).abs()))
-        .min_by_key(|value| value.1)
-        .expect("failed to find closest value, none given")
-        .0
-}

src/cmd/arg/expiry_time.rs

@@ -1,97 +0,0 @@
-use chrono::Duration;
-use clap::{Arg, ArgMatches};
-use failure::Fail;
-use ffsend_api::api::Version as ApiVersion;
-use ffsend_api::config::expiry_max;
-
-use super::{CmdArg, CmdArgFlag, CmdArgOption};
-use crate::cmd::matcher::MainMatcher;
-use crate::util::{
-    format_duration, highlight, parse_duration, prompt_yes, quit, quit_error, ErrorHints,
-};
-
-/// The download limit argument.
-pub struct ArgExpiryTime {}
-
-impl ArgExpiryTime {
-    pub fn value_checked<'a>(
-        matches: &ArgMatches<'a>,
-        main_matcher: &MainMatcher,
-        api_version: ApiVersion,
-        auth: bool,
-    ) -> Option<usize> {
-        // Get the expiry time value
-        let mut expiry = Self::value(matches)?;
-
-        // Get expiry time, return if allowed or when forcing
-        let max = *expiry_max(api_version, auth).into_iter().max().unwrap();
-        if expiry <= max || main_matcher.force() {
-            return Some(expiry);
-        }
-
-        // Define function to format seconds
-        let format_secs = |secs: usize| format_duration(Duration::seconds(secs as i64));
-
-        // Prompt the user the specified expiry time is invalid
-        eprintln!(
-            "The expiry time must equal to or less than: {}",
-            format_secs(max),
-        );
-        if auth {
-            eprintln!("Use '{}' to force", highlight("--force"));
-        } else {
-            eprintln!(
-                "Use '{}' to force, authenticate for higher limits",
-                highlight("--force")
-            );
-        }
-
-        // Ask to use maximum expiry time instead, quit if user cancelled
-        if !prompt_yes(
-            &format!(
-                "Would you like to set expiry time to {} instead?",
-                format_secs(max),
-            ),
-            None,
-            main_matcher,
-        ) {
-            quit();
-        }
-        expiry = max;
-
-        Some(expiry)
-    }
-}
-
-impl CmdArg for ArgExpiryTime {
-    fn name() -> &'static str {
-        "expiry-time"
-    }
-
-    fn build<'b, 'c>() -> Arg<'b, 'c> {
-        Arg::with_name("expiry-time")
-            .long("expiry-time")
-            .short("e")
-            .alias("expire")
-            .alias("expiry")
-            .value_name("TIME")
-            .env("FFSEND_EXPIRY_TIME")
-            .help("The file expiry time")
-    }
-}
-
-impl CmdArgFlag for ArgExpiryTime {}
-
-impl<'a> CmdArgOption<'a> for ArgExpiryTime {
-    type Value = Option<usize>;
-
-    fn value<'b: 'a>(matches: &'a ArgMatches<'b>) -> Self::Value {
-        Self::value_raw(matches).map(|t| match parse_duration(t) {
-            Ok(seconds) => seconds,
-            Err(err) => quit_error(
-                err.context("specified invalid file expiry time"),
-                ErrorHints::default(),
-            ),
-        })
-    }
-}

src/cmd/arg/gen_passphrase.rs

@@ -1,34 +0,0 @@
-use chbs;
-use clap::Arg;
-
-use super::{CmdArg, CmdArgFlag};
-
-/// The passphrase generation argument.
-pub struct ArgGenPassphrase {}
-
-impl ArgGenPassphrase {
-    /// Generate a cryptographically secure passphrase that is easily
-    /// remembered using diceware.
-    pub fn gen_passphrase() -> String {
-        chbs::passphrase()
-    }
-}
-
-impl CmdArg for ArgGenPassphrase {
-    fn name() -> &'static str {
-        "gen-passphrase"
-    }
-
-    fn build<'b, 'c>() -> Arg<'b, 'c> {
-        Arg::with_name("gen-passphrase")
-            .long("gen-passphrase")
-            .alias("gen-password")
-            .alias("generate-passphrase")
-            .alias("generate-password")
-            .short("P")
-            .conflicts_with("password")
-            .help("Protect the file with a generated passphrase")
-    }
-}
-
-impl CmdArgFlag for ArgGenPassphrase {}

src/cmd/arg/host.rs

@@ -1,13 +1,14 @@
 use clap::{Arg, ArgMatches};
 use failure::Fail;
+use ffsend_api::config::SEND_DEFAULT_HOST;
 use ffsend_api::url::Url;
 
+use host::parse_host;
 use super::{CmdArg, CmdArgOption};
-use crate::host::parse_host;
-use crate::util::{quit_error, ErrorHints};
+use util::{ErrorHints, quit_error};
 
 /// The host argument.
-pub struct ArgHost {}
+pub struct ArgHost { }
 
 impl CmdArg for ArgHost {
     fn name() -> &'static str {
@@ -19,7 +20,7 @@ impl CmdArg for ArgHost {
             .long("host")
             .short("h")
             .value_name("URL")
-            .default_value("https://send.vis.ee/")
+            .default_value(SEND_DEFAULT_HOST)
             .env("FFSEND_HOST")
             .hide_env_values(true)
             .help("The remote host to upload to")

src/cmd/arg/mod.rs

@@ -1,19 +1,11 @@
-pub mod api;
-pub mod basic_auth;
 pub mod download_limit;
-pub mod expiry_time;
-pub mod gen_passphrase;
 pub mod host;
 pub mod owner;
 pub mod password;
 pub mod url;
 
-// Re-export to arg module
-pub use self::api::ArgApi;
-pub use self::basic_auth::ArgBasicAuth;
+// Reexport to arg module
 pub use self::download_limit::ArgDownloadLimit;
-pub use self::expiry_time::ArgExpiryTime;
-pub use self::gen_passphrase::ArgGenPassphrase;
 pub use self::host::ArgHost;
 pub use self::owner::ArgOwner;
 pub use self::password::ArgPassword;
@@ -53,6 +45,5 @@ pub trait CmdArgOption<'a>: CmdArg {
 
     /// Get the raw argument value, as a string reference.
     fn value_raw<'b: 'a>(matches: &'a ArgMatches<'b>) -> Option<&'a str> {
-        matches.value_of(Self::name())
-    }
+        matches.value_of(Self::name()) }
 }

src/cmd/arg/owner.rs

@@ -1,11 +1,11 @@
 use clap::{Arg, ArgMatches};
 
+use cmd::matcher::{MainMatcher, Matcher};
 use super::{CmdArg, CmdArgFlag, CmdArgOption};
-use crate::cmd::matcher::{MainMatcher, Matcher};
-use crate::util::prompt_owner_token;
+use util::prompt_owner_token;
 
 /// The owner argument.
-pub struct ArgOwner {}
+pub struct ArgOwner { }
 
 impl CmdArg for ArgOwner {
     fn name() -> &'static str {
@@ -24,7 +24,7 @@ impl CmdArg for ArgOwner {
     }
 }
 
-impl CmdArgFlag for ArgOwner {}
+impl CmdArgFlag for ArgOwner { }
 
 impl<'a> CmdArgOption<'a> for ArgOwner {
     type Value = Option<String>;
@@ -37,7 +37,7 @@ impl<'a> CmdArgOption<'a> for ArgOwner {
 
         // Get the owner token from the argument if set
         match Self::value_raw(matches) {
-            None => {}
+            None => {},
             p => return p.map(|p| p.into()),
         }
 
@@ -45,7 +45,6 @@ impl<'a> CmdArgOption<'a> for ArgOwner {
         let matcher_main = MainMatcher::with(matches).unwrap();
 
         // Prompt for the owner token
-        // TODO: should this be optional?
-        Some(prompt_owner_token(&matcher_main, false))
+        Some(prompt_owner_token(&matcher_main))
     }
 }

src/cmd/arg/password.rs

@@ -1,11 +1,11 @@
 use clap::{Arg, ArgMatches};
 
+use cmd::matcher::{MainMatcher, Matcher};
 use super::{CmdArg, CmdArgFlag, CmdArgOption};
-use crate::cmd::matcher::{MainMatcher, Matcher};
-use crate::util::{check_empty_password, prompt_password};
+use util::{check_empty_password, prompt_password};
 
 /// The password argument.
-pub struct ArgPassword {}
+pub struct ArgPassword { }
 
 impl CmdArg for ArgPassword {
     fn name() -> &'static str {
@@ -23,7 +23,7 @@ impl CmdArg for ArgPassword {
     }
 }
 
-impl CmdArgFlag for ArgPassword {}
+impl CmdArgFlag for ArgPassword { }
 
 impl<'a> CmdArgOption<'a> for ArgPassword {
     type Value = Option<String>;
@@ -40,7 +40,7 @@ impl<'a> CmdArgOption<'a> for ArgPassword {
         // Get the password argument value, or prompt
         let password = match Self::value_raw(matches) {
             Some(password) => password.into(),
-            None => prompt_password(&matcher_main, false).unwrap(),
+            None => prompt_password(&matcher_main),
         };
 
         // Check for empty passwords

src/cmd/arg/url.rs

@@ -2,12 +2,12 @@ use clap::{Arg, ArgMatches};
 use failure::Fail;
 use ffsend_api::url::Url;
 
+use host::parse_host;
 use super::{CmdArg, CmdArgOption};
-use crate::host::parse_host;
-use crate::util::{quit_error, ErrorHints};
+use util::{ErrorHints, quit_error};
 
 /// The URL argument.
-pub struct ArgUrl {}
+pub struct ArgUrl { }
 
 impl CmdArg for ArgUrl {
     fn name() -> &'static str {

src/cmd/handler.rs

@@ -1,29 +1,34 @@
-#[cfg(feature = "infer-command")]
-use std::ffi::OsString;
+extern crate directories;
 
 use clap::{App, AppSettings, Arg, ArgMatches};
 
-use super::arg::{ArgApi, ArgBasicAuth, CmdArg};
+use super::matcher::{
+    DebugMatcher,
+    DeleteMatcher,
+    DownloadMatcher,
+    ExistsMatcher,
+    InfoMatcher,
+    Matcher,
+    ParamsMatcher,
+    PasswordMatcher,
+    UploadMatcher,
+};
 #[cfg(feature = "history")]
 use super::matcher::HistoryMatcher;
-use super::matcher::{
-    DebugMatcher, DeleteMatcher, DownloadMatcher, ExistsMatcher, GenerateMatcher, InfoMatcher,
-    Matcher, ParamsMatcher, PasswordMatcher, UploadMatcher, VersionMatcher,
+use super::subcmd::{
+    CmdDebug,
+    CmdDelete,
+    CmdDownload,
+    CmdExists,
+    CmdInfo,
+    CmdParams,
+    CmdPassword,
+    CmdUpload,
 };
 #[cfg(feature = "history")]
 use super::subcmd::CmdHistory;
-use super::subcmd::{
-    CmdDebug, CmdDelete, CmdDownload, CmdExists, CmdGenerate, CmdInfo, CmdParams, CmdPassword,
-    CmdUpload, CmdVersion,
-};
-#[cfg(feature = "infer-command")]
-use crate::config::INFER_COMMANDS;
-use crate::config::{CLIENT_TIMEOUT, CLIENT_TRANSFER_TIMEOUT};
 #[cfg(feature = "history")]
-use crate::util::app_history_file_path_string;
-#[cfg(feature = "infer-command")]
-use crate::util::bin_name;
-use crate::util::parse_duration;
+use util::app_history_file_path_string;
 
 #[cfg(feature = "history")]
 lazy_static! {
@@ -31,23 +36,6 @@ lazy_static! {
     static ref DEFAULT_HISTORY_FILE: String = app_history_file_path_string();
 }
 
-lazy_static! {
-    /// The default client timeout in seconds as a string
-    static ref DEFAULT_TIMEOUT: String = format!("{}", CLIENT_TIMEOUT);
-
-    /// The default client transfer timeout in seconds as a string
-    static ref DEFAULT_TRANSFER_TIMEOUT: String = format!("{}", CLIENT_TRANSFER_TIMEOUT);
-
-    /// The about notice in command output.
-    static ref APP_ABOUT: String = format!(
-        "{}\n\n\
-            The default public Send host is provided by Tim Visee, @timvisee.\n\
-            Please consider to donate and help keep it running: https://vis.ee/donate\
-            ",
-        crate_description!(),
-    );
-}
-
 /// CLI argument handler.
 pub struct Handler<'a> {
     /// The CLI matches.
@@ -61,134 +49,67 @@ impl<'a: 'b, 'b> Handler<'a> {
         let app = App::new(crate_name!())
             .version(crate_version!())
             .author(crate_authors!())
-            .about(APP_ABOUT.as_ref())
-            .after_help("This application is not affiliated with Firefox or Mozilla.")
+            .about(crate_description!())
+            .after_help("\
+                The public Send service that is used as default host is provided by Mozilla.\n\
+                This application is not affiliated with Mozilla, Firefox or Firefox Send.\
+            ")
             .global_setting(AppSettings::GlobalVersion)
             .global_setting(AppSettings::VersionlessSubcommands)
             // TODO: enable below command when it doesn't break `p` anymore.
             // .global_setting(AppSettings::InferSubcommands)
-            .arg(
-                Arg::with_name("force")
-                    .long("force")
-                    .short("f")
-                    .global(true)
-                    .help("Force the action, ignore warnings"),
-            )
-            .arg(
-                Arg::with_name("no-interact")
-                    .long("no-interact")
-                    .short("I")
-                    .alias("no-interactive")
-                    .alias("non-interactive")
-                    .global(true)
-                    .help("Not interactive, do not prompt"),
-            )
-            .arg(
-                Arg::with_name("yes")
-                    .long("yes")
-                    .short("y")
-                    .alias("assume-yes")
-                    .global(true)
-                    .help("Assume yes for prompts"),
-            )
-            .arg(
-                Arg::with_name("timeout")
-                    .long("timeout")
-                    .short("t")
-                    .alias("time")
-                    .global(true)
-                    .value_name("SECONDS")
-                    .help("Request timeout (0 to disable)")
-                    .default_value(&DEFAULT_TIMEOUT)
-                    .hide_default_value(true)
-                    .env("FFSEND_TIMEOUT")
-                    .hide_env_values(true)
-                    .validator(|arg| {
-                        parse_duration(&arg).map(drop).map_err(|_| {
-                            String::from(
-                            "Timeout time must be a positive number of seconds, or 0 to disable."
-                        )
-                        })
-                    }),
-            )
-            .arg(
-                Arg::with_name("transfer-timeout")
-                    .long("transfer-timeout")
-                    .short("T")
-                    .alias("trans-time")
-                    .alias("trans-timeout")
-                    .alias("transfer-time")
-                    .alias("time-trans")
-                    .alias("timeout-trans")
-                    .alias("time-transfer")
-                    .global(true)
-                    .value_name("SECONDS")
-                    .help("Transfer timeout (0 to disable)")
-                    .default_value(&DEFAULT_TRANSFER_TIMEOUT)
-                    .hide_default_value(true)
-                    .env("FFSEND_TRANSFER_TIMEOUT")
-                    .hide_env_values(true)
-                    .validator(|arg| {
-                        parse_duration(&arg).map(drop).map_err(|_| {
-                            String::from(
-                            "Timeout time must be a positive number of seconds, or 0 to disable."
-                        )
-                        })
-                    }),
-            )
-            .arg(
-                Arg::with_name("quiet")
-                    .long("quiet")
-                    .short("q")
-                    .global(true)
-                    .help("Produce output suitable for logging and automation"),
-            )
-            .arg(
-                Arg::with_name("verbose")
-                    .long("verbose")
-                    .short("v")
-                    .multiple(true)
-                    .global(true)
-                    .help("Enable verbose information and logging"),
-            )
-            .arg(ArgApi::build())
-            .arg(ArgBasicAuth::build())
+            .arg(Arg::with_name("force")
+                .long("force")
+                .short("f")
+                .global(true)
+                .help("Force the action, ignore warnings"))
+            .arg(Arg::with_name("no-interact")
+                .long("no-interact")
+                .short("I")
+                .alias("no-interactive")
+                .global(true)
+                .help("Not interactive, do not prompt"))
+            .arg(Arg::with_name("yes")
+                .long("yes")
+                .short("y")
+                .alias("assume-yes")
+                .global(true)
+                .help("Assume yes for prompts"))
+            .arg(Arg::with_name("verbose")
+                .long("verbose")
+                .short("v")
+                .multiple(true)
+                .global(true)
+                .help("Enable verbose information and logging"))
             .subcommand(CmdDebug::build())
             .subcommand(CmdDelete::build())
             .subcommand(CmdDownload::build().display_order(2))
             .subcommand(CmdExists::build())
-            .subcommand(CmdGenerate::build())
             .subcommand(CmdInfo::build())
             .subcommand(CmdParams::build())
             .subcommand(CmdPassword::build())
-            .subcommand(CmdUpload::build().display_order(1))
-            .subcommand(CmdVersion::build());
+            .subcommand(CmdUpload::build().display_order(1));
 
         // With history support, a flag for the history file and incognito mode
         #[cfg(feature = "history")]
-        let app = app
-            .arg(
-                Arg::with_name("history")
-                    .long("history")
-                    .short("H")
-                    .value_name("FILE")
-                    .global(true)
-                    .help("Use the specified history file")
-                    .default_value(&DEFAULT_HISTORY_FILE)
-                    .hide_default_value(true)
-                    .env("FFSEND_HISTORY")
-                    .hide_env_values(true),
-            )
-            .arg(
-                Arg::with_name("incognito")
-                    .long("incognito")
-                    .short("i")
-                    .alias("incog")
-                    .alias("private")
-                    .alias("priv")
-                    .global(true)
-                    .help("Don't update local history for actions"),
-            )
+        let app = app.arg(Arg::with_name("history")
+                .long("history")
+                .short("H")
+                .value_name("FILE")
+                .global(true)
+                .help("Use the specified history file")
+                .default_value(&DEFAULT_HISTORY_FILE)
+                .hide_default_value(true)
+                .env("FFSEND_HISTORY")
+                .hide_env_values(true))
+            .arg(Arg::with_name("incognito")
+                .long("incognito")
+                .short("i")
+                .alias("incog")
+                .alias("private")
+                .alias("priv")
+                .global(true)
+                .help("Don't update local history for actions"))
             .subcommand(CmdHistory::build());
 
         // Disable color usage if compiled without color support
@@ -200,40 +121,9 @@ impl<'a: 'b, 'b> Handler<'a> {
 
     /// Parse CLI arguments.
     pub fn parse() -> Handler<'a> {
-        // Obtain the program arguments
-        #[allow(unused_mut)]
-        let mut args: Vec<_> = ::std::env::args_os().collect();
-
-        // Infer subcommand based on binary name
-        #[cfg(feature = "infer-command")]
-        Self::infer_subcommand(&mut args);
-
         // Build the application CLI definition, get the matches
         Handler {
-            matches: Handler::build().get_matches_from(args),
-        }
-    }
-
-    /// Infer subcommand when the binary has a predefined name,
-    /// modifying the given program arguments.
-    ///
-    /// If no subcommand could be inferred, the `args` list leaves unchanged.
-    /// See `crate::config::INFER_COMMANDS` for a list of commands.
-    ///
-    /// When the `ffsend` binary is called with such a name, the corresponding subcommand is
-    /// automatically inserted as argument. This also works when calling binaries through symbolic
-    /// or hard links.
-    #[cfg(feature = "infer-command")]
-    fn infer_subcommand(args: &mut Vec<OsString>) {
-        // Get the name of the called binary
-        let name = bin_name();
-
-        // Infer subcommands
-        for (bin, subcmd) in INFER_COMMANDS.iter() {
-            if &name == bin {
-                args.insert(1, subcmd.into());
-                break;
-            }
+            matches: Handler::build().get_matches(),
         }
     }
 
@@ -262,11 +152,6 @@ impl<'a: 'b, 'b> Handler<'a> {
         ExistsMatcher::with(&self.matches)
     }
 
-    /// Get the generate sub command, if matched.
-    pub fn generate(&'a self) -> Option<GenerateMatcher> {
-        GenerateMatcher::with(&self.matches)
-    }
-
     /// Get the history sub command, if matched.
     #[cfg(feature = "history")]
     pub fn history(&'a self) -> Option<HistoryMatcher> {
@@ -292,9 +177,4 @@ impl<'a: 'b, 'b> Handler<'a> {
     pub fn upload(&'a self) -> Option<UploadMatcher> {
         UploadMatcher::with(&self.matches)
     }
-
-    /// Get the version sub command, if matched.
-    pub fn version(&'a self) -> Option<VersionMatcher> {
-        VersionMatcher::with(&self.matches)
-    }
 }

src/cmd/matcher/debug.rs

@@ -1,8 +1,8 @@
 use clap::ArgMatches;
 use ffsend_api::url::Url;
 
+use cmd::arg::{ArgHost, CmdArgOption};
 use super::Matcher;
-use crate::cmd::arg::{ArgHost, CmdArgOption};
 
 /// The debug command matcher.
 pub struct DebugMatcher<'a> {
@@ -22,8 +22,11 @@ impl<'a: 'b, 'b> DebugMatcher<'a> {
 
 impl<'a> Matcher<'a> for DebugMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("debug")
-            .map(|matches| DebugMatcher { matches })
+        matches.subcommand_matches("debug")
+            .map(|matches|
+                 DebugMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/delete.rs

@@ -1,8 +1,8 @@
 use clap::ArgMatches;
 use ffsend_api::url::Url;
 
+use cmd::arg::{ArgOwner, ArgUrl, CmdArgOption};
 use super::Matcher;
-use crate::cmd::arg::{ArgOwner, ArgUrl, CmdArgOption};
 
 /// The delete command matcher.
 pub struct DeleteMatcher<'a> {
@@ -22,14 +22,18 @@ impl<'a: 'b, 'b> DeleteMatcher<'a> {
     /// Get the owner token.
     pub fn owner(&'a self) -> Option<String> {
         // TODO: just return a string reference here?
-        ArgOwner::value(self.matches).map(|token| token.to_owned())
+        ArgOwner::value(self.matches)
+            .map(|token| token.to_owned())
     }
 }
 
 impl<'a> Matcher<'a> for DeleteMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("delete")
-            .map(|matches| DeleteMatcher { matches })
+        matches.subcommand_matches("delete")
+            .map(|matches|
+                 DeleteMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/download.rs

@@ -3,10 +3,10 @@ use std::path::PathBuf;
 use clap::ArgMatches;
 use ffsend_api::url::Url;
 
+use cmd::arg::{ArgPassword, ArgUrl, CmdArgOption};
 use super::Matcher;
-use crate::cmd::arg::{ArgPassword, ArgUrl, CmdArgOption};
 #[cfg(feature = "archive")]
-use crate::util::env_var_present;
+use util::env_var_present;
 
 /// The download command matcher.
 pub struct DownloadMatcher<'a> {
@@ -23,17 +23,6 @@ impl<'a: 'b, 'b> DownloadMatcher<'a> {
         ArgUrl::value(self.matches)
     }
 
-    /// Guess the file share host, based on the file share URL.
-    ///
-    /// See `Self::url`.
-    pub fn guess_host(&'a self, url: Option<Url>) -> Url {
-        let mut url = url.unwrap_or(self.url());
-        url.set_path("");
-        url.set_query(None);
-        url.set_fragment(None);
-        url
-    }
-
     /// Get the password.
     /// `None` is returned if no password was specified.
     pub fn password(&'a self) -> Option<String> {
@@ -44,8 +33,7 @@ impl<'a: 'b, 'b> DownloadMatcher<'a> {
     /// If a directory is given, the file name of the original uploaded file
     /// will be used.
     pub fn output(&'a self) -> PathBuf {
-        self.matches
-            .value_of("output")
+        self.matches.value_of("output")
             .map(PathBuf::from)
             .unwrap_or_else(|| PathBuf::from("./"))
     }
@@ -59,8 +47,11 @@ impl<'a: 'b, 'b> DownloadMatcher<'a> {
 
 impl<'a> Matcher<'a> for DownloadMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("download")
-            .map(|matches| DownloadMatcher { matches })
+        matches.subcommand_matches("download")
+            .map(|matches|
+                 DownloadMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/exists.rs

@@ -2,8 +2,8 @@ use ffsend_api::url::Url;
 
 use clap::ArgMatches;
 
+use cmd::arg::{ArgUrl, CmdArgOption};
 use super::Matcher;
-use crate::cmd::arg::{ArgUrl, CmdArgOption};
 
 /// The exists command matcher.
 pub struct ExistsMatcher<'a> {
@@ -23,8 +23,11 @@ impl<'a: 'b, 'b> ExistsMatcher<'a> {
 
 impl<'a> Matcher<'a> for ExistsMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("exists")
-            .map(|matches| ExistsMatcher { matches })
+        matches.subcommand_matches("exists")
+            .map(|matches|
+                 ExistsMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/generate/completions.rs

@@ -1,64 +0,0 @@
-use std::path::PathBuf;
-use std::str::FromStr;
-
-use clap::{ArgMatches, Shell};
-
-use super::Matcher;
-
-/// The completions completions command matcher.
-pub struct CompletionsMatcher<'a> {
-    matches: &'a ArgMatches<'a>,
-}
-
-impl<'a: 'b, 'b> CompletionsMatcher<'a> {
-    /// Get the shells to generate completions for.
-    pub fn shells(&'a self) -> Vec<Shell> {
-        // Get the raw list of shells
-        let raw = self
-            .matches
-            .values_of("SHELL")
-            .expect("no shells were given");
-
-        // Parse the list of shell names, deduplicate
-        let mut shells: Vec<_> = raw
-            .into_iter()
-            .map(|name| name.trim().to_lowercase())
-            .map(|name| {
-                if name == "all" {
-                    Shell::variants()
-                        .iter()
-                        .map(|name| name.to_string())
-                        .collect()
-                } else {
-                    vec![name]
-                }
-            })
-            .flatten()
-            .collect();
-        shells.sort_unstable();
-        shells.dedup();
-
-        // Parse the shell names
-        shells
-            .into_iter()
-            .map(|name| Shell::from_str(&name).expect("failed to parse shell name"))
-            .collect()
-    }
-
-    /// The target directory to output the shell completion files to.
-    pub fn output(&'a self) -> PathBuf {
-        self.matches
-            .value_of("output")
-            .map(PathBuf::from)
-            .unwrap_or_else(|| PathBuf::from("./"))
-    }
-}
-
-impl<'a> Matcher<'a> for CompletionsMatcher<'a> {
-    fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("generate")?
-            .subcommand_matches("completions")
-            .map(|matches| CompletionsMatcher { matches })
-    }
-}

src/cmd/matcher/generate/mod.rs

@@ -1,29 +0,0 @@
-pub mod completions;
-
-use clap::ArgMatches;
-
-use super::Matcher;
-use completions::CompletionsMatcher;
-
-/// The generate command matcher.
-pub struct GenerateMatcher<'a> {
-    root: &'a ArgMatches<'a>,
-    _matches: &'a ArgMatches<'a>,
-}
-
-impl<'a: 'b, 'b> GenerateMatcher<'a> {
-    /// Get the generate completions sub command, if matched.
-    pub fn matcher_completions(&'a self) -> Option<CompletionsMatcher> {
-        CompletionsMatcher::with(&self.root)
-    }
-}
-
-impl<'a> Matcher<'a> for GenerateMatcher<'a> {
-    fn with(root: &'a ArgMatches) -> Option<Self> {
-        root.subcommand_matches("generate")
-            .map(|matches| GenerateMatcher {
-                root,
-                _matches: matches,
-            })
-    }
-}

src/cmd/matcher/history.rs

@@ -1,10 +1,6 @@
 use clap::ArgMatches;
-use failure::Fail;
-use ffsend_api::url::Url;
 
 use super::Matcher;
-use crate::host::parse_host;
-use crate::util::{quit_error, ErrorHints};
 
 /// The history command matcher.
 pub struct HistoryMatcher<'a> {
@@ -12,36 +8,13 @@ pub struct HistoryMatcher<'a> {
     matches: &'a ArgMatches<'a>,
 }
 
-impl<'a> HistoryMatcher<'a> {
-    /// Check whether to clear all history.
-    pub fn clear(&self) -> bool {
-        self.matches.is_present("clear")
-    }
-
-    /// Check whether to remove a given entry from the history.
-    ///
-    /// This method parses the URL into an `Url`.
-    /// If the given URL is invalid,
-    /// the program will quit with an error message.
-    pub fn rm(&'a self) -> Option<Url> {
-        // Get the URL
-        let url = self.matches.value_of("rm")?;
-
-        // Parse the URL
-        match parse_host(&url) {
-            Ok(url) => Some(url),
-            Err(err) => quit_error(
-                err.context("failed to parse the given share URL"),
-                ErrorHints::default(),
-            ),
-        }
-    }
-}
-
 impl<'a> Matcher<'a> for HistoryMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("history")
-            .map(|matches| HistoryMatcher { matches })
+        matches.subcommand_matches("history")
+            .map(|matches|
+                 HistoryMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/info.rs

@@ -2,8 +2,8 @@ use ffsend_api::url::Url;
 
 use clap::ArgMatches;
 
+use cmd::arg::{ArgOwner, ArgPassword, ArgUrl, CmdArgOption};
 use super::Matcher;
-use crate::cmd::arg::{ArgOwner, ArgPassword, ArgUrl, CmdArgOption};
 
 /// The info command matcher.
 pub struct InfoMatcher<'a> {
@@ -23,7 +23,8 @@ impl<'a: 'b, 'b> InfoMatcher<'a> {
     /// Get the owner token.
     pub fn owner(&'a self) -> Option<String> {
         // TODO: just return a string reference here?
-        ArgOwner::value(self.matches).map(|token| token.to_owned())
+        ArgOwner::value(self.matches)
+            .map(|token| token.to_owned())
     }
 
     /// Get the password.
@@ -35,8 +36,11 @@ impl<'a: 'b, 'b> InfoMatcher<'a> {
 
 impl<'a> Matcher<'a> for InfoMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("info")
-            .map(|matches| InfoMatcher { matches })
+        matches.subcommand_matches("info")
+            .map(|matches|
+                 InfoMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/main.rs

@@ -2,13 +2,11 @@
 use std::path::PathBuf;
 
 use clap::ArgMatches;
-use ffsend_api::api::DesiredVersion;
 
 use super::Matcher;
-use crate::cmd::arg::{ArgApi, ArgBasicAuth, CmdArgOption};
-use crate::util::{env_var_present, parse_duration};
+use util::env_var_present;
 #[cfg(feature = "history")]
-use crate::util::{quit_error_msg, ErrorHintsBuilder};
+use util::{ErrorHintsBuilder, quit_error_msg};
 
 /// The main command matcher.
 pub struct MainMatcher<'a> {
@@ -31,21 +29,12 @@ impl<'a: 'b, 'b> MainMatcher<'a> {
         self.matches.is_present("yes") || env_var_present("FFSEND_YES")
     }
 
-    /// Get the desired API version to use.
-    pub fn api(&'a self) -> DesiredVersion {
-        ArgApi::value(self.matches)
-    }
-
-    /// Get basic HTTP authentication credentials to use.
-    pub fn basic_auth(&'a self) -> Option<(String, Option<String>)> {
-        ArgBasicAuth::value(self.matches)
-    }
-
     /// Get the history file to use.
     #[cfg(feature = "history")]
     pub fn history(&self) -> PathBuf {
         // Get the path
-        let path = self.matches.value_of("history").map(PathBuf::from);
+        let path = self.matches.value_of("history")
+            .map(PathBuf::from);
 
         // Ensure the path is correct
         match path {
@@ -61,33 +50,12 @@ impl<'a: 'b, 'b> MainMatcher<'a> {
         }
     }
 
-    /// Get the timeout in seconds
-    pub fn timeout(&self) -> u64 {
-        self.matches
-            .value_of("timeout")
-            .and_then(|arg| parse_duration(arg).ok())
-            .expect("invalid timeout value") as u64
-    }
-
-    /// Get the transfer timeout in seconds
-    pub fn transfer_timeout(&self) -> u64 {
-        self.matches
-            .value_of("transfer-timeout")
-            .and_then(|arg| parse_duration(arg).ok())
-            .expect("invalid transfer-timeout value") as u64
-    }
-
     /// Check whether we are incognito from the file history.
     #[cfg(feature = "history")]
     pub fn incognito(&self) -> bool {
         self.matches.is_present("incognito") || env_var_present("FFSEND_INCOGNITO")
     }
 
-    /// Check whether quiet mode is used.
-    pub fn quiet(&self) -> bool {
-        !self.verbose() && (self.matches.is_present("quiet") || env_var_present("FFSEND_QUIET"))
-    }
-
     /// Check whether verbose mode is used.
     pub fn verbose(&self) -> bool {
         self.matches.is_present("verbose") || env_var_present("FFSEND_VERBOSE")
@@ -96,6 +64,10 @@ impl<'a: 'b, 'b> MainMatcher<'a> {
 
 impl<'a> Matcher<'a> for MainMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        Some(MainMatcher { matches })
+        Some(
+            MainMatcher {
+                matches,
+            }
+        )
     }
 }

src/cmd/matcher/mod.rs

@@ -2,7 +2,6 @@ pub mod debug;
 pub mod delete;
 pub mod download;
 pub mod exists;
-pub mod generate;
 #[cfg(feature = "history")]
 pub mod history;
 pub mod info;
@@ -10,22 +9,19 @@ pub mod main;
 pub mod params;
 pub mod password;
 pub mod upload;
-pub mod version;
 
-// Re-export to matcher module
+// Reexport to matcher module
 pub use self::debug::DebugMatcher;
 pub use self::delete::DeleteMatcher;
 pub use self::download::DownloadMatcher;
 pub use self::exists::ExistsMatcher;
-pub use self::generate::GenerateMatcher;
 #[cfg(feature = "history")]
 pub use self::history::HistoryMatcher;
 pub use self::info::InfoMatcher;
 pub use self::main::MainMatcher;
 pub use self::params::ParamsMatcher;
 pub use self::password::PasswordMatcher;
-pub use self::upload::{CopyMode, UploadMatcher};
-pub use self::version::VersionMatcher;
+pub use self::upload::UploadMatcher;
 
 use clap::ArgMatches;
 

src/cmd/matcher/params.rs

@@ -1,12 +1,8 @@
 use clap::ArgMatches;
-use ffsend_api::api::Version as ApiVersion;
 use ffsend_api::url::Url;
 
+use cmd::arg::{ArgDownloadLimit, ArgOwner, ArgUrl, CmdArgOption};
 use super::Matcher;
-use crate::cmd::{
-    arg::{ArgDownloadLimit, ArgOwner, ArgUrl, CmdArgOption},
-    matcher::MainMatcher,
-};
 
 /// The params command matcher.
 pub struct ParamsMatcher<'a> {
@@ -26,27 +22,23 @@ impl<'a: 'b, 'b> ParamsMatcher<'a> {
     /// Get the owner token.
     pub fn owner(&'a self) -> Option<String> {
         // TODO: just return a string reference here?
-        ArgOwner::value(self.matches).map(|token| token.to_owned())
+        ArgOwner::value(self.matches)
+            .map(|token| token.to_owned())
     }
 
     /// Get the download limit.
-    ///
-    /// If the download limit was the default, `None` is returned to not
-    /// explicitly set it.
-    pub fn download_limit(
-        &'a self,
-        main_matcher: &MainMatcher,
-        api_version: ApiVersion,
-        auth: bool,
-    ) -> Option<usize> {
-        ArgDownloadLimit::value_checked(self.matches, main_matcher, api_version, auth)
+    pub fn download_limit(&'a self) -> Option<u8> {
+        ArgDownloadLimit::value(self.matches)
     }
 }
 
 impl<'a> Matcher<'a> for ParamsMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("parameters")
-            .map(|matches| ParamsMatcher { matches })
+        matches.subcommand_matches("parameters")
+            .map(|matches|
+                 ParamsMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/password.rs

@@ -2,9 +2,9 @@ use clap::ArgMatches;
 use ffsend_api::url::Url;
 use rpassword::prompt_password_stderr;
 
-use crate::cmd::arg::{ArgGenPassphrase, ArgOwner, ArgPassword, ArgUrl, CmdArgFlag, CmdArgOption};
-use crate::cmd::matcher::{MainMatcher, Matcher};
-use crate::util::check_empty_password;
+use cmd::arg::{ArgOwner, ArgPassword, ArgUrl, CmdArgOption};
+use cmd::matcher::{MainMatcher, Matcher};
+use util::check_empty_password;
 
 /// The password command matcher.
 pub struct PasswordMatcher<'a> {
@@ -24,19 +24,12 @@ impl<'a: 'b, 'b> PasswordMatcher<'a> {
     /// Get the owner token.
     pub fn owner(&'a self) -> Option<String> {
         // TODO: just return a string reference here?
-        ArgOwner::value(self.matches).map(|token| token.to_owned())
+        ArgOwner::value(self.matches)
+            .map(|token| token.to_owned())
     }
 
     /// Get the password.
-    ///
-    /// The password is returned in the following format:
-    /// `(password, generated)`
-    pub fn password(&'a self) -> (String, bool) {
-        // Generate a passphrase if requested
-        if ArgGenPassphrase::is_present(self.matches) {
-            return (ArgGenPassphrase::gen_passphrase(), true);
-        }
-
+    pub fn password(&'a self) -> String {
         // Get the password, or prompt for it
         let password = match ArgPassword::value(self.matches) {
             Some(password) => password,
@@ -46,7 +39,7 @@ impl<'a: 'b, 'b> PasswordMatcher<'a> {
                 // TODO: create utility function for this
                 prompt_password_stderr("New password: ")
                     .expect("failed to read password from stdin")
-            }
+            },
         };
 
         // Create a main matcher
@@ -55,14 +48,17 @@ impl<'a: 'b, 'b> PasswordMatcher<'a> {
         // Check for empty passwords
         check_empty_password(&password, &matcher_main);
 
-        (password, false)
+        password
     }
 }
 
 impl<'a> Matcher<'a> for PasswordMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("password")
-            .map(|matches| PasswordMatcher { matches })
+        matches.subcommand_matches("password")
+            .map(|matches|
+                 PasswordMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/upload.rs

@@ -1,15 +1,12 @@
 use clap::ArgMatches;
-use ffsend_api::{api::Version as ApiVersion, config, url::Url};
-
-use super::Matcher;
-use crate::cmd::{
-    arg::{
-        ArgDownloadLimit, ArgExpiryTime, ArgGenPassphrase, ArgHost, ArgPassword, CmdArgFlag,
-        CmdArgOption,
-    },
-    matcher::MainMatcher,
+use ffsend_api::action::params::{
+    PARAMS_DEFAULT_DOWNLOAD as DOWNLOAD_DEFAULT,
 };
-use crate::util::{bin_name, env_var_present, quit_error_msg, ErrorHintsBuilder};
+use ffsend_api::url::Url;
+
+use cmd::arg::{ArgDownloadLimit, ArgHost, ArgPassword, CmdArgOption};
+use super::Matcher;
+use util::{env_var_present, ErrorHintsBuilder, quit_error_msg};
 
 /// The upload command matcher.
 pub struct UploadMatcher<'a> {
@@ -19,11 +16,9 @@ pub struct UploadMatcher<'a> {
 impl<'a: 'b, 'b> UploadMatcher<'a> {
     /// Get the selected file to upload.
     // TODO: maybe return a file or path instance here
-    pub fn files(&'a self) -> Vec<&'a str> {
-        self.matches
-            .values_of("FILE")
+    pub fn file(&'a self) -> &'a str {
+        self.matches.value_of("FILE")
             .expect("no file specified to upload")
-            .collect()
     }
 
     /// The the name to use for the uploaded file.
@@ -35,7 +30,7 @@ impl<'a: 'b, 'b> UploadMatcher<'a> {
         let name = self.matches.value_of("name")?;
 
         // The file name must not be empty
-        // TODO: allow to force an empty name here, and process empty names on downloading
+        // TODO: allow to force an empty name here, and process emtpy names on downloading
         if name.trim().is_empty() {
             quit_error_msg(
                 "the file name must not be empty",
@@ -60,50 +55,20 @@ impl<'a: 'b, 'b> UploadMatcher<'a> {
     }
 
     /// Get the password.
-    /// A generated passphrase will be returned if the user requested so,
-    /// otherwise the specified password is returned.
-    /// If no password was set, `None` is returned instead.
-    ///
-    /// The password is returned in the following format:
-    /// `(password, generated)`
-    pub fn password(&'a self) -> Option<(String, bool)> {
-        // Generate a passphrase if requested
-        if ArgGenPassphrase::is_present(self.matches) {
-            return Some((ArgGenPassphrase::gen_passphrase(), true));
-        }
-
-        // Use a specified password or use nothing
-        ArgPassword::value(self.matches).map(|password| (password, false))
+    /// `None` is returned if no password was specified.
+    pub fn password(&'a self) -> Option<String> {
+        ArgPassword::value(self.matches)
     }
 
     /// Get the download limit.
-    ///
     /// If the download limit was the default, `None` is returned to not
     /// explicitly set it.
-    pub fn download_limit(
-        &'a self,
-        main_matcher: &MainMatcher,
-        api_version: ApiVersion,
-        auth: bool,
-    ) -> Option<usize> {
-        ArgDownloadLimit::value_checked(self.matches, main_matcher, api_version, auth).and_then(
-            |d| match d {
-                d if d == config::downloads_default(api_version, auth) => None,
+    pub fn download_limit(&'a self) -> Option<u8> {
+        ArgDownloadLimit::value(self.matches)
+            .and_then(|d| match d {
+                DOWNLOAD_DEFAULT => None,
                 d => Some(d),
-            },
-        )
-    }
-
-    /// Get the expiry time in seconds.
-    ///
-    /// If the expiry time was not set, `None` is returned.
-    pub fn expiry_time(
-        &'a self,
-        main_matcher: &MainMatcher,
-        api_version: ApiVersion,
-        auth: bool,
-    ) -> Option<usize> {
-        ArgExpiryTime::value_checked(self.matches, main_matcher, api_version, auth)
+            })
     }
 
     /// Check whether to archive the file to upload.
@@ -117,65 +82,20 @@ impl<'a: 'b, 'b> UploadMatcher<'a> {
         self.matches.is_present("open") || env_var_present("FFSEND_OPEN")
     }
 
-    /// Check whether to to delete local files after uploading.
-    pub fn delete(&self) -> bool {
-        self.matches.is_present("delete")
-    }
-
-    /// Check whether to copy the file URL in the user's clipboard, get the copy mode.
+    /// Check whether to copy the file URL in the user's clipboard.
     #[cfg(feature = "clipboard")]
-    pub fn copy(&self) -> Option<CopyMode> {
-        // Get the options
-        let copy = self.matches.is_present("copy") || env_var_present("FFSEND_COPY");
-        let copy_cmd = self.matches.is_present("copy-cmd") || env_var_present("FFSEND_COPY_CMD");
-
-        // Return the corresponding copy mode
-        if copy_cmd {
-            Some(CopyMode::DownloadCmd)
-        } else if copy {
-            Some(CopyMode::Url)
-        } else {
-            None
-        }
-    }
-
-    /// Check whether to shorten a share URL
-    #[cfg(feature = "urlshorten")]
-    pub fn shorten(&self) -> bool {
-        self.matches.is_present("shorten")
-    }
-
-    /// Check whether to print a QR code for the share URL.
-    #[cfg(feature = "qrcode")]
-    pub fn qrcode(&self) -> bool {
-        self.matches.is_present("qrcode")
+    pub fn copy(&self) -> bool {
+        self.matches.is_present("copy") || env_var_present("FFSEND_COPY")
     }
 }
 
 impl<'a> Matcher<'a> for UploadMatcher<'a> {
     fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("upload")
-            .map(|matches| UploadMatcher { matches })
-    }
-}
-
-/// The copy mode.
-#[derive(Debug, Copy, Clone)]
-pub enum CopyMode {
-    /// Copy the public share link.
-    Url,
-
-    /// Copy an ffsend download command.
-    DownloadCmd,
-}
-
-impl CopyMode {
-    /// Build the string to copy, based on the given `url` and current mode.
-    pub fn build(&self, url: &str) -> String {
-        match self {
-            CopyMode::Url => url.into(),
-            CopyMode::DownloadCmd => format!("{} download {}", bin_name(), url),
-        }
+        matches.subcommand_matches("upload")
+            .map(|matches|
+                 UploadMatcher {
+                     matches,
+                 }
+            )
     }
 }

src/cmd/matcher/version.rs

@@ -1,30 +0,0 @@
-use ffsend_api::url::Url;
-
-use clap::ArgMatches;
-
-use super::Matcher;
-use crate::cmd::arg::{ArgHost, CmdArgOption};
-
-/// The version command matcher.
-pub struct VersionMatcher<'a> {
-    matches: &'a ArgMatches<'a>,
-}
-
-impl<'a: 'b, 'b> VersionMatcher<'a> {
-    /// Get the host to probe.
-    ///
-    /// This method parses the host into an `Url`.
-    /// If the given host is invalid,
-    /// the program will quit with an error message.
-    pub fn host(&'a self) -> Url {
-        ArgHost::value(self.matches)
-    }
-}
-
-impl<'a> Matcher<'a> for VersionMatcher<'a> {
-    fn with(matches: &'a ArgMatches) -> Option<Self> {
-        matches
-            .subcommand_matches("version")
-            .map(|matches| VersionMatcher { matches })
-    }
-}

src/cmd/mod.rs

@@ -1,7 +1,7 @@
 pub mod arg;
+pub mod subcmd;
 pub mod handler;
 pub mod matcher;
-pub mod subcmd;
 
 // Reexport modules
 pub use self::handler::Handler;

src/cmd/subcmd/debug.rs

@@ -1,6 +1,6 @@
 use clap::{App, SubCommand};
 
-use crate::cmd::arg::{ArgHost, CmdArg};
+use cmd::arg::{ArgHost, CmdArg};
 
 /// The debug command definition.
 pub struct CmdDebug;

src/cmd/subcmd/delete.rs

@@ -1,6 +1,6 @@
 use clap::{App, SubCommand};
 
-use crate::cmd::arg::{ArgOwner, ArgUrl, CmdArg};
+use cmd::arg::{ArgOwner, ArgUrl, CmdArg};
 
 /// The delete command definition.
 pub struct CmdDelete;
@@ -10,7 +10,6 @@ impl CmdDelete {
         SubCommand::with_name("delete")
             .about("Delete a shared file")
             .visible_alias("del")
-            .visible_alias("rm")
             .arg(ArgUrl::build())
             .arg(ArgOwner::build())
     }

src/cmd/subcmd/download.rs

@@ -1,6 +1,6 @@
 use clap::{App, Arg, SubCommand};
 
-use crate::cmd::arg::{ArgPassword, ArgUrl, CmdArg};
+use cmd::arg::{ArgPassword, ArgUrl, CmdArg};
 
 /// The download command definition.
 pub struct CmdDownload;
@@ -15,29 +15,24 @@ impl CmdDownload {
             .visible_alias("down")
             .arg(ArgUrl::build())
             .arg(ArgPassword::build())
-            .arg(
-                Arg::with_name("output")
-                    .long("output")
-                    .short("o")
-                    .alias("output-file")
-                    .alias("out")
-                    .alias("file")
-                    .value_name("PATH")
-                    .help("Output file or directory"),
-            );
+            .arg(Arg::with_name("output")
+                 .long("output")
+                 .short("o")
+                 .alias("output-file")
+                 .alias("out")
+                 .alias("file")
+                 .value_name("PATH")
+                 .help("The output file or directory"));
 
         // Optional archive support
-        #[cfg(feature = "archive")]
-        {
-            cmd = cmd.arg(
-                Arg::with_name("extract")
-                    .long("extract")
-                    .short("e")
-                    .alias("archive")
-                    .alias("arch")
-                    .alias("a")
-                    .help("Extract an archived file"),
-            )
+        #[cfg(feature = "archive")] {
+            cmd = cmd.arg(Arg::with_name("extract")
+                .long("extract")
+                .short("e")
+                .alias("archive")
+                .alias("arch")
+                .alias("a")
+                .help("Extract an archived file"))
         }
 
         cmd

src/cmd/subcmd/exists.rs

@@ -1,6 +1,6 @@
 use clap::{App, SubCommand};
 
-use crate::cmd::arg::{ArgUrl, CmdArg};
+use cmd::arg::{ArgUrl, CmdArg};
 
 /// The exists command definition.
 pub struct CmdExists;

src/cmd/subcmd/generate/completions.rs

@@ -1,33 +0,0 @@
-use clap::{App, Arg, Shell, SubCommand};
-
-/// The generate completions command definition.
-pub struct CmdCompletions;
-
-impl CmdCompletions {
-    pub fn build<'a, 'b>() -> App<'a, 'b> {
-        SubCommand::with_name("completions")
-            .about("Shell completions")
-            .alias("completion")
-            .alias("complete")
-            .arg(
-                Arg::with_name("SHELL")
-                    .help("Shell type to generate completions for")
-                    .required(true)
-                    .multiple(true)
-                    .takes_value(true)
-                    .possible_value("all")
-                    .possible_values(&Shell::variants())
-                    .case_insensitive(true),
-            )
-            .arg(
-                Arg::with_name("output")
-                    .long("output")
-                    .short("o")
-                    .alias("output-dir")
-                    .alias("out")
-                    .alias("dir")
-                    .value_name("DIR")
-                    .help("Shell completion files output directory"),
-            )
-    }
-}

src/cmd/subcmd/generate/mod.rs

@@ -1,18 +0,0 @@
-pub mod completions;
-
-use clap::{App, AppSettings, SubCommand};
-
-use completions::CmdCompletions;
-
-/// The generate command definition.
-pub struct CmdGenerate;
-
-impl CmdGenerate {
-    pub fn build<'a, 'b>() -> App<'a, 'b> {
-        SubCommand::with_name("generate")
-            .about("Generate assets")
-            .visible_alias("gen")
-            .setting(AppSettings::SubcommandRequiredElseHelp)
-            .subcommand(CmdCompletions::build())
-    }
-}

src/cmd/subcmd/history.rs

@@ -1,4 +1,4 @@
-use clap::{App, Arg, SubCommand};
+use clap::{App, SubCommand};
 
 /// The history command definition.
 pub struct CmdHistory;
@@ -9,20 +9,5 @@ impl CmdHistory {
             .about("View file history")
             .visible_alias("h")
             .alias("ls")
-            .arg(
-                Arg::with_name("rm")
-                    .long("rm")
-                    .short("R")
-                    .alias("remove")
-                    .value_name("URL")
-                    .help("Remove history entry"),
-            )
-            .arg(
-                Arg::with_name("clear")
-                    .long("clear")
-                    .short("C")
-                    .alias("flush")
-                    .help("Clear all history"),
-            )
     }
 }

src/cmd/subcmd/info.rs

@@ -1,6 +1,6 @@
 use clap::{App, SubCommand};
 
-use crate::cmd::arg::{ArgOwner, ArgPassword, ArgUrl, CmdArg};
+use cmd::arg::{ArgOwner, ArgPassword, ArgUrl, CmdArg};
 
 /// The info command definition.
 pub struct CmdInfo;

src/cmd/subcmd/mod.rs

@@ -2,25 +2,21 @@ pub mod debug;
 pub mod delete;
 pub mod download;
 pub mod exists;
-pub mod generate;
 #[cfg(feature = "history")]
 pub mod history;
 pub mod info;
 pub mod params;
 pub mod password;
 pub mod upload;
-pub mod version;
 
-// Re-export to cmd module
+// Reexport to cmd module
 pub use self::debug::CmdDebug;
 pub use self::delete::CmdDelete;
 pub use self::download::CmdDownload;
 pub use self::exists::CmdExists;
-pub use self::generate::CmdGenerate;
 #[cfg(feature = "history")]
 pub use self::history::CmdHistory;
 pub use self::info::CmdInfo;
 pub use self::params::CmdParams;
 pub use self::password::CmdPassword;
 pub use self::upload::CmdUpload;
-pub use self::version::CmdVersion;

src/cmd/subcmd/params.rs

@@ -1,6 +1,6 @@
 use clap::{App, SubCommand};
 
-use crate::cmd::arg::{ArgDownloadLimit, ArgOwner, ArgUrl, CmdArg};
+use cmd::arg::{ArgDownloadLimit, ArgOwner, ArgUrl, CmdArg};
 
 /// The params command definition.
 pub struct CmdParams;
@@ -8,7 +8,9 @@ pub struct CmdParams;
 impl CmdParams {
     pub fn build<'a, 'b>() -> App<'a, 'b> {
         // Create a list of parameter arguments, of which one is required
-        let param_args = [ArgDownloadLimit::name()];
+        let param_args = [
+            ArgDownloadLimit::name(),
+        ];
 
         SubCommand::with_name("parameters")
             .about("Change parameters of a shared file")

src/cmd/subcmd/password.rs

@@ -1,6 +1,6 @@
 use clap::{App, SubCommand};
 
-use crate::cmd::arg::{ArgGenPassphrase, ArgOwner, ArgPassword, ArgUrl, CmdArg};
+use cmd::arg::{ArgOwner, ArgPassword, ArgUrl, CmdArg};
 
 /// The password command definition.
 pub struct CmdPassword;
@@ -12,8 +12,8 @@ impl CmdPassword {
             .visible_alias("pass")
             .visible_alias("p")
             .arg(ArgUrl::build())
-            .arg(ArgPassword::build().help("Specify a password, do not prompt"))
-            .arg(ArgGenPassphrase::build())
+            .arg(ArgPassword::build()
+                 .help("Specify a password, do not prompt"))
             .arg(ArgOwner::build())
     }
 }

src/cmd/subcmd/upload.rs

@@ -1,10 +1,11 @@
 use clap::{App, Arg, SubCommand};
-
-use crate::cmd::arg::{
-    ArgDownloadLimit, ArgExpiryTime, ArgGenPassphrase, ArgHost, ArgPassword, CmdArg,
+use ffsend_api::action::params::{
+    PARAMS_DEFAULT_DOWNLOAD_STR as DOWNLOAD_DEFAULT,
 };
 
-/// The upload command definition.
+use cmd::arg::{ArgDownloadLimit, ArgHost, ArgPassword, CmdArg};
+
+/// The uplaod command definition.
 pub struct CmdUpload;
 
 impl CmdUpload {
@@ -15,96 +16,42 @@ impl CmdUpload {
             .about("Upload files")
             .visible_alias("u")
             .visible_alias("up")
-            .arg(
-                Arg::with_name("FILE")
-                    .help("The file(s) to upload")
-                    .required(true)
-                    .multiple(true),
-            )
-            .arg(ArgPassword::build().help("Protect the file with a password"))
-            .arg(ArgGenPassphrase::build())
-            .arg(ArgDownloadLimit::build())
-            .arg(ArgExpiryTime::build())
+            .arg(Arg::with_name("FILE")
+                .help("The file to upload")
+                .required(true)
+                .multiple(false))
+            .arg(ArgPassword::build()
+                 .help("Protect the file with a password"))
+            .arg(ArgDownloadLimit::build()
+                 .default_value(DOWNLOAD_DEFAULT))
             .arg(ArgHost::build())
-            .arg(
-                Arg::with_name("name")
-                    .long("name")
-                    .short("n")
-                    .alias("file")
-                    .alias("f")
-                    .value_name("NAME")
-                    .help("Rename the file being uploaded"),
-            )
-            .arg(
-                Arg::with_name("open")
-                    .long("open")
-                    .short("o")
-                    .help("Open the share link in your browser"),
-            )
-            .arg(
-                Arg::with_name("delete")
-                    .long("delete")
-                    .alias("rm")
-                    .short("D")
-                    .help("Delete local file after upload"),
-            );
+            .arg(Arg::with_name("name")
+                .long("name")
+                .short("n")
+                .alias("file")
+                .alias("f")
+                .value_name("NAME")
+                .help("Rename the file being uploaded"))
+            .arg(Arg::with_name("open")
+                .long("open")
+                .short("o")
+                .help("Open the share link in your browser"));
 
         // Optional archive support
-        #[cfg(feature = "archive")]
-        {
-            cmd = cmd.arg(
-                Arg::with_name("archive")
-                    .long("archive")
-                    .short("a")
-                    .alias("arch")
-                    .help("Archive the upload in a single file"),
-            )
+        #[cfg(feature = "archive")] {
+            cmd = cmd.arg(Arg::with_name("archive")
+                .long("archive")
+                .short("a")
+                .alias("arch")
+                .help("Archive the upload in a single file"))
         }
 
         // Optional clipboard support
-        #[cfg(feature = "clipboard")]
-        {
-            cmd = cmd
-                .arg(
-                    Arg::with_name("copy")
-                        .long("copy")
-                        .short("c")
-                        .help("Copy the share link to your clipboard")
-                        .conflicts_with("copy-cmd"),
-                )
-                .arg(
-                    Arg::with_name("copy-cmd")
-                        .long("copy-cmd")
-                        .alias("copy-command")
-                        .short("C")
-                        .help("Copy the ffsend download command to your clipboard")
-                        .conflicts_with("copy"),
-                );
-        }
-
-        // Optional url shortening support
-        #[cfg(feature = "urlshorten")]
-        {
-            cmd = cmd.arg(
-                Arg::with_name("shorten")
-                    .long("shorten")
-                    .alias("short")
-                    .alias("url-shorten")
-                    .short("S")
-                    .help("Shorten share URLs with a public service"),
-            )
-        }
-
-        // Optional qrcode support
-        #[cfg(feature = "qrcode")]
-        {
-            cmd = cmd.arg(
-                Arg::with_name("qrcode")
-                    .long("qrcode")
-                    .alias("qr")
-                    .short("Q")
-                    .help("Print a QR code for the share URL"),
-            )
+        #[cfg(feature = "clipboard")] {
+            cmd = cmd.arg(Arg::with_name("copy")
+                .long("copy")
+                .short("c")
+                .help("Copy the share link to your clipboard"));
         }
 
         cmd

src/cmd/subcmd/version.rs

@@ -1,16 +0,0 @@
-use clap::{App, SubCommand};
-
-use crate::cmd::arg::{ArgHost, CmdArg};
-
-/// The version command definition.
-pub struct CmdVersion;
-
-impl CmdVersion {
-    pub fn build<'a, 'b>() -> App<'a, 'b> {
-        SubCommand::with_name("version")
-            .about("Determine the Send server version")
-            .alias("ver")
-            .visible_alias("v")
-            .arg(ArgHost::build())
-    }
-}

src/config.rs

@@ -1,36 +0,0 @@
-#[cfg(feature = "infer-command")]
-use std::collections::HashMap;
-
-use ffsend_api::api::{DesiredVersion, Version};
-
-/// The timeout for the Send client for generic requests, `0` to disable.
-pub const CLIENT_TIMEOUT: u64 = 30;
-
-/// The timeout for the Send client used to transfer (upload/download) files.
-/// Make sure this is big enough, or file uploads will be dropped. `0` to disable.
-pub const CLIENT_TRANSFER_TIMEOUT: u64 = 24 * 60 * 60;
-
-/// The default desired version to select for the server API.
-pub const API_VERSION_DESIRED_DEFAULT: DesiredVersion = DesiredVersion::Assume(API_VERSION_ASSUME);
-
-/// The default server API version to assume when it could not be determined.
-#[cfg(feature = "send3")]
-pub const API_VERSION_ASSUME: Version = Version::V3;
-#[cfg(not(feature = "send3"))]
-pub const API_VERSION_ASSUME: Version = Version::V2;
-
-#[cfg(feature = "infer-command")]
-lazy_static! {
-    /// Hashmap holding binary names to infer subcommands for.
-    ///
-    /// When the `ffsend` binary is called with such a name, the corresponding subcommand is
-    /// automatically inserted as argument. This also works when calling binaries through symbolic
-    /// or hard links.
-    pub static ref INFER_COMMANDS: HashMap<&'static str, &'static str> = {
-        let mut m = HashMap::new();
-        m.insert("ffput", "upload");
-        m.insert("ffget", "download");
-        m.insert("ffdel", "delete");
-        m
-    };
-}

src/error.rs

@@ -2,15 +2,13 @@ use ffsend_api::action::delete::Error as DeleteError;
 use ffsend_api::action::exists::Error as ExistsError;
 use ffsend_api::action::params::Error as ParamsError;
 use ffsend_api::action::password::Error as PasswordError;
-use ffsend_api::action::version::Error as VersionError;
 use ffsend_api::file::remote_file::FileParseError;
 
-use crate::action::download::Error as CliDownloadError;
-use crate::action::generate::completions::Error as CliGenerateCompletionsError;
+use action::download::Error as CliDownloadError;
 #[cfg(feature = "history")]
-use crate::action::history::Error as CliHistoryError;
-use crate::action::info::Error as CliInfoError;
-use crate::action::upload::Error as CliUploadError;
+use action::history::Error as CliHistoryError;
+use action::info::Error as CliInfoError;
+use action::upload::Error as CliUploadError;
 
 #[derive(Fail, Debug)]
 pub enum Error {
@@ -57,10 +55,6 @@ pub enum ActionError {
     #[fail(display = "failed to check whether the file exists")]
     Exists(#[cause] ExistsError),
 
-    /// An error occurred while generating completions.
-    #[fail(display = "failed to generate shell completions")]
-    GenerateCompletions(#[cause] CliGenerateCompletionsError),
-
     /// An error occurred while processing the file history.
     #[cfg(feature = "history")]
     #[fail(display = "failed to process the history")]
@@ -78,10 +72,6 @@ pub enum ActionError {
     #[fail(display = "failed to change the password")]
     Password(#[cause] PasswordError),
 
-    /// An error occurred while invoking the version action.
-    #[fail(display = "failed to determine server version")]
-    Version(#[cause] VersionError),
-
     /// An error occurred while invoking the upload action.
     #[fail(display = "failed to upload the specified file")]
     Upload(#[cause] CliUploadError),
@@ -104,12 +94,6 @@ impl From<ExistsError> for ActionError {
     }
 }
 
-impl From<CliGenerateCompletionsError> for ActionError {
-    fn from(err: CliGenerateCompletionsError) -> ActionError {
-        ActionError::GenerateCompletions(err)
-    }
-}
-
 #[cfg(feature = "history")]
 impl From<CliHistoryError> for ActionError {
     fn from(err: CliHistoryError) -> ActionError {
@@ -129,12 +113,6 @@ impl From<PasswordError> for ActionError {
     }
 }
 
-impl From<VersionError> for ActionError {
-    fn from(err: VersionError) -> ActionError {
-        ActionError::Version(err)
-    }
-}
-
 impl From<FileParseError> for ActionError {
     fn from(err: FileParseError) -> ActionError {
         ActionError::InvalidUrl(err)

src/history.rs

@@ -1,16 +1,20 @@
+extern crate toml;
+extern crate version_compare;
+
 use std::fs;
 use std::io::Error as IoError;
 use std::path::PathBuf;
 
 use failure::Fail;
-use ffsend_api::{
-    file::remote_file::{FileParseError, RemoteFile},
-    url::Url,
+use ffsend_api::file::remote_file::RemoteFile;
+use self::toml::de::Error as DeError;
+use self::toml::ser::Error as SerError;
+use self::version_compare::{
+    CompOp,
+    VersionCompare,
 };
-use toml::{de::Error as DeError, ser::Error as SerError};
-use version_compare::Cmp;
 
-use crate::util::{print_error, print_warning};
+use util::{print_error, print_warning};
 
 /// The minimum supported history file version.
 const VERSION_MIN: &str = "0.0.1";
@@ -21,7 +25,7 @@ const VERSION_MAX: &str = crate_version!();
 #[derive(Serialize, Deserialize)]
 pub struct History {
     /// The application version the history file was built with.
-    /// Used for compatibility checking.
+    /// Used for compatability checking.
     version: Option<String>,
 
     /// The file history.
@@ -55,16 +59,16 @@ impl History {
         history.autosave = Some(path);
 
         // Make sure the file version is supported
-        if history.version.is_none() {
+        if history.version.is_none() { 
             print_warning("History file has no version, ignoring");
             history.version = Some(crate_version!().into());
         } else {
             // Get the version number from the file
             let version = history.version.as_ref().unwrap();
 
-            if let Ok(true) = version_compare::compare_to(version, VERSION_MIN, Cmp::Lt) {
+            if let Ok(true) = VersionCompare::compare_to(version, VERSION_MIN, &CompOp::Lt) {
                 print_warning("history file version is too old, ignoring");
-            } else if let Ok(true) = version_compare::compare_to(version, VERSION_MAX, Cmp::Gt) {
+            } else if let Ok(true) = VersionCompare::compare_to(version, VERSION_MAX, &CompOp::Gt) {
                 print_warning("history file has an unknown version, ignoring");
             }
         }
@@ -93,36 +97,24 @@ impl History {
         self.gc();
 
         // Get the path
-        let path = self.autosave.as_ref().ok_or(SaveError::NoPath)?;
+        let path = self.autosave
+            .as_ref()
+            .ok_or(SaveError::NoPath)?;
 
         // If we have no files, remove the history file if it exists
         if self.files.is_empty() {
             if path.is_file() {
-                fs::remove_file(&path).map_err(SaveError::Delete)?;
+                fs::remove_file(&path)
+                    .map_err(SaveError::Delete)?;
             }
             return Ok(());
         }
 
-        // Ensure the file parent directories are available
+        // Ensure the file parnet directories are available
         if let Some(parent) = path.parent() {
             fs::create_dir_all(parent)?;
         }
 
-        // Set file permissions on unix based systems
-        #[cfg(unix)]
-        {
-            use std::fs::Permissions;
-            use std::os::unix::fs::PermissionsExt;
-
-            if !path.exists() {
-                let file = fs::File::create(path).map_err(SaveError::Write)?;
-
-                // Set Read/Write permissions for the user
-                file.set_permissions(Permissions::from_mode(0o600))
-                    .map_err(SaveError::SetPermissions)?;
-            }
-        }
-
         // Build the data and write to a file
         let data = toml::to_string(self)?;
         fs::write(&path, data)?;
@@ -143,9 +135,7 @@ impl History {
         // Merge any existing file with the same ID
         {
             // Find anything to merge
-            let merge_info: Vec<bool> = self
-                .files
-                .iter_mut()
+            let merge_info: Vec<bool> = self.files.iter_mut()
                 .filter(|f| f.id() == file.id())
                 .map(|ref mut f| f.merge(&file, overwrite))
                 .collect();
@@ -166,16 +156,14 @@ impl History {
         self.changed = true;
     }
 
-    /// Remove a file, matched by it's file ID.
+    /// Remove the given remote file, matched by it's file ID.
     ///
     /// If any file was removed, true is returned.
-    pub fn remove(&mut self, id: &str) -> bool {
+    pub fn remove(&mut self, file: &RemoteFile) -> bool {
         // Get the indices of files that have expired
-        let expired_indices: Vec<usize> = self
-            .files
-            .iter()
+        let expired_indices: Vec<usize> = self.files.iter()
             .enumerate()
-            .filter(|&(_, f)| f.id() == id)
+            .filter(|&(_, f)| f.id() == file.id())
             .map(|(i, _)| i)
             .collect();
 
@@ -191,13 +179,6 @@ impl History {
         !expired_indices.is_empty()
     }
 
-    /// Remove a file by the given URL.
-    ///
-    /// If any file was removed, true is returned.
-    pub fn remove_url(&mut self, url: Url) -> Result<bool, FileParseError> {
-        Ok(self.remove(RemoteFile::parse_url(url, None)?.id()))
-    }
-
     /// Get all files.
     pub fn files(&self) -> &Vec<RemoteFile> {
         &self.files
@@ -208,15 +189,7 @@ impl History {
     /// If multiple files exist within the history that are equal, only one is returned.
     /// If no matching file was found, `None` is returned.
     pub fn get_file(&self, file: &RemoteFile) -> Option<&RemoteFile> {
-        self.files
-            .iter()
-            .find(|f| f.id() == file.id() && f.host() == file.host())
-    }
-
-    /// Clear all history.
-    pub fn clear(&mut self) {
-        self.changed = !self.files.is_empty();
-        self.files.clear();
+        self.files.iter().find(|f| f.id() == file.id() && f.host() == file.host())
     }
 
     /// Garbage collect (remove) all files that have been expired,
@@ -224,11 +197,10 @@ impl History {
     ///
     /// If the expiry property is None (thus unknown), the file will be kept.
     ///
-    /// The number of expired files is returned.
+    /// The number of exired files is returned.
     pub fn gc(&mut self) -> usize {
         // Get a list of expired files
-        let expired: Vec<RemoteFile> = self
-            .files
+        let expired: Vec<RemoteFile> = self.files
             .iter()
             .filter(|f| f.has_expired())
             .cloned()
@@ -236,7 +208,7 @@ impl History {
 
         // Remove the files
         for f in &expired {
-            self.remove(f.id());
+            self.remove(f);
         }
 
         // Set the changed flag
@@ -255,7 +227,9 @@ impl Drop for History {
         if self.autosave.is_some() && self.changed {
             // Save and report errors
             if let Err(err) = self.save() {
-                print_error(err.context("failed to auto save history, ignoring"));
+                print_error(
+                    err.context("failed to auto save history, ignoring"),
+                );
             }
         }
     }
@@ -298,11 +272,11 @@ impl From<SaveError> for Error {
 #[derive(Debug, Fail)]
 pub enum LoadError {
     /// Failed to read the file contents from the given file.
-    #[fail(display = "failed to read from the history file")]
+    #[fail(display = "Failed to read from the history file")]
     Read(#[cause] IoError),
 
     /// Failed to parse the loaded file.
-    #[fail(display = "failed to parse the file contents")]
+    #[fail(display = "Failed to parse the file contents")]
     Parse(#[cause] DeError),
 }
 
@@ -332,10 +306,6 @@ pub enum SaveError {
     #[fail(display = "failed to write to the history file")]
     Write(#[cause] IoError),
 
-    /// Failed to set file permissions to the history file.
-    #[fail(display = "failed to set permissions to the history file")]
-    SetPermissions(#[cause] IoError),
-
     /// Failed to delete the history file, which was tried because there
     /// are no history items to save.
     #[fail(display = "failed to delete history file, because history is empty")]

src/history_tool.rs

@@ -1,9 +1,12 @@
 use failure::Fail;
 use ffsend_api::file::remote_file::RemoteFile;
 
-use crate::cmd::matcher::MainMatcher;
-use crate::history::{Error as HistoryError, History};
-use crate::util::print_error;
+use cmd::matcher::MainMatcher;
+use history::{
+    Error as HistoryError,
+    History,
+};
+use util::print_error;
 
 /// Load the history from the given path, add the given file, and save it
 /// again.
@@ -13,11 +16,9 @@ use crate::util::print_error;
 /// overwrite properties in the already existing file when merging.
 ///
 /// If there is no file at the given path, new history will be created.
-fn add_error(
-    matcher_main: &MainMatcher,
-    file: RemoteFile,
-    overwrite: bool,
-) -> Result<(), HistoryError> {
+fn add_error(matcher_main: &MainMatcher, file: RemoteFile, overwrite: bool)
+    -> Result<(), HistoryError>
+{
     // Ignore if incognito
     if matcher_main.incognito() {
         return Ok(());
@@ -40,14 +41,18 @@ fn add_error(
 /// If an error occurred, the error is printed and ignored.
 pub fn add(matcher_main: &MainMatcher, file: RemoteFile, overwrite: bool) {
     if let Err(err) = add_error(matcher_main, file, overwrite) {
-        print_error(err.context("failed to add file to local history, ignoring"));
+        print_error(err.context(
+            "failed to add file to local history, ignoring",
+        ));
     }
 }
 
 /// Load the history from the given path, remove the given file by it's
 /// ID, and save it again.
 /// True is returned if any file was removed.
-fn remove_error(matcher_main: &MainMatcher, file: &RemoteFile) -> Result<bool, HistoryError> {
+fn remove_error(matcher_main: &MainMatcher, file: &RemoteFile)
+    -> Result<bool, HistoryError>
+{
     // Ignore if incognito
     if matcher_main.incognito() {
         return Ok(false);
@@ -55,7 +60,7 @@ fn remove_error(matcher_main: &MainMatcher, file: &RemoteFile) -> Result<bool, H
 
     // Load the history, remove the file, and save
     let mut history = History::load_or_new(matcher_main.history())?;
-    let removed = history.remove(file.id());
+    let removed = history.remove(file);
     history.save()?;
     Ok(removed)
 }
@@ -67,7 +72,9 @@ pub fn remove(matcher_main: &MainMatcher, file: &RemoteFile) -> bool {
     let result = remove_error(matcher_main, file);
     let ok = result.is_ok();
     if let Err(err) = result {
-        print_error(err.context("failed to remove file from local history, ignoring"));
+        print_error(err.context(
+            "failed to remove file from local history, ignoring",
+        ));
     }
     ok
 }
@@ -97,7 +104,9 @@ pub fn derive_file_properties(matcher_main: &MainMatcher, file: &mut RemoteFile)
     let history = match History::load_or_new(matcher_main.history()) {
         Ok(history) => history,
         Err(err) => {
-            print_error(err.context("failed to derive file properties from history, ignoring"));
+            print_error(err.context(
+                "failed to derive file properties from history, ignoring",
+            ));
             return false;
         }
     };
@@ -117,7 +126,7 @@ pub fn derive_file_properties(matcher_main: &MainMatcher, file: &mut RemoteFile)
 
             // Return whether any property was derived
             f.has_secret() || f.has_owner_token()
-        }
+        },
         None => false,
     }
 }