Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Time selection adjustment #154

Merged
merged 1 commit into from
Dec 1, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
7 changes: 4 additions & 3 deletions CHANGELOG
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ License: GPL3
Change Log:

+------------------------------------+
Nov 27, 2022 V.4.0.2
Nov 29, 2022 V.4.0.2

* Added language selection on preferences dialog.
* Fixed check for new Videomass releases according to git API (on previous
Expand All @@ -19,9 +19,10 @@ Nov 27, 2022 V.4.0.2
* Updated setup dialog for simpified Chinese lang support.
* Added support for French language fr_FR
* Updated setup dialog for French lang support.
* Removed the tool to update the downloader inside the Videomass.AppImage,
* Removed the tool to update the downloader inside the Videomass.AppImage,
because it turns out to be inefficient and problematic (see #142).

* Added a new button in the timeline panel that shows an alternative dialog
to adjust the time selection (see #150)
+------------------------------------+
May 02, 2022 V.4.0.1

Expand Down
4 changes: 3 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,10 @@ videomass (4.0.2-1) UNRELEASED; urgency=medium
* Updated setup dialog for simpified Chinese lang support.
* Added support for French language fr_FR
* Updated setup dialog for French lang support.
* Removed the tool to update the downloader inside the Videomass.AppImage,
* Removed the tool to update the downloader inside the Videomass.AppImage,
because it turns out to be inefficient and problematic (see #142).
* Added a new button in the timeline panel that shows an alternative dialog
to adjust the time selection (see #150)

-- Gianluca Pernigotto <jeanlucperni@gmail.com> Sun, 27 Nov 2022 17:00:00 +0200

Expand Down
1 change: 1 addition & 0 deletions develop/make_pot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ $XGETTEXT -d videomass "../gui_app.py" \
"../vdms_dialogs/mediainfo.py" \
"../vdms_dialogs/widget_utils.py" \
"../vdms_dialogs/showlogs.py" \
"../vdms_dialogs/time_selector.py" \
"../vdms_frames/ffmpeg_conf.py" \
"../vdms_frames/ffmpeg_codecs.py" \
"../vdms_frames/ffmpeg_formats.py" \
Expand Down
91 changes: 91 additions & 0 deletions develop/tools/AppImage_Update_Tool.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,91 @@
#!/usr/bin/env bash
#
# Description:
# ------------
# Updates pip, certifi, yt-dlp and youtube-dl packages inside
# Videomass*.AppImage.
#
# Usage:
# ------
# - Place this script in your preferred location with execute permissions.
# - Call this script from a terminal window (not root!)
# - Make sure you give it the Videomass AppImage location as argument.
# - Then run it and wait for the task to finish.
#
# EXAMPLE:
# ~$ ./VideomassAppImage_updater.sh /some/other/dir/Videomass*.AppImage
#
# Author: Gianluca Pernigotto <jeanlucperni@gmail.com>
# Copyright: (c) 2020-2022 Gianluca Pernigotto <jeanlucperni@gmail.com>
# Update: Nov.27.2022
#
# please visit <https://misc.flogisoft.com/bash/tip_colors_and_formatting>
# for colors code.

set -e # stop if error

# check for $1
if [ -z "$1" ] ; then
echo "ERROR: missing argument: provide a valid pathname to Videomass*.AppImage"
exit 1
fi

SITEPKG="squashfs-root/opt/python3.9/lib/python3.9/site-packages"
APPIMAGE=$(readlink -f $1) # selected videomass appimage pathname (absolute path)
BASENAME="$(basename $APPIMAGE)" # videomass name
DIRNAME="$(dirname $APPIMAGE)" # videomass directory

# check for proper filename
if [[ "${BASENAME}" != Videomass-*-x86_64.AppImage ]] ; then
echo "ERROR: requires a Videomass AppImage"
exit 1
fi

# building in temporary directory to keep system clean.
# Don't use /dev/shm as on some Linux distributions it may have noexec set
TEMP_BASE=/tmp

BUILD_DIR=$(mktemp -d -p "$TEMP_BASE" videomass-AppImage-update-XXXXXX)

# make sure to clean up build dir, even if errors occur
cleanup () {
if [ -d "$BUILD_DIR" ]; then
rm -rf "$BUILD_DIR"
fi
}
trap cleanup EXIT

# switch to build dir
pushd "$BUILD_DIR"

# extract appimage inside BUILD_DIR/
$APPIMAGE --appimage-extract

# export squashfs-root
export PATH="$(pwd)/squashfs-root/usr/bin:$PATH"

# update pip
./squashfs-root/opt/python3.9/bin/python3.9 -m pip install -U --target=$SITEPKG pip
# update certifi
./squashfs-root/opt/python3.9/bin/python3.9 -m pip install -U --target=$SITEPKG certifi
# update youtube_dl package
./squashfs-root/opt/python3.9/bin/python3.9 -m pip install -U --target=$SITEPKG youtube_dl
# update youtube_dl package
./squashfs-root/opt/python3.9/bin/python3.9 -m pip install -U --target=$SITEPKG yt_dlp

# retrieve the Videomass version from the package metadata
export VERSION=$(cat $SITEPKG/videomass-*.dist-info/METADATA | \
grep "^Version:.*" | cut -d " " -f 2)

# Download appimagetool for re-building AppImage
wget -c https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-x86_64.AppImage
chmod +x appimagetool-x86_64.AppImage

# Convert back into an AppImage
./appimagetool-x86_64.AppImage squashfs-root/

# move built AppImage back into original DIRNAME
mv -f Videomass*x86_64.AppImage "$DIRNAME/" # overwrites existent appimage
echo
echo -e '\e[5m\e[92m**Successfully updated**\e[25m\e[39m' # keyword for a successful exit status
echo -e '\e[1m\e[92m...To apply the update, restart Videomass AppImage now.\e[21m\e[39m'
Binary file modified videomass/locale/it_IT/LC_MESSAGES/videomass.mo
Binary file not shown.