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.

Sign up for GitHub

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

[plato] Update to 0.9.17-1 #344

Merged
merged 8 commits into from
May 10, 2021
Merged

[plato] Update to 0.9.17-1 #344

Changes from 6 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
642322c
Update plato to 0.9.16-1
LinusCDE Apr 18, 2021
a5de74b
Fix formatting
LinusCDE Apr 18, 2021
f520061
Fix linting errors
LinusCDE Apr 19, 2021
e72c790
Update messages for metadata updates
LinusCDE Apr 19, 2021
aaf5eac
Update plato to 0.9.17
LinusCDE May 2, 2021
c5e17c7
Merge branch 'testing' into feature/update-plato
raisjn May 2, 2021
5efcaa1
Improve migration script
matteodelabre May 9, 2021
de05c67
Merge branch 'testing' into feature/update-plato
matteodelabre May 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 52 additions & 8 deletions package/plato/package
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,18 +5,18 @@
pkgnames=(plato)
pkgdesc="Document reader"
url=https://github.com/LinusCDE/plato
pkgver=0.9.13-2
timestamp=2021-01-13T23:43Z
pkgver=0.9.17-1
timestamp=2021-05-02T14:39Z
section="readers"
maintainer="Linus K. <linus@cosmos-ink.net>"
license=AGPL-3.0-or-later
installdepends=(display)
installdepends=(display jq)
makedepends=(build:jq build:unzip build:wget)
flags=(patch_rm2fb)

image=rust:v1.4
source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-7.zip")
sha256sums=(17718d74066e5cbec043c98b52958a311eb793674751d6b7789b5baff2227f96)
image=rust:v1.6
source=("https://github.com/LinusCDE/plato/archive/${pkgver%-*}-rm-release-10.zip")
sha256sums=(25aae17979d9e259d228617eb26a0cc89a6251968b8fc355b8cde36fd6b26773)

build() {
# Fall back to system-wide config
Expand Down Expand Up @@ -62,12 +62,56 @@ package() {
configure() {
local mediadir=/home/root/plato-media

# This directory should not be tracked by opkg
# so that its contents are kept after removing
if [ ! -d $mediadir ]; then
# This directory should not be tracked by opkg
# so that its contents are kept after removing
mkdir $mediadir
echo ""
echo "Place your media files for plato in '$mediadir'"
echo ""
else
# Fix breaking change introduced in version 0.9.14
# https://github.com/baskerville/plato/releases/tag/0.9.14

local metadata_file=$mediadir/.metadata.json
local metadata_file_old=$mediadir/.metadata-old.json

local max_key_len
[ -e $metadata_file ] && max_key_len=$(jq --raw-output 'keys[]' < $metadata_file | wc -L) || max_key_len=-1
if [ "$max_key_len" -gt 16 ] && [ ! -e $metadata_file_old ]; then

echo ""
echo "In Plato 0.9.14 the metadata format for libraries changed."
echo "Found your outdated metadata file. Will update it automatically..."

# Routine is based on baskerville's migrate-hex_keys.py (from the release page)
# Rewritten in bash to only require jq rather than python.
mv $metadata_file $metadata_file_old
local change_cmds=""
local del_list=""
for key in $(jq --raw-output 'keys[]' < $metadata_file_old); do
hex_key=$(printf %016X "$key")
#echo "Key: $key --> $hex_key"

[ -z "$del_list" ] || del_list="${del_list}, "
[ -z "$change_cmds" ] || change_cmds="${change_cmds} | "
del_list="${del_list}.[\"${key}\"]"
change_cmds="${change_cmds}.[\"$hex_key\"] = .[\"$key\"]"
done

# Create updated json file
jq "$change_cmds | del($del_list)" < $metadata_file_old > $metadata_file
echo "Update complete. The old file was renamed to '.metadata-old.json'."
echo ""

elif [ "$max_key_len" -gt 16 ] && [ -e $metadata_file_old ] || [ ! -e $metadata_file ]; then
echo ""
echo "In Plato 0.9.14 the metadata format for libraries changed."
echo "MANUAL INTERVENTION REQUIRED\!\!\!"
echo "Please follow the following guide to update your library metadata manually:"
echo "https://github.com/baskerville/plato/releases/tag/0.9.14"
echo "Please LAUNCH plato ONLY AFTER this was done\!"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i didn't go through this, i just blew it away and restarted. i think this should be done automatically (since it makes a backup, i think?) and the user notified

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I agree, this should be done automagically by the package. It's one of the use-cases for pre/post upgrade scripts.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I used configure as I feared pre/post upgrade might miss cases where a user fully reinstalled a package. The script checks for old versions of the metadata and I attempted to make it check more often/reliably this way.

I can change this tomorrow though. Is still a good point.

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i think i'm a bit confused. when i upgraded plato, i got the message (MANUAL INTERVENTION REQUIRED), but it looks like you automatically do the migration for people. Did I get that message because I didn't have any metadata?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this happened because you seem like you didn't do the migration but also have a .old (backup) file. I just didn't support that usecase and added that hint instead of trying to deal with it.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also just looked at the docs:

When upgrading a package from version A to B, the following happens:

  • preupgrade B, if it exists, is called from version A
  • Old package files are removed (except configuration files)
  • postupgrade B, if it exists, is called from version A
  • New package files are unpacked and installed
  • configure, if it exists, is called from version B

If I read this correctly, calling postupgrade wouldn't make sense since it would only call if this package ever gets upgraded to a future one.

echo ""
fi
fi
}