mirror of
https://github.com/fergalmoran/flameshot.git
synced 2025-12-22 09:51:06 +00:00
ci: enhancements and updates (#3685)
* ci: update transferwee from upstream * chore: separate RPM spec into two files * ci: enhancements and updates - move to quay from dockerhub due to pull rate limit - add debian 12, ubuntu 24.04, fedora 39/40, opensue leap 15.5/15.6 - the building envrinments of appimage/snap/flatpak update to ubuntu 22.04
This commit is contained in:
Ahmed
GitHub
49
.github/workflows/Linux-pack.yml
vendored
49
.github/workflows/Linux-pack.yml
vendored
@@ -20,9 +20,9 @@ env:
|
|||||||
PRODUCT: flameshot
|
PRODUCT: flameshot
|
||||||
RELEASE: 1
|
RELEASE: 1
|
||||||
# dockerfiles, see https://github.com/flameshot-org/flameshot-dockerfiles
|
# dockerfiles, see https://github.com/flameshot-org/flameshot-dockerfiles
|
||||||
# docker images, see https://hub.docker.com/r/flameshotorg/ci-building-images
|
# docker images, see https://quay.io/repository/flameshot-org/ci-building
|
||||||
# flameshotorg/ci-building-images or packpack/packpack
|
|
||||||
DOCKER_REPO: quay.io/flameshot-org/ci-building
|
DOCKER_REPO: quay.io/flameshot-org/ci-building
|
||||||
|
# building tool: https://github.com/flameshot-org/packpack
|
||||||
PACKPACK_REPO: flameshot-org/packpack
|
PACKPACK_REPO: flameshot-org/packpack
|
||||||
# available upload services: wetransfer.com, file.io, 0x0.st
|
# available upload services: wetransfer.com, file.io, 0x0.st
|
||||||
UPLOAD_SERVICE: wetransfer.com
|
UPLOAD_SERVICE: wetransfer.com
|
||||||
@@ -30,7 +30,7 @@ env:
|
|||||||
jobs:
|
jobs:
|
||||||
deb-pack:
|
deb-pack:
|
||||||
name: Build deb on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
name: Build deb on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -175,6 +175,7 @@ jobs:
|
|||||||
repository: ${{ env.PACKPACK_REPO }}
|
repository: ${{ env.PACKPACK_REPO }}
|
||||||
path: tools
|
path: tools
|
||||||
ref: multiarch
|
ref: multiarch
|
||||||
|
set-safe-directory: $GITHUB_WORKSPACE/tools
|
||||||
- name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
- name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
||||||
env:
|
env:
|
||||||
OS: ${{ matrix.dist.os }}
|
OS: ${{ matrix.dist.os }}
|
||||||
@@ -242,7 +243,7 @@ jobs:
|
|||||||
|
|
||||||
rpm-pack:
|
rpm-pack:
|
||||||
name: Build rpm on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
name: Build rpm on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
@@ -259,6 +260,12 @@ jobs:
|
|||||||
symbol: 40,
|
symbol: 40,
|
||||||
arch: x86_64
|
arch: x86_64
|
||||||
}
|
}
|
||||||
|
- {
|
||||||
|
name: opensuse-leap-15.5,
|
||||||
|
os: opensuse-leap,
|
||||||
|
symbol: 15.5,
|
||||||
|
arch: x86_64
|
||||||
|
}
|
||||||
- {
|
- {
|
||||||
name: opensuse-leap-15.6,
|
name: opensuse-leap-15.6,
|
||||||
os: opensuse-leap,
|
os: opensuse-leap,
|
||||||
@@ -295,9 +302,21 @@ jobs:
|
|||||||
repository: ${{ env.PACKPACK_REPO }}
|
repository: ${{ env.PACKPACK_REPO }}
|
||||||
path: tools
|
path: tools
|
||||||
ref: master
|
ref: master
|
||||||
|
set-safe-directory: $GITHUB_WORKSPACE/tools
|
||||||
- name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
- name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
||||||
|
if: matrix.dist.os == 'fedora'
|
||||||
run: |
|
run: |
|
||||||
cp -r $GITHUB_WORKSPACE/packaging/rpm $GITHUB_WORKSPACE
|
mkdir $GITHUB_WORKSPACE/rpm
|
||||||
|
cp $GITHUB_WORKSPACE/packaging/rpm/fedora/flameshot.spec $GITHUB_WORKSPACE/rpm
|
||||||
|
bash $GITHUB_WORKSPACE/tools/packpack
|
||||||
|
env:
|
||||||
|
OS: ${{ matrix.dist.os }}
|
||||||
|
DIST: ${{ matrix.dist.symbol }}
|
||||||
|
- name: Packaging on ${{ matrix.dist.name }} ${{ matrix.dist.arch }}
|
||||||
|
if: matrix.dist.os == 'opensuse-leap'
|
||||||
|
run: |
|
||||||
|
mkdir $GITHUB_WORKSPACE/rpm
|
||||||
|
cp $GITHUB_WORKSPACE/packaging/rpm/opensuse/flameshot.spec $GITHUB_WORKSPACE/rpm
|
||||||
bash $GITHUB_WORKSPACE/tools/packpack
|
bash $GITHUB_WORKSPACE/tools/packpack
|
||||||
env:
|
env:
|
||||||
OS: ${{ matrix.dist.os }}
|
OS: ${{ matrix.dist.os }}
|
||||||
@@ -359,17 +378,17 @@ jobs:
|
|||||||
|
|
||||||
appimage-pack:
|
appimage-pack:
|
||||||
name: Build appimage on ${{ matrix.config.name }}
|
name: Build appimage on ${{ matrix.config.name }}
|
||||||
runs-on: ubuntu-22.04
|
runs-on: ubuntu-latest
|
||||||
strategy:
|
strategy:
|
||||||
fail-fast: false
|
fail-fast: false
|
||||||
matrix:
|
matrix:
|
||||||
config:
|
config:
|
||||||
- {
|
- {
|
||||||
name: ubuntu-20.04,
|
name: ubuntu-22.04,
|
||||||
os: ubuntu,
|
os: ubuntu,
|
||||||
symbol: focal,
|
symbol: jammy,
|
||||||
arch: amd64,
|
arch: amd64,
|
||||||
image_repo: flameshotorg/ci-building-images
|
image_repo: quay.io/flameshot-org/ci-building
|
||||||
}
|
}
|
||||||
container:
|
container:
|
||||||
image: ${{ matrix.config.image_repo }}:${{ matrix.config.os }}-${{ matrix.config.symbol }}
|
image: ${{ matrix.config.image_repo }}:${{ matrix.config.os }}-${{ matrix.config.symbol }}
|
||||||
@@ -414,7 +433,9 @@ jobs:
|
|||||||
cmake \
|
cmake \
|
||||||
extra-cmake-modules \
|
extra-cmake-modules \
|
||||||
build-essential \
|
build-essential \
|
||||||
qt5-default \
|
qt5-qmake \
|
||||||
|
qtbase5-dev \
|
||||||
|
qtbase5-dev-tools \
|
||||||
qttools5-dev-tools \
|
qttools5-dev-tools \
|
||||||
qttools5-dev \
|
qttools5-dev \
|
||||||
libqt5dbus5 \
|
libqt5dbus5 \
|
||||||
@@ -494,8 +515,8 @@ jobs:
|
|||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
flatpak-pack:
|
flatpak-pack:
|
||||||
name: Build flatpak on ubuntu-20.04
|
name: Build flatpak on ubuntu 22.04
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Source code
|
- name: Checkout Source code
|
||||||
if: github.event_name == 'push'
|
if: github.event_name == 'push'
|
||||||
@@ -561,8 +582,8 @@ jobs:
|
|||||||
overwrite: true
|
overwrite: true
|
||||||
|
|
||||||
snap-pack:
|
snap-pack:
|
||||||
name: Build snap on ubuntu-20.04
|
name: Build snap on ubuntu 22.04
|
||||||
runs-on: ubuntu-20.04
|
runs-on: ubuntu-22.04
|
||||||
steps:
|
steps:
|
||||||
- name: Checkout Source code
|
- name: Checkout Source code
|
||||||
if: github.event_name == 'push'
|
if: github.event_name == 'push'
|
||||||
|
|||||||
@@ -1,20 +1,9 @@
|
|||||||
#
|
#
|
||||||
# spec file for package flameshot on fedora, rehl, opensuse leap 15.x
|
# spec file for package flameshot on fedora, rehl
|
||||||
#
|
#
|
||||||
|
|
||||||
# fedora >= 30, rhel >=7
|
|
||||||
%define is_rhel_or_fedora (0%{?fedora} && 0%{?fedora} >= 30) || (0%{?rhel} && 0%{?rhel} >= 7)
|
|
||||||
# openSUSE Leap >= 15.2
|
|
||||||
%define is_suse_leap (0%{?is_opensuse} && 0%{?sle_version} >= 150200)
|
|
||||||
|
|
||||||
Name: flameshot
|
Name: flameshot
|
||||||
Version: 12.1.0
|
Version: 12.1.0
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
Release: 1%{?dist}
|
Release: 1%{?dist}
|
||||||
%endif
|
|
||||||
%if %{is_suse_leap}
|
|
||||||
Release: 1
|
|
||||||
%endif
|
|
||||||
License: GPLv3+ and ASL 2.0 and GPLv2 and LGPLv3 and Free Art
|
License: GPLv3+ and ASL 2.0 and GPLv2 and LGPLv3 and Free Art
|
||||||
Summary: Powerful yet simple to use screenshot software
|
Summary: Powerful yet simple to use screenshot software
|
||||||
URL: https://github.com/flameshot-org/flameshot
|
URL: https://github.com/flameshot-org/flameshot
|
||||||
@@ -23,20 +12,12 @@ Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
|||||||
BuildRequires: cmake >= 3.13.0
|
BuildRequires: cmake >= 3.13.0
|
||||||
BuildRequires: gcc-c++ >= 7
|
BuildRequires: gcc-c++ >= 7
|
||||||
BuildRequires: fdupes
|
BuildRequires: fdupes
|
||||||
%if %{is_suse_leap}
|
|
||||||
BuildRequires: update-desktop-files
|
|
||||||
BuildRequires: appstream-glib
|
|
||||||
%endif
|
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
BuildRequires: libappstream-glib
|
BuildRequires: libappstream-glib
|
||||||
BuildRequires: ninja-build
|
BuildRequires: ninja-build
|
||||||
%endif
|
|
||||||
BuildRequires: desktop-file-utils
|
BuildRequires: desktop-file-utils
|
||||||
|
|
||||||
BuildRequires: cmake(Qt5Core) >= 5.9.0
|
BuildRequires: cmake(Qt5Core) >= 5.9.0
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
BuildRequires: cmake(KF5GuiAddons) >= 5.89.0
|
BuildRequires: cmake(KF5GuiAddons) >= 5.89.0
|
||||||
%endif
|
|
||||||
BuildRequires: cmake(Qt5DBus) >= 5.9.0
|
BuildRequires: cmake(Qt5DBus) >= 5.9.0
|
||||||
BuildRequires: cmake(Qt5Gui) >= 5.9.0
|
BuildRequires: cmake(Qt5Gui) >= 5.9.0
|
||||||
BuildRequires: cmake(Qt5LinguistTools) >= 5.9.0
|
BuildRequires: cmake(Qt5LinguistTools) >= 5.9.0
|
||||||
@@ -46,16 +27,10 @@ BuildRequires: cmake(Qt5Widgets) >= 5.9.0
|
|||||||
|
|
||||||
|
|
||||||
Requires: hicolor-icon-theme
|
Requires: hicolor-icon-theme
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
Requires: qt5-qtbase >= 5.9.0
|
Requires: qt5-qtbase >= 5.9.0
|
||||||
Requires: qt5-qttools >= 5.9.0
|
Requires: qt5-qttools >= 5.9.0
|
||||||
Requires: qt5-qtsvg%{?_isa} >= 5.9.0
|
Requires: qt5-qtsvg%{?_isa} >= 5.9.0
|
||||||
%endif
|
|
||||||
%if %{is_suse_leap}
|
|
||||||
Requires: libQt5Core5 >= 5.9.0
|
|
||||||
Requires: libqt5-qttools >= 5.9.0
|
|
||||||
Requires: libQt5Svg5 >= 5.9.0
|
|
||||||
%endif
|
|
||||||
Recommends: xdg-desktop-portal%{?_isa}
|
Recommends: xdg-desktop-portal%{?_isa}
|
||||||
Recommends: (xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa})
|
Recommends: (xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa})
|
||||||
Recommends: (xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa})
|
Recommends: (xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa})
|
||||||
@@ -77,33 +52,19 @@ Features:
|
|||||||
%autosetup -p1
|
%autosetup -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{is_suse_leap}
|
|
||||||
%cmake -DCMAKE_BUILD_TYPE=Release
|
|
||||||
%endif
|
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
|
|
||||||
%cmake -G Ninja \
|
%cmake -G Ninja \
|
||||||
-DCMAKE_BUILD_TYPE=Release \
|
-DCMAKE_BUILD_TYPE=Release \
|
||||||
-DUSE_WAYLAND_CLIPBOARD:BOOL=ON \
|
-DUSE_WAYLAND_CLIPBOARD:BOOL=ON \
|
||||||
%endif
|
|
||||||
%cmake_build
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
%cmake_install
|
%cmake_install
|
||||||
# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
|
# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
|
||||||
%find_lang Internationalization --with-qt
|
%find_lang Internationalization --with-qt
|
||||||
%if %{is_suse_leap}
|
|
||||||
%suse_update_desktop_file -r org.flameshot.Flameshot Utility X-SuSE-DesktopUtility
|
|
||||||
%endif
|
|
||||||
%fdupes %{buildroot}%{_datadir}/icons
|
%fdupes %{buildroot}%{_datadir}/icons
|
||||||
|
|
||||||
%check
|
%check
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
|
appstream-util validate-relax --nonet %{buildroot}%{_metainfodir}/*.metainfo.xml
|
||||||
%endif
|
|
||||||
%if %{is_suse_leap}
|
|
||||||
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
|
|
||||||
%endif
|
|
||||||
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||||
|
|
||||||
%files -f Internationalization.lang
|
%files -f Internationalization.lang
|
||||||
@@ -116,12 +77,7 @@ desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
|||||||
%dir %{_datadir}/zsh/site-functions
|
%dir %{_datadir}/zsh/site-functions
|
||||||
%{_bindir}/%{name}
|
%{_bindir}/%{name}
|
||||||
%{_datadir}/applications/org.flameshot.Flameshot.desktop
|
%{_datadir}/applications/org.flameshot.Flameshot.desktop
|
||||||
%if %{is_suse_leap}
|
|
||||||
%{_datadir}/metainfo/org.flameshot.Flameshot.metainfo.xml
|
|
||||||
%endif
|
|
||||||
%if %{is_rhel_or_fedora}
|
|
||||||
%{_metainfodir}/org.flameshot.Flameshot.metainfo.xml
|
%{_metainfodir}/org.flameshot.Flameshot.metainfo.xml
|
||||||
%endif
|
|
||||||
%{_datadir}/bash-completion/completions/%{name}
|
%{_datadir}/bash-completion/completions/%{name}
|
||||||
%{_datadir}/zsh/site-functions/_%{name}
|
%{_datadir}/zsh/site-functions/_%{name}
|
||||||
%{_datadir}/fish/vendor_completions.d/%{name}.fish
|
%{_datadir}/fish/vendor_completions.d/%{name}.fish
|
||||||
126
packaging/rpm/opensuse/flameshot.spec
Normal file
126
packaging/rpm/opensuse/flameshot.spec
Normal file
@@ -0,0 +1,126 @@
|
|||||||
|
#
|
||||||
|
# spec file for package flameshot on opensuse leap 15.x
|
||||||
|
#
|
||||||
|
Name: flameshot
|
||||||
|
Version: 12.1.0
|
||||||
|
Release: 1
|
||||||
|
License: GPLv3+ and ASL 2.0 and GPLv2 and LGPLv3 and Free Art
|
||||||
|
Summary: Powerful yet simple to use screenshot software
|
||||||
|
URL: https://github.com/flameshot-org/flameshot
|
||||||
|
Source0: %{url}/archive/v%{version}/%{name}-%{version}.tar.gz
|
||||||
|
|
||||||
|
BuildRequires: cmake >= 3.13.0
|
||||||
|
BuildRequires: gcc-c++ >= 7
|
||||||
|
BuildRequires: fdupes
|
||||||
|
BuildRequires: update-desktop-files
|
||||||
|
BuildRequires: appstream-glib
|
||||||
|
BuildRequires: desktop-file-utils
|
||||||
|
|
||||||
|
BuildRequires: cmake(Qt5Core) >= 5.9.0
|
||||||
|
BuildRequires: cmake(Qt5DBus) >= 5.9.0
|
||||||
|
BuildRequires: cmake(Qt5Gui) >= 5.9.0
|
||||||
|
BuildRequires: cmake(Qt5LinguistTools) >= 5.9.0
|
||||||
|
BuildRequires: cmake(Qt5Network) >= 5.9.0
|
||||||
|
BuildRequires: cmake(Qt5Svg) >= 5.9.0
|
||||||
|
BuildRequires: cmake(Qt5Widgets) >= 5.9.0
|
||||||
|
|
||||||
|
|
||||||
|
Requires: hicolor-icon-theme
|
||||||
|
Requires: libQt5Core5 >= 5.9.0
|
||||||
|
Requires: libqt5-qttools >= 5.9.0
|
||||||
|
Requires: libQt5Svg5 >= 5.9.0
|
||||||
|
|
||||||
|
Recommends: xdg-desktop-portal%{?_isa}
|
||||||
|
Recommends: (xdg-desktop-portal-gnome%{?_isa} if gnome-shell%{?_isa})
|
||||||
|
Recommends: (xdg-desktop-portal-kde%{?_isa} if plasma-workspace-wayland%{?_isa})
|
||||||
|
Recommends: (xdg-desktop-portal-wlr%{?_isa} if wlroots%{?_isa})
|
||||||
|
|
||||||
|
%description
|
||||||
|
Powerful and simple to use screenshot software with built-in
|
||||||
|
editor with advanced features.
|
||||||
|
|
||||||
|
Features:
|
||||||
|
|
||||||
|
* Customizable appearance.
|
||||||
|
* Easy to use.
|
||||||
|
* In-app screenshot edition.
|
||||||
|
* DBus interface.
|
||||||
|
* Upload to Imgur
|
||||||
|
|
||||||
|
%prep
|
||||||
|
%autosetup -p1
|
||||||
|
|
||||||
|
%build
|
||||||
|
%cmake -DCMAKE_BUILD_TYPE=Release
|
||||||
|
%cmake_build
|
||||||
|
|
||||||
|
%install
|
||||||
|
%cmake_install
|
||||||
|
# https://fedoraproject.org/wiki/PackagingDrafts/find_lang
|
||||||
|
%find_lang Internationalization --with-qt
|
||||||
|
%suse_update_desktop_file -r org.flameshot.Flameshot Utility X-SuSE-DesktopUtility
|
||||||
|
%fdupes %{buildroot}%{_datadir}/icons
|
||||||
|
|
||||||
|
%check
|
||||||
|
appstream-util validate-relax --nonet %{buildroot}%{_datadir}/metainfo/*.metainfo.xml
|
||||||
|
desktop-file-validate %{buildroot}%{_datadir}/applications/*.desktop
|
||||||
|
|
||||||
|
%files -f Internationalization.lang
|
||||||
|
%{_datadir}/%{name}/translations/Internationalization_grc.qm
|
||||||
|
%doc README.md
|
||||||
|
%license LICENSE
|
||||||
|
%dir %{_datadir}/%{name}
|
||||||
|
%dir %{_datadir}/%{name}/translations
|
||||||
|
%dir %{_datadir}/bash-completion/completions
|
||||||
|
%dir %{_datadir}/zsh/site-functions
|
||||||
|
%{_bindir}/%{name}
|
||||||
|
%{_datadir}/applications/org.flameshot.Flameshot.desktop
|
||||||
|
%{_datadir}/metainfo/org.flameshot.Flameshot.metainfo.xml
|
||||||
|
%{_datadir}/bash-completion/completions/%{name}
|
||||||
|
%{_datadir}/zsh/site-functions/_%{name}
|
||||||
|
%{_datadir}/fish/vendor_completions.d/%{name}.fish
|
||||||
|
%{_datadir}/dbus-1/interfaces/org.flameshot.Flameshot.xml
|
||||||
|
%{_datadir}/dbus-1/services/org.flameshot.Flameshot.service
|
||||||
|
%{_datadir}/icons/hicolor/*/apps/*.png
|
||||||
|
%{_datadir}/icons/hicolor/scalable/apps/*.svg
|
||||||
|
%{_mandir}/man1/%{name}.1*
|
||||||
|
|
||||||
|
%changelog
|
||||||
|
* Wed Jun 21 2022 Jeremy Borgman <borgman.jeremy@pm.me> - 12.0.0-1
|
||||||
|
- Update for 12.0 release.
|
||||||
|
|
||||||
|
* Fri Jan 14 2022 Jeremy Borgman <borgman.jeremy@pm.me> - 11.0.0-1
|
||||||
|
- Update for 11.0 release.
|
||||||
|
|
||||||
|
* Sun Aug 29 2021 Zetao Yang <vitzys@outlook.com> - 0.10.1-2
|
||||||
|
- Minor SPEC fixes.
|
||||||
|
|
||||||
|
* Sun Jul 25 2021 Jeremy Borgman <borgman.jeremy@pm.me> - 0.10.1-1
|
||||||
|
- Updated for flameshot 0.10.1
|
||||||
|
|
||||||
|
* Mon May 17 2021 Jeremy Borgman <borgman.jeremy@pm.me> - 0.10.0-1
|
||||||
|
- Updated for flameshot 0.10.0
|
||||||
|
|
||||||
|
* Sat Feb 27 2021 Jeremy Borgman <borgman.jeremy@pm.me> - 0.9.0-1
|
||||||
|
- Updated for flameshot 0.9.0
|
||||||
|
|
||||||
|
* Wed Oct 14 2020 Jeremy Borgman <borgman.jeremy@pm.me> - 0.8.5-1
|
||||||
|
- Updated for flameshot 0.8.5
|
||||||
|
|
||||||
|
* Sat Oct 10 2020 Jeremy Borgman <borgman.jeremy@pm.me> - 0.8.4-1
|
||||||
|
- Updated for flameshot 0.8.4
|
||||||
|
|
||||||
|
* Sat Sep 19 2020 Jeremy Borgman <borgman.jeremy@pm.me> - 0.8.3-1
|
||||||
|
- Updated for flameshot 0.8.3
|
||||||
|
|
||||||
|
* Mon Sep 07 2020 Zetao Yang <vitzys@outlook.com> - 0.8.0-1
|
||||||
|
- Updated for flameshot 0.8.0
|
||||||
|
- More details, please see https://flameshot.org/changelog/#v080
|
||||||
|
|
||||||
|
* Sat Aug 18 2018 Zetao Yang <vitzys@outlook.com> - 0.6.0-1
|
||||||
|
- Updated for flameshot 0.6.0
|
||||||
|
- More details, please see https://flameshot.org/changelog/#v060
|
||||||
|
|
||||||
|
* Tue Jan 09 2018 Zetao Yang <vitzys@outlook.com> - 0.5.0-1
|
||||||
|
- Initial package for flameshot 0.5.0
|
||||||
|
- More details, please see https://flameshot.org/changelog/#v050
|
||||||
@@ -1,7 +1,7 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright (c) 2018-2020 Leonardo Taccari
|
# Copyright (c) 2018-2023 Leonardo Taccari
|
||||||
# All rights reserved.
|
# All rights reserved.
|
||||||
#
|
#
|
||||||
# Redistribution and use in source and binary forms, with or without
|
# Redistribution and use in source and binary forms, with or without
|
||||||
@@ -38,30 +38,35 @@ files from a `we.tl' or `wetransfer.com/downloads' URLs and upload files that
|
|||||||
will be shared via emails or link.
|
will be shared via emails or link.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
from typing import List
|
from typing import Any, Dict, List, Optional, Union
|
||||||
|
import binascii
|
||||||
|
import functools
|
||||||
|
import hashlib
|
||||||
|
import json
|
||||||
|
import logging
|
||||||
import os.path
|
import os.path
|
||||||
import re
|
import re
|
||||||
|
import time
|
||||||
import urllib.parse
|
import urllib.parse
|
||||||
import zlib
|
|
||||||
|
|
||||||
import requests
|
import requests
|
||||||
|
|
||||||
|
|
||||||
WETRANSFER_API_URL = 'https://wetransfer.com/api/v4/transfers'
|
WETRANSFER_API_URL = "https://wetransfer.com/api/v4/transfers"
|
||||||
WETRANSFER_DOWNLOAD_URL = WETRANSFER_API_URL + '/{transfer_id}/download'
|
WETRANSFER_DOWNLOAD_URL = WETRANSFER_API_URL + "/{transfer_id}/download"
|
||||||
WETRANSFER_UPLOAD_EMAIL_URL = WETRANSFER_API_URL + '/email'
|
WETRANSFER_UPLOAD_EMAIL_URL = WETRANSFER_API_URL + "/email"
|
||||||
WETRANSFER_VERIFY_URL = WETRANSFER_API_URL + '/{transfer_id}/verify'
|
WETRANSFER_VERIFY_URL = WETRANSFER_API_URL + "/{transfer_id}/verify"
|
||||||
WETRANSFER_UPLOAD_LINK_URL = WETRANSFER_API_URL + '/link'
|
WETRANSFER_UPLOAD_LINK_URL = WETRANSFER_API_URL + "/link"
|
||||||
WETRANSFER_FILES_URL = WETRANSFER_API_URL + '/{transfer_id}/files'
|
WETRANSFER_FINALIZE_URL = WETRANSFER_API_URL + "/{transfer_id}/finalize"
|
||||||
WETRANSFER_PART_PUT_URL = WETRANSFER_FILES_URL + '/{file_id}/part-put-url'
|
|
||||||
WETRANSFER_FINALIZE_MPP_URL = WETRANSFER_FILES_URL + '/{file_id}/finalize-mpp'
|
|
||||||
WETRANSFER_FINALIZE_URL = WETRANSFER_API_URL + '/{transfer_id}/finalize'
|
|
||||||
|
|
||||||
WETRANSFER_DEFAULT_CHUNK_SIZE = 5242880
|
|
||||||
WETRANSFER_EXPIRE_IN = 604800
|
WETRANSFER_EXPIRE_IN = 604800
|
||||||
|
WETRANSFER_USER_AGENT = "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:102.0) Gecko/20100101 Firefox/102.0"
|
||||||
|
|
||||||
|
|
||||||
def download_url(url: str) -> str:
|
logger = logging.getLogger(__name__)
|
||||||
|
|
||||||
|
|
||||||
|
def download_url(url: str) -> Optional[str]:
|
||||||
"""Given a wetransfer.com download URL download return the downloadable URL.
|
"""Given a wetransfer.com download URL download return the downloadable URL.
|
||||||
|
|
||||||
The URL should be of the form `https://we.tl/' or
|
The URL should be of the form `https://we.tl/' or
|
||||||
@@ -83,13 +88,19 @@ def download_url(url: str) -> str:
|
|||||||
Return the download URL (AKA `direct_link') as a str or None if the URL
|
Return the download URL (AKA `direct_link') as a str or None if the URL
|
||||||
could not be parsed.
|
could not be parsed.
|
||||||
"""
|
"""
|
||||||
|
logger.debug(f"Getting download URL of {url}")
|
||||||
# Follow the redirect if we have a short URL
|
# Follow the redirect if we have a short URL
|
||||||
if url.startswith('https://we.tl/'):
|
if url.startswith("https://we.tl/"):
|
||||||
r = requests.head(url, allow_redirects=True)
|
r = requests.head(
|
||||||
|
url,
|
||||||
|
allow_redirects=True,
|
||||||
|
headers={"User-Agent": WETRANSFER_USER_AGENT},
|
||||||
|
)
|
||||||
|
logger.debug(f"Short URL {url} redirects to {r.url}")
|
||||||
url = r.url
|
url = r.url
|
||||||
|
|
||||||
recipient_id = None
|
recipient_id = None
|
||||||
params = urllib.parse.urlparse(url).path.split('/')[2:]
|
params = urllib.parse.urlparse(url).path.split("/")[2:]
|
||||||
|
|
||||||
if len(params) == 2:
|
if len(params) == 2:
|
||||||
transfer_id, security_hash = params
|
transfer_id, security_hash = params
|
||||||
@@ -98,6 +109,7 @@ def download_url(url: str) -> str:
|
|||||||
else:
|
else:
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
logger.debug(f"Getting direct_link of {url}")
|
||||||
j = {
|
j = {
|
||||||
"intent": "entire_transfer",
|
"intent": "entire_transfer",
|
||||||
"security_hash": security_hash,
|
"security_hash": security_hash,
|
||||||
@@ -105,23 +117,30 @@ def download_url(url: str) -> str:
|
|||||||
if recipient_id:
|
if recipient_id:
|
||||||
j["recipient_id"] = recipient_id
|
j["recipient_id"] = recipient_id
|
||||||
s = _prepare_session()
|
s = _prepare_session()
|
||||||
r = s.post(WETRANSFER_DOWNLOAD_URL.format(transfer_id=transfer_id),
|
if not s:
|
||||||
json=j)
|
raise ConnectionError("Could not prepare session")
|
||||||
|
r = s.post(WETRANSFER_DOWNLOAD_URL.format(transfer_id=transfer_id), json=j)
|
||||||
|
_close_session(s)
|
||||||
|
|
||||||
j = r.json()
|
j = r.json()
|
||||||
return j.get('direct_link')
|
return j.get("direct_link")
|
||||||
|
|
||||||
|
|
||||||
def _file_unquote(file: str) -> str:
|
def _file_unquote(file: str) -> str:
|
||||||
"""Given a URL encoded file unquote it.
|
"""Given a URL encoded file unquote it.
|
||||||
|
|
||||||
All occurrences of `\', `/' and `../' will be ignored to avoid possible
|
All occurences of `\', `/' and `../' will be ignored to avoid possible
|
||||||
directory traversals.
|
directory traversals.
|
||||||
"""
|
"""
|
||||||
return urllib.parse.unquote(file).replace('../', '').replace('/', '').replace('\\', '')
|
return (
|
||||||
|
urllib.parse.unquote(file)
|
||||||
|
.replace("../", "")
|
||||||
|
.replace("/", "")
|
||||||
|
.replace("\\", "")
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
def download(url: str, file: str = '') -> None:
|
def download(url: str, file: str = "") -> None:
|
||||||
"""Given a `we.tl/' or `wetransfer.com/downloads/' download it.
|
"""Given a `we.tl/' or `wetransfer.com/downloads/' download it.
|
||||||
|
|
||||||
First a direct link is retrieved (via download_url()), the filename can be
|
First a direct link is retrieved (via download_url()), the filename can be
|
||||||
@@ -129,31 +148,35 @@ def download(url: str, file: str = '') -> None:
|
|||||||
will be extracted to it and it will be fetched and stored on the current
|
will be extracted to it and it will be fetched and stored on the current
|
||||||
working directory.
|
working directory.
|
||||||
"""
|
"""
|
||||||
|
logger.debug(f"Downloading {url}")
|
||||||
dl_url = download_url(url)
|
dl_url = download_url(url)
|
||||||
|
if not dl_url:
|
||||||
|
logger.error(f"Could not find direct link of {url}")
|
||||||
|
return None
|
||||||
if not file:
|
if not file:
|
||||||
file = _file_unquote(urllib.parse.urlparse(dl_url).path.split('/')[-1])
|
file = _file_unquote(urllib.parse.urlparse(dl_url).path.split("/")[-1])
|
||||||
|
|
||||||
r = requests.get(dl_url, stream=True)
|
logger.debug(f"Fetching {dl_url}")
|
||||||
with open(file, 'wb') as f:
|
r = requests.get(
|
||||||
|
dl_url, headers={"User-Agent": WETRANSFER_USER_AGENT}, stream=True
|
||||||
|
)
|
||||||
|
with open(file, "wb") as f:
|
||||||
for chunk in r.iter_content(chunk_size=1024):
|
for chunk in r.iter_content(chunk_size=1024):
|
||||||
f.write(chunk)
|
f.write(chunk)
|
||||||
|
|
||||||
|
|
||||||
def _file_name_and_size(file: str) -> dict:
|
def _file_name_and_size(file: str) -> Dict[str, Union[int, str]]:
|
||||||
"""Given a file, prepare the "name" and "size" dictionary.
|
"""Given a file, prepare the "item_type", "name" and "size" dictionary.
|
||||||
|
|
||||||
Return a dictionary with "name" and "size" keys.
|
Return a dictionary with "item_type", "name" and "size" keys.
|
||||||
"""
|
"""
|
||||||
filename = os.path.basename(file)
|
filename = os.path.basename(file)
|
||||||
filesize = os.path.getsize(file)
|
filesize = os.path.getsize(file)
|
||||||
|
|
||||||
return {
|
return {"item_type": "file", "name": filename, "size": filesize}
|
||||||
"name": filename,
|
|
||||||
"size": filesize
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
def _prepare_session() -> requests.Session:
|
def _prepare_session() -> Optional[requests.Session]:
|
||||||
"""Prepare a wetransfer.com session.
|
"""Prepare a wetransfer.com session.
|
||||||
|
|
||||||
Return a requests session that will always pass the required headers
|
Return a requests session that will always pass the required headers
|
||||||
@@ -161,19 +184,39 @@ def _prepare_session() -> requests.Session:
|
|||||||
requests.
|
requests.
|
||||||
"""
|
"""
|
||||||
s = requests.Session()
|
s = requests.Session()
|
||||||
r = s.get('https://wetransfer.com/')
|
s.headers.update(
|
||||||
|
{
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
"x-requested-with": "XMLHttpRequest",
|
||||||
|
}
|
||||||
|
)
|
||||||
|
r = s.get("https://wetransfer.com/")
|
||||||
m = re.search('name="csrf-token" content="([^"]+)"', r.text)
|
m = re.search('name="csrf-token" content="([^"]+)"', r.text)
|
||||||
s.headers.update({
|
if m:
|
||||||
'x-csrf-token': m.group(1),
|
logger.debug(f"Setting x-csrf-token header to {m.group(1)}")
|
||||||
'x-requested-with': 'XMLHttpRequest',
|
s.headers.update({"x-csrf-token": m.group(1)})
|
||||||
})
|
else:
|
||||||
|
logger.debug(f"Could not find any csrf-token")
|
||||||
|
|
||||||
return s
|
return s
|
||||||
|
|
||||||
|
|
||||||
def _prepare_email_upload(filenames: List[str], message: str,
|
def _close_session(s: requests.Session) -> None:
|
||||||
sender: str, recipients: List[str],
|
"""Close a wetransfer.com session.
|
||||||
session: requests.Session) -> str:
|
|
||||||
|
Terminate wetransfer.com session.
|
||||||
|
"""
|
||||||
|
s.close()
|
||||||
|
|
||||||
|
|
||||||
|
def _prepare_email_upload(
|
||||||
|
filenames: List[str],
|
||||||
|
display_name: str,
|
||||||
|
message: str,
|
||||||
|
sender: str,
|
||||||
|
recipients: List[str],
|
||||||
|
session: requests.Session,
|
||||||
|
) -> Dict[Any, Any]:
|
||||||
"""Given a list of filenames, message a sender and recipients prepare for
|
"""Given a list of filenames, message a sender and recipients prepare for
|
||||||
the email upload.
|
the email upload.
|
||||||
|
|
||||||
@@ -182,6 +225,7 @@ def _prepare_email_upload(filenames: List[str], message: str,
|
|||||||
j = {
|
j = {
|
||||||
"files": [_file_name_and_size(f) for f in filenames],
|
"files": [_file_name_and_size(f) for f in filenames],
|
||||||
"from": sender,
|
"from": sender,
|
||||||
|
"display_name": display_name,
|
||||||
"message": message,
|
"message": message,
|
||||||
"recipients": recipients,
|
"recipients": recipients,
|
||||||
"ui_language": "en",
|
"ui_language": "en",
|
||||||
@@ -191,31 +235,39 @@ def _prepare_email_upload(filenames: List[str], message: str,
|
|||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
def _verify_email_upload(transfer_id: str, session: requests.Session) -> str:
|
def _verify_email_upload(
|
||||||
|
transfer_id: str, session: requests.Session
|
||||||
|
) -> Dict[Any, Any]:
|
||||||
"""Given a transfer_id, read the code from standard input.
|
"""Given a transfer_id, read the code from standard input.
|
||||||
|
|
||||||
Return the parsed JSON response.
|
Return the parsed JSON response.
|
||||||
"""
|
"""
|
||||||
code = input('Code:')
|
code = input("Code:")
|
||||||
|
|
||||||
j = {
|
j = {
|
||||||
"code": code,
|
"code": code,
|
||||||
"expire_in": WETRANSFER_EXPIRE_IN,
|
"expire_in": WETRANSFER_EXPIRE_IN,
|
||||||
}
|
}
|
||||||
|
|
||||||
r = session.post(WETRANSFER_VERIFY_URL.format(transfer_id=transfer_id),
|
r = session.post(
|
||||||
json=j)
|
WETRANSFER_VERIFY_URL.format(transfer_id=transfer_id), json=j
|
||||||
|
)
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
def _prepare_link_upload(filenames: List[str], message: str,
|
def _prepare_link_upload(
|
||||||
session: requests.Session) -> str:
|
filenames: List[str],
|
||||||
|
display_name: str,
|
||||||
|
message: str,
|
||||||
|
session: requests.Session,
|
||||||
|
) -> Dict[Any, Any]:
|
||||||
"""Given a list of filenames and a message prepare for the link upload.
|
"""Given a list of filenames and a message prepare for the link upload.
|
||||||
|
|
||||||
Return the parsed JSON response.
|
Return the parsed JSON response.
|
||||||
"""
|
"""
|
||||||
j = {
|
j = {
|
||||||
"files": [_file_name_and_size(f) for f in filenames],
|
"files": [_file_name_and_size(f) for f in filenames],
|
||||||
|
"display_name": display_name,
|
||||||
"message": message,
|
"message": message,
|
||||||
"ui_language": "en",
|
"ui_language": "en",
|
||||||
}
|
}
|
||||||
@@ -224,83 +276,253 @@ def _prepare_link_upload(filenames: List[str], message: str,
|
|||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
def _prepare_file_upload(transfer_id: str, file: str,
|
def _storm_urls(
|
||||||
session: requests.Session) -> str:
|
authorization: str,
|
||||||
"""Given a transfer_id and file prepare it for the upload.
|
) -> Dict[str, str]:
|
||||||
|
"""Given an authorization bearer extract storm URLs.
|
||||||
|
|
||||||
Return the parsed JSON response.
|
Return a dict with the various storm URLs.
|
||||||
|
|
||||||
|
XXX: Here we can basically ask/be redirected anywhere. Should we do some
|
||||||
|
XXX: possible sanity check to possibly avoid doing HTTP request to
|
||||||
|
XXX: arbitrary URLs?
|
||||||
"""
|
"""
|
||||||
j = _file_name_and_size(file)
|
# Extract JWT payload and add extra padding to be sure that it can be
|
||||||
r = session.post(WETRANSFER_FILES_URL.format(transfer_id=transfer_id),
|
# base64-decoded.
|
||||||
json=j)
|
j = json.loads(binascii.a2b_base64(authorization.split(".")[1] + "=="))
|
||||||
return r.json()
|
return {
|
||||||
|
"WETRANSFER_STORM_PREFLIGHT": j.get("storm.preflight_batch_url"),
|
||||||
|
"WETRANSFER_STORM_BLOCK": j.get("storm.announce_blocks_url"),
|
||||||
def _upload_chunks(transfer_id: str, file_id: str, file: str,
|
"WETRANSFER_STORM_BATCH": j.get("storm.create_batch_url"),
|
||||||
session: requests.Session,
|
|
||||||
default_chunk_size: int = WETRANSFER_DEFAULT_CHUNK_SIZE) -> str:
|
|
||||||
"""Given a transfer_id, file_id and file upload it.
|
|
||||||
|
|
||||||
Return the parsed JSON response.
|
|
||||||
"""
|
|
||||||
f = open(file, 'rb')
|
|
||||||
|
|
||||||
chunk_number = 0
|
|
||||||
while True:
|
|
||||||
chunk = f.read(default_chunk_size)
|
|
||||||
chunk_size = len(chunk)
|
|
||||||
if chunk_size == 0:
|
|
||||||
break
|
|
||||||
chunk_number += 1
|
|
||||||
|
|
||||||
j = {
|
|
||||||
"chunk_crc": zlib.crc32(chunk),
|
|
||||||
"chunk_number": chunk_number,
|
|
||||||
"chunk_size": chunk_size,
|
|
||||||
"retries": 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
r = session.post(
|
|
||||||
WETRANSFER_PART_PUT_URL.format(transfer_id=transfer_id,
|
def _storm_preflight_item(
|
||||||
file_id=file_id),
|
file: str,
|
||||||
json=j)
|
) -> Dict[str, Union[List[Dict[str, int]], str]]:
|
||||||
url = r.json().get('url')
|
"""Given a file, prepare the item block dictionary.
|
||||||
requests.options(url,
|
|
||||||
|
Return a dictionary with "blocks", "item_type" and "path" keys.
|
||||||
|
"""
|
||||||
|
filename = os.path.basename(file)
|
||||||
|
filesize = os.path.getsize(file)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"blocks": [{"content_length": filesize}],
|
||||||
|
"item_type": "file",
|
||||||
|
"path": filename,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _storm_preflight(
|
||||||
|
authorization: str, filenames: List[str]
|
||||||
|
) -> Dict[Any, Any]:
|
||||||
|
"""Given an Authorization token and filenames do preflight for upload.
|
||||||
|
|
||||||
|
Return the parsed JSON response.
|
||||||
|
"""
|
||||||
|
j = {
|
||||||
|
"items": [_storm_preflight_item(f) for f in filenames],
|
||||||
|
}
|
||||||
|
requests.options(
|
||||||
|
_storm_urls(authorization)["WETRANSFER_STORM_PREFLIGHT"],
|
||||||
headers={
|
headers={
|
||||||
'Origin': 'https://wetransfer.com',
|
"Origin": "https://wetransfer.com",
|
||||||
'Access-Control-Request-Method': 'PUT',
|
"Access-Control-Request-Method": "POST",
|
||||||
})
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
requests.put(url, data=chunk)
|
},
|
||||||
|
)
|
||||||
|
r = requests.post(
|
||||||
|
_storm_urls(authorization)["WETRANSFER_STORM_PREFLIGHT"],
|
||||||
|
json=j,
|
||||||
|
headers={
|
||||||
|
"Authorization": f"Bearer {authorization}",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
|
def _md5(file: str) -> str:
|
||||||
|
"""Given a file, calculate its MD5 checksum.
|
||||||
|
|
||||||
|
Return MD5 digest as str.
|
||||||
|
"""
|
||||||
|
h = hashlib.md5()
|
||||||
|
with open(file, "rb") as f:
|
||||||
|
for chunk in iter(functools.partial(f.read, 4096), b""):
|
||||||
|
h.update(chunk)
|
||||||
|
return h.hexdigest()
|
||||||
|
|
||||||
|
|
||||||
|
def _storm_prepare_item(file: str) -> Dict[str, Union[int, str]]:
|
||||||
|
"""Given a file, prepare the block for blocks dictionary.
|
||||||
|
|
||||||
|
Return a dictionary with "content_length" and "content_md5_hex" keys.
|
||||||
|
"""
|
||||||
|
filesize = os.path.getsize(file)
|
||||||
|
|
||||||
|
return {"content_length": filesize, "content_md5_hex": _md5(file)}
|
||||||
|
|
||||||
|
|
||||||
|
def _storm_prepare(authorization: str, filenames: List[str]) -> Dict[Any, Any]:
|
||||||
|
"""Given an Authorization token and filenames prepare for block uploads.
|
||||||
|
|
||||||
|
Return the parsed JSON response.
|
||||||
|
"""
|
||||||
j = {
|
j = {
|
||||||
'chunk_count': chunk_number
|
"blocks": [_storm_prepare_item(f) for f in filenames],
|
||||||
}
|
}
|
||||||
r = session.put(
|
requests.options(
|
||||||
WETRANSFER_FINALIZE_MPP_URL.format(transfer_id=transfer_id,
|
_storm_urls(authorization)["WETRANSFER_STORM_BLOCK"],
|
||||||
file_id=file_id),
|
headers={
|
||||||
json=j)
|
"Origin": "https://wetransfer.com",
|
||||||
|
"Access-Control-Request-Method": "POST",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
r = requests.post(
|
||||||
|
_storm_urls(authorization)["WETRANSFER_STORM_BLOCK"],
|
||||||
|
json=j,
|
||||||
|
headers={
|
||||||
|
"Authorization": f"Bearer {authorization}",
|
||||||
|
"Origin": "https://wetransfer.com",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
|
def _storm_finalize_item(
|
||||||
|
file: str, block_id: str
|
||||||
|
) -> Dict[str, Union[List[str], str]]:
|
||||||
|
"""Given a file and block_id prepare the item block dictionary.
|
||||||
|
|
||||||
|
Return a dictionary with "block_ids", "item_type" and "path" keys.
|
||||||
|
|
||||||
|
XXX: Is it possible to actually have more than one block?
|
||||||
|
XXX: If yes this - and probably other parts of the code involved with
|
||||||
|
XXX: blocks - needs to be instructed to handle them instead of
|
||||||
|
XXX: assuming that one file is associated with one block.
|
||||||
|
"""
|
||||||
|
filename = os.path.basename(file)
|
||||||
|
|
||||||
|
return {
|
||||||
|
"block_ids": [
|
||||||
|
block_id,
|
||||||
|
],
|
||||||
|
"item_type": "file",
|
||||||
|
"path": filename,
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
def _storm_finalize(
|
||||||
|
authorization: str, filenames: List[str], block_ids: List[str]
|
||||||
|
) -> Dict[Any, Any]:
|
||||||
|
"""Given an Authorization token, filenames and block ids finalize upload.
|
||||||
|
|
||||||
|
Return the parsed JSON response.
|
||||||
|
"""
|
||||||
|
j = {
|
||||||
|
"items": [
|
||||||
|
_storm_finalize_item(f, bid)
|
||||||
|
for f, bid in zip(filenames, block_ids)
|
||||||
|
],
|
||||||
|
}
|
||||||
|
requests.options(
|
||||||
|
_storm_urls(authorization)["WETRANSFER_STORM_BATCH"],
|
||||||
|
headers={
|
||||||
|
"Origin": "https://wetransfer.com",
|
||||||
|
"Access-Control-Request-Method": "POST",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
for i in range(0, 5):
|
||||||
|
r = requests.post(
|
||||||
|
_storm_urls(authorization)["WETRANSFER_STORM_BATCH"],
|
||||||
|
json=j,
|
||||||
|
headers={
|
||||||
|
"Authorization": f"Bearer {authorization}",
|
||||||
|
"Origin": "https://wetransfer.com",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
if r.status_code == 200:
|
||||||
|
break
|
||||||
|
else:
|
||||||
|
# HTTP request can have 425 HTTP status code and fails with
|
||||||
|
# error_code 'BLOCKS_STILL_EXPECTED'. Retry in that and any
|
||||||
|
# non-200 cases.
|
||||||
|
logger.debug(
|
||||||
|
f"Request against "
|
||||||
|
+ f"{_storm_urls(authorization)['WETRANSFER_STORM_BATCH']} "
|
||||||
|
+ f"returned {r.status_code}, retrying in {2 ** i} seconds"
|
||||||
|
)
|
||||||
|
time.sleep(2**i)
|
||||||
|
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
def _finalize_upload(transfer_id: str, session: requests.Session) -> str:
|
def _storm_upload(url: str, file: str) -> None:
|
||||||
|
"""Given an url and file upload it.
|
||||||
|
|
||||||
|
Does not return anything.
|
||||||
|
"""
|
||||||
|
requests.options(
|
||||||
|
url,
|
||||||
|
headers={
|
||||||
|
"Origin": "https://wetransfer.com",
|
||||||
|
"Access-Control-Request-Method": "PUT",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
with open(file, "rb") as f:
|
||||||
|
requests.put(
|
||||||
|
url,
|
||||||
|
data=f,
|
||||||
|
headers={
|
||||||
|
"Origin": "https://wetransfer.com",
|
||||||
|
"Content-MD5": binascii.b2a_base64(
|
||||||
|
binascii.unhexlify(_md5(file)), newline=False
|
||||||
|
),
|
||||||
|
"X-Uploader": "storm",
|
||||||
|
"User-Agent": WETRANSFER_USER_AGENT,
|
||||||
|
},
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
|
def _finalize_upload(
|
||||||
|
transfer_id: str, session: requests.Session
|
||||||
|
) -> Dict[Any, Any]:
|
||||||
"""Given a transfer_id finalize the upload.
|
"""Given a transfer_id finalize the upload.
|
||||||
|
|
||||||
Return the parsed JSON response.
|
Return the parsed JSON response.
|
||||||
"""
|
"""
|
||||||
r = session.put(WETRANSFER_FINALIZE_URL.format(transfer_id=transfer_id))
|
j = {
|
||||||
|
"wants_storm": True,
|
||||||
|
}
|
||||||
|
r = session.put(
|
||||||
|
WETRANSFER_FINALIZE_URL.format(transfer_id=transfer_id), json=j
|
||||||
|
)
|
||||||
|
|
||||||
return r.json()
|
return r.json()
|
||||||
|
|
||||||
|
|
||||||
def upload(files: List[str], message: str = '', sender: str = None,
|
def upload(
|
||||||
recipients: List[str] = []) -> str:
|
files: List[str],
|
||||||
|
display_name: str = "",
|
||||||
|
message: str = "",
|
||||||
|
sender: Optional[str] = None,
|
||||||
|
recipients: Optional[List[str]] = [],
|
||||||
|
) -> str:
|
||||||
"""Given a list of files upload them and return the corresponding URL.
|
"""Given a list of files upload them and return the corresponding URL.
|
||||||
|
|
||||||
Also accepts optional parameters:
|
Also accepts optional parameters:
|
||||||
|
- `display_name': name used as a title of the transfer
|
||||||
- `message': message used as a description of the transfer
|
- `message': message used as a description of the transfer
|
||||||
- `sender': email address used to receive an ACK if the upload is
|
- `sender': email address used to receive an ACK if the upload is
|
||||||
successful. For every download by the recipients an email
|
successfull. For every download by the recipients an email
|
||||||
will be also sent
|
will be also sent
|
||||||
- `recipients': list of email addresses of recipients. When the upload
|
- `recipients': list of email addresses of recipients. When the upload
|
||||||
succeed every recipients will receive an email with a link
|
succeed every recipients will receive an email with a link
|
||||||
@@ -312,66 +534,143 @@ def upload(files: List[str], message: str = '', sender: str = None,
|
|||||||
"""
|
"""
|
||||||
|
|
||||||
# Check that all files exists
|
# Check that all files exists
|
||||||
|
logger.debug(f"Checking that all files exists")
|
||||||
for f in files:
|
for f in files:
|
||||||
if not os.path.exists(f):
|
if not os.path.exists(f):
|
||||||
raise FileNotFoundError(f)
|
raise FileNotFoundError(f)
|
||||||
|
|
||||||
# Check that there are no duplicates filenames
|
# Check that there are no duplicates filenames
|
||||||
# (despite possible different dirname())
|
# (despite possible different dirname())
|
||||||
|
logger.debug(f"Checking for no duplicate filenames")
|
||||||
filenames = [os.path.basename(f) for f in files]
|
filenames = [os.path.basename(f) for f in files]
|
||||||
if len(files) != len(set(filenames)):
|
if len(files) != len(set(filenames)):
|
||||||
raise FileExistsError('Duplicate filenames')
|
raise FileExistsError("Duplicate filenames")
|
||||||
|
|
||||||
transfer_id = None
|
logger.debug(f"Preparing to upload")
|
||||||
|
transfer = None
|
||||||
s = _prepare_session()
|
s = _prepare_session()
|
||||||
|
if not s:
|
||||||
|
raise ConnectionError("Could not prepare session")
|
||||||
if sender and recipients:
|
if sender and recipients:
|
||||||
# email upload
|
# email upload
|
||||||
transfer_id = \
|
transfer = _prepare_email_upload(
|
||||||
_prepare_email_upload(files, message, sender, recipients, s)['id']
|
files, display_name, message, sender, recipients, s
|
||||||
_verify_email_upload(transfer_id, s)
|
)
|
||||||
|
transfer = _verify_email_upload(transfer["id"], s)
|
||||||
else:
|
else:
|
||||||
# link upload
|
# link upload
|
||||||
transfer_id = _prepare_link_upload(files, message, s)['id']
|
transfer = _prepare_link_upload(files, display_name, message, s)
|
||||||
|
|
||||||
for f in files:
|
logger.debug(
|
||||||
file_id = _prepare_file_upload(transfer_id, f, s)['id']
|
"From storm_upload_token WETRANSFER_STORM_PREFLIGHT URL is: "
|
||||||
_upload_chunks(transfer_id, file_id, f, s)
|
+ _storm_urls(transfer["storm_upload_token"])[
|
||||||
|
"WETRANSFER_STORM_PREFLIGHT"
|
||||||
return _finalize_upload(transfer_id, s)['shortened_url']
|
],
|
||||||
|
)
|
||||||
|
logger.debug(
|
||||||
|
"From storm_upload_token WETRANSFER_STORM_BLOCK URL is: "
|
||||||
|
+ _storm_urls(transfer["storm_upload_token"])[
|
||||||
|
"WETRANSFER_STORM_BLOCK"
|
||||||
|
],
|
||||||
|
)
|
||||||
|
logger.debug(
|
||||||
|
"From storm_upload_token WETRANSFER_STORM_BLOCK URL is: "
|
||||||
|
+ _storm_urls(transfer["storm_upload_token"])[
|
||||||
|
"WETRANSFER_STORM_BATCH"
|
||||||
|
],
|
||||||
|
)
|
||||||
|
logger.debug(f"Get transfer id {transfer['id']}")
|
||||||
|
logger.debug(f"Doing preflight storm")
|
||||||
|
_storm_preflight(transfer["storm_upload_token"], files)
|
||||||
|
logger.debug(f"Preparing storm block upload")
|
||||||
|
blocks = _storm_prepare(transfer["storm_upload_token"], files)
|
||||||
|
for f, b in zip(files, blocks["data"]["blocks"]):
|
||||||
|
logger.debug(f"Uploading file {f}")
|
||||||
|
_storm_upload(b["presigned_put_url"], f)
|
||||||
|
logger.debug(f"Finalizing storm batch upload")
|
||||||
|
_storm_finalize(
|
||||||
|
transfer["storm_upload_token"],
|
||||||
|
files,
|
||||||
|
[b["block_id"] for b in blocks["data"]["blocks"]],
|
||||||
|
)
|
||||||
|
logger.debug(f"Finalizing upload with transfer id {transfer['id']}")
|
||||||
|
shortened_url = _finalize_upload(transfer["id"], s)["shortened_url"]
|
||||||
|
_close_session(s)
|
||||||
|
return shortened_url
|
||||||
|
|
||||||
|
|
||||||
if __name__ == '__main__':
|
if __name__ == "__main__":
|
||||||
from sys import exit
|
from sys import exit
|
||||||
import argparse
|
import argparse
|
||||||
|
|
||||||
|
log = logging.getLogger(__name__)
|
||||||
|
log.setLevel(logging.INFO)
|
||||||
|
log.addHandler(logging.StreamHandler())
|
||||||
|
|
||||||
ap = argparse.ArgumentParser(
|
ap = argparse.ArgumentParser(
|
||||||
prog='transferwee',
|
prog="transferwee",
|
||||||
description='Download/upload files via wetransfer.com'
|
description="Download/upload files via wetransfer.com",
|
||||||
)
|
)
|
||||||
sp = ap.add_subparsers(dest='action', help='action')
|
sp = ap.add_subparsers(dest="action", help="action", required=True)
|
||||||
|
|
||||||
# download subcommand
|
# download subcommand
|
||||||
dp = sp.add_parser('download', help='download files')
|
dp = sp.add_parser("download", help="download files")
|
||||||
dp.add_argument('-g', action='store_true',
|
dp.add_argument(
|
||||||
help='only print the direct link (without downloading it)')
|
"-g",
|
||||||
dp.add_argument('-o', type=str, default='', metavar='file',
|
action="store_true",
|
||||||
help='output file to be used')
|
help="only print the direct link (without downloading it)",
|
||||||
dp.add_argument('url', nargs='+', type=str, metavar='url',
|
)
|
||||||
help='URL (we.tl/... or wetransfer.com/downloads/...)')
|
dp.add_argument(
|
||||||
|
"-o",
|
||||||
|
type=str,
|
||||||
|
default="",
|
||||||
|
metavar="file",
|
||||||
|
help="output file to be used",
|
||||||
|
)
|
||||||
|
dp.add_argument(
|
||||||
|
"-v", action="store_true", help="get verbose/debug logging"
|
||||||
|
)
|
||||||
|
dp.add_argument(
|
||||||
|
"url",
|
||||||
|
nargs="+",
|
||||||
|
type=str,
|
||||||
|
metavar="url",
|
||||||
|
help="URL (we.tl/... or wetransfer.com/downloads/...)",
|
||||||
|
)
|
||||||
|
|
||||||
# upload subcommand
|
# upload subcommand
|
||||||
up = sp.add_parser('upload', help='upload files')
|
up = sp.add_parser("upload", help="upload files")
|
||||||
up.add_argument('-m', type=str, default='', metavar='message',
|
up.add_argument(
|
||||||
help='message description for the transfer')
|
"-n",
|
||||||
up.add_argument('-f', type=str, metavar='from', help='sender email')
|
type=str,
|
||||||
up.add_argument('-t', nargs='+', type=str, metavar='to',
|
default="",
|
||||||
help='recipient emails')
|
metavar="display_name",
|
||||||
up.add_argument('files', nargs='+', type=str, metavar='file',
|
help="title for the transfer",
|
||||||
help='files to upload')
|
)
|
||||||
|
up.add_argument(
|
||||||
|
"-m",
|
||||||
|
type=str,
|
||||||
|
default="",
|
||||||
|
metavar="message",
|
||||||
|
help="message description for the transfer",
|
||||||
|
)
|
||||||
|
up.add_argument("-f", type=str, metavar="from", help="sender email")
|
||||||
|
up.add_argument(
|
||||||
|
"-t", nargs="+", type=str, metavar="to", help="recipient emails"
|
||||||
|
)
|
||||||
|
up.add_argument(
|
||||||
|
"-v", action="store_true", help="get verbose/debug logging"
|
||||||
|
)
|
||||||
|
up.add_argument(
|
||||||
|
"files", nargs="+", type=str, metavar="file", help="files to upload"
|
||||||
|
)
|
||||||
|
|
||||||
args = ap.parse_args()
|
args = ap.parse_args()
|
||||||
|
|
||||||
if args.action == 'download':
|
if args.v:
|
||||||
|
log.setLevel(logging.DEBUG)
|
||||||
|
|
||||||
|
if args.action == "download":
|
||||||
if args.g:
|
if args.g:
|
||||||
for u in args.url:
|
for u in args.url:
|
||||||
print(download_url(u))
|
print(download_url(u))
|
||||||
@@ -380,10 +679,6 @@ if __name__ == '__main__':
|
|||||||
download(u, args.o)
|
download(u, args.o)
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
if args.action == 'upload':
|
if args.action == "upload":
|
||||||
print(upload(args.files, args.m, args.f, args.t))
|
print(upload(args.files, args.n, args.m, args.f, args.t))
|
||||||
exit(0)
|
exit(0)
|
||||||
|
|
||||||
# No action selected, print help message
|
|
||||||
ap.print_help()
|
|
||||||
exit(1)
|
|
||||||
Reference in New Issue
Block a user