diff --git a/README.md b/README.md index fc0b16b..03fd693 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in A movie collection manager for Usenet and BitTorrent users. -**Shipped version:** 3.2.0.5048~ynh1 +**Shipped version:** 3.2.2.5080~ynh1 @@ -30,6 +30,7 @@ A movie collection manager for Usenet and BitTorrent users. * Supported architectures are `arm`, `arm64`, and `amd64` * Access control is done with YunoHost's permissions system. * API (`domain.tld/path/api`) can be accessed by visitors to allow control by remote clients. +* The app uses YunoHost's multimedia directories, hence it has write access to users' and shared directories in `/home/yunohost.multimedia`. After installation, you can choose these directories to store your media. ## Documentation and resources diff --git a/README_fr.md b/README_fr.md index 80ce0d6..a985260 100644 --- a/README_fr.md +++ b/README_fr.md @@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent. -**Version incluse :** 3.2.0.5048~ynh1 +**Version incluse :** 3.2.2.5080~ynh1 @@ -26,6 +26,7 @@ Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent. * Les architectures compatibles sont `arm`, `arm64`, et `amd64` * Le contrôle de l'accès se fait avec le système de permissions de YunoHost. * L'API (`domain.tld/path/api`) est accessible aux visiteurs pour permettre le contrôle via des clients externes. +* L'application utilise les dossiers multimédia de YunoHost, elle a donc accès en écriture aux dossiers utilisateurs et communs de `/home/yunohost.multimedia`. Après installation, vous pourrez choisir ces dossiers pour y stocker vos médias. ## Documentations et ressources diff --git a/check_process b/check_process index 0b1d043..513b501 100644 --- a/check_process +++ b/check_process @@ -18,6 +18,7 @@ setup_public=1 upgrade=1 #upgrade=1 from_commit=CommitHash + upgrade=1 from_commit=164fa2341225bc8ce7671d0f70cc696ed8ab58a7 backup_restore=1 multi_instance=1 port_already_use=0 @@ -26,6 +27,6 @@ Email= Notification=none ;;; Upgrade options - ; commit=CommitHash - name=Name and date of the commit. - manifest_arg=domain=DOMAIN&path=PATH&admin=USER&language=fr&is_public=1&password=pass&port=666& + ; commit=164fa2341225bc8ce7671d0f70cc696ed8ab58a7 + name=2021-06-03 v3.2.0.5048 + manifest_arg=domain=DOMAIN&path=PATH&admin=USER&port=666& diff --git a/conf/app.arm.src b/conf/app.arm.src index c4248ed..9f95997 100644 --- a/conf/app.arm.src +++ b/conf/app.arm.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.0.5048/Radarr.master.3.2.0.5048.linux-core-arm.tar.gz -SOURCE_SUM=7fea2d7e755de4a6a4fd34ab430c65bc8428c0d19c96957b4b192f7844973494 +SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.2.5080/Radarr.master.3.2.2.5080.linux-core-arm.tar.gz +SOURCE_SUM=7300be4d40037b08bdb10708a198eebb47d59fe868c119d51df3597257a39e11 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.arm64.src b/conf/app.arm64.src index 2267d34..169c8aa 100644 --- a/conf/app.arm64.src +++ b/conf/app.arm64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.0.5048/Radarr.master.3.2.0.5048.linux-core-arm64.tar.gz -SOURCE_SUM=6c00cecaa32da228acba01c5efc04d62552beab1c4383130d3966403820c5607 +SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.2.5080/Radarr.master.3.2.2.5080.linux-core-arm64.tar.gz +SOURCE_SUM=f4ebb4f0f2371cd40ee836bbe99324cf1d50954fa86aaf53afebea3d3d39c67c SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/conf/app.x64.src b/conf/app.x64.src index 245ecd2..6ad211b 100644 --- a/conf/app.x64.src +++ b/conf/app.x64.src @@ -1,5 +1,5 @@ -SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.0.5048/Radarr.master.3.2.0.5048.linux-core-x64.tar.gz -SOURCE_SUM=bae0f6dbf2bc8f11b3aa4b87b06e8dca1c4da3fed92724d7904b822a13fc94c3 +SOURCE_URL=https://github.com/Radarr/Radarr/releases/download/v3.2.2.5080/Radarr.master.3.2.2.5080.linux-core-x64.tar.gz +SOURCE_SUM=2300fb3c5473ea68c48d44dba6a22da2bbc5301fe170c7118471bc5d01efd223 SOURCE_SUM_PRG=sha256sum SOURCE_FORMAT=tar.gz SOURCE_IN_SUBDIR=true diff --git a/doc/DISCLAIMER.md b/doc/DISCLAIMER.md index 2502870..057af7d 100644 --- a/doc/DISCLAIMER.md +++ b/doc/DISCLAIMER.md @@ -1,3 +1,4 @@ * Supported architectures are `arm`, `arm64`, and `amd64` * Access control is done with YunoHost's permissions system. * API (`domain.tld/path/api`) can be accessed by visitors to allow control by remote clients. +* The app uses YunoHost's multimedia directories, hence it has write access to users' and shared directories in `/home/yunohost.multimedia`. After installation, you can choose these directories to store your media. diff --git a/doc/DISCLAIMER_fr.md b/doc/DISCLAIMER_fr.md index 1e71b63..aeb69c3 100644 --- a/doc/DISCLAIMER_fr.md +++ b/doc/DISCLAIMER_fr.md @@ -1,3 +1,4 @@ * Les architectures compatibles sont `arm`, `arm64`, et `amd64` * Le contrôle de l'accès se fait avec le système de permissions de YunoHost. * L'API (`domain.tld/path/api`) est accessible aux visiteurs pour permettre le contrôle via des clients externes. +* L'application utilise les dossiers multimédia de YunoHost, elle a donc accès en écriture aux dossiers utilisateurs et communs de `/home/yunohost.multimedia`. Après installation, vous pourrez choisir ces dossiers pour y stocker vos médias. diff --git a/manifest.json b/manifest.json index 9a1dd97..aa95954 100644 --- a/manifest.json +++ b/manifest.json @@ -6,7 +6,7 @@ "en": "A movie collection manager for Usenet and BitTorrent users.", "fr": "Un gestionnaire de filmothèque pour utilisateurs de Usenet et BitTorrent." }, - "version": "3.2.0.5048~ynh1", + "version": "3.2.2.5080~ynh1", "url": "https://radarr.video", "upstream": { "license": "GPL-3.0-only", @@ -20,7 +20,7 @@ "email": "tituspijean@outlook.com" }, "requirements": { - "yunohost": ">= 4.1.3" + "yunohost": ">= 4.2" }, "multi_instance": true, "services": [ diff --git a/scripts/_common.sh b/scripts/_common.sh index 28689fd..8abad26 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -4,7 +4,7 @@ # COMMON VARIABLES #================================================= -version="3.2.0.5048" +version="3.2.2.5080" # Supported architectures supported_architectures=("arm" "arm64" "x64") diff --git a/scripts/install b/scripts/install index e209802..e8f9e19 100755 --- a/scripts/install +++ b/scripts/install @@ -124,6 +124,16 @@ ynh_replace_string --match_string="7878" --replace_string="$p ynh_replace_string --match_string="" --replace_string="$path_url" --target_file="$final_path/.data/config.xml" ynh_replace_string --match_string="\*" --replace_string="127.0.0.1" --target_file="$final_path/.data/config.xml" +#================================================= +# YUNOHOST MULTIMEDIA INTEGRATION +#================================================= +ynh_script_progression --message="Adding multimedia directories..." --weight=2 + +# Build YunoHost multimedia directories +ynh_multimedia_build_main_dir +# Enable writing into these directories +ynh_multimedia_addaccess $app + #================================================= # GENERIC FINALIZATION #================================================= diff --git a/scripts/restore b/scripts/restore index 4bcca24..16de336 100755 --- a/scripts/restore +++ b/scripts/restore @@ -76,6 +76,16 @@ chmod 750 "$final_path" chmod -R o-rwx "$final_path" chown -R $app:$app "$final_path" +#================================================= +# YUNOHOST MULTIMEDIA INTEGRATION +#================================================= +ynh_script_progression --message="Adding multimedia directories..." --weight=2 + +# Build YunoHost multimedia directories +ynh_multimedia_build_main_dir +# Enable writing into these directories +ynh_multimedia_addaccess $app + #================================================= # SPECIFIC RESTORATION #================================================= diff --git a/scripts/update_version.sh b/scripts/update_version.sh index 03cc08f..2d0143a 100755 --- a/scripts/update_version.sh +++ b/scripts/update_version.sh @@ -67,4 +67,10 @@ sed -i "s# \"version\": \".*# \"version\": \"${version}\~ynh1\",#" ../mani # TODO: Run README generator git add . -git commit ../README.md ../README_fr.md ../manifest.json ../conf/app.*.src -m "Upgrade to v$version" + +message="Upgrade to v$version" +if [ "$message" == "$(git show -s --format=%s)" ]; then + git commit _common.sh ../manifest.json ../conf/app.*.src --amend -m "$message" +else + git commit _common.sh ../manifest.json ../conf/app.*.src -m "$message" +fi