YunoHost-Apps/ums_ynh
1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/UMS_ynh.git synced 2024-10-01 13:35:01 +02:00
Code Issues Activity Actions

Merge pull request #17 from YunoHost-Apps/testing

Browse source 
Version 10.10.0
This commit is contained in:
Krakinou 2021-08-19 22:35:26 +02:00 • committed by GitHub
commit bbe0df2854
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 40 additions and 51 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -17,7 +17,7 @@ If you don't have YunoHost, please consult [the guide](https://yunohost.org/#/in
A DLNA, UPnP and HTTP(S) Media Server A DLNA, UPnP and HTTP(S) Media Server
**Shipped version:** 10.9.0 **Shipped version:** 10.10.0

2
README_fr.md
View file

@ -13,7 +13,7 @@ Si vous n'avez pas YunoHost, regardez [ici](https://yunohost.org/#/install) pour
Un Serveur Multimedia DLNA, UPnP et HTTP(S) Un Serveur Multimedia DLNA, UPnP et HTTP(S)
**Version incluse :** 10.9.0 **Version incluse :** 10.10.0

2
check_process
View file

@ -13,7 +13,7 @@
setup_private=1 setup_private=1
setup_public=1 setup_public=1
upgrade=1 upgrade=1
upgrade=1 from_commit=f139d772db4a6180bd6f95f476cffcff8f561f3e upgrade=1 from_commit=bc1a48f956ec737b7a9cf141a9d9437a5b636f10
backup_restore=1 backup_restore=1
multi_instance=0 multi_instance=0
port_already_use=1 port_already_use=1

32
conf/UMS.conf.default
View file

@ -102,7 +102,7 @@ language =
# On headless systems, this should be set to true. # On headless systems, this should be set to true.
# On macOS this is overridden to false. # On macOS this is overridden to false.
# Default: false # Default: false
minimized = true minimized =
# Check for updates on program start # Check for updates on program start
# ---------------------------------- # ----------------------------------
@ -411,17 +411,19 @@ show_aperture_library =
# Enable the cache # Enable the cache
# ---------------- # ----------------
# Without a cache, when the client browses a folder, content is listed in # WARNING: Disabling this will also disable the fully played status feature.
# real-time. With a cache, additional information becomes available and the # When enabled, it makes all browsing significantly faster and enables features
# cache can be browsed directly. # like played status tracking.
# Default: true # Default: true
use_cache = use_cache =
# Show the "Media Library" folder # Show the "Media Library" folder
# ------------------------------- # -------------------------------
# Whether the Media Library folder is shown on clients. # If enabled, the Media Library folder will be available, which lets you
# dynamically filter and sort your media by things like played status, genre,
# rating, etc.
# Default: true # Default: true
show_media_library_folder = false= show_media_library_folder =
# Browse compressed archives (zip, rar, etc.) # Browse compressed archives (zip, rar, etc.)
# ------------------------------------------- # -------------------------------------------
@ -459,13 +461,6 @@ show_live_subtitles_folder = true
# Default: 10000 # Default: 10000
atz_limit = atz_limit =
# Show the "New Media" folder
# ---------------------------
# Whether the New Media folder is shown on clients.
# Contents of the folder provide access to all unplayed (new) media.
# Default: false
show_new_media_folder =
# Enable video resuming # Enable video resuming
# --------------------- # ---------------------
# Whether to show virtual "Resume:" files to allow resuming videos. # Whether to show virtual "Resume:" files to allow resuming videos.
@ -490,13 +485,14 @@ show_recently_played_folder =
# 3 = Move file to a different folder # 3 = Move file to a different folder
# 4 = Move file to recycle/trash bin. It will not do anything if this isn't # 4 = Move file to recycle/trash bin. It will not do anything if this isn't
# possible # possible
# 5 = Move file to a different folder, and mark it like option 1
# #
# Default: 1 # Default: 1
fully_played_action = fully_played_action =
# Fully played output directory # Fully played output directory
# ----------------------------- # -----------------------------
# The directory to move fully played files to if "Fully played action" is 3. # The directory to move fully played files to if "Fully played action" is 3 or 5.
# #
# Default: "" # Default: ""
fully_played_output_directory = fully_played_output_directory =
@ -535,8 +531,8 @@ folders = /home/yunohost.multimedia/share
# Monitor played status of files # Monitor played status of files
# ------------------------------ # ------------------------------
# List of folders to be monitored for changes. Folders that aren't monitored # List of folders to be monitored for changes like file additions/removals, and
# won't register new media with the New Media folder. # fully played status.
# Default: "" # Default: ""
folders_monitored =/home/yunohost.multimedia/share folders_monitored =/home/yunohost.multimedia/share
@ -548,14 +544,14 @@ folders_monitored = /home/yunohost.multimedia/share
# ----------------------------------- # -----------------------------------
# The list is in no particular order, and can be set to "None" to disable all # The list is in no particular order, and can be set to "None" to disable all
# transcoding engines. # transcoding engines.
# Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,FFmpegAudio,tsMuxeRAudio,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,DCRaw" # Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,FFmpegAudio,tsMuxeRAudio,youtubeDl,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,DCRaw"
engines = engines =
# Ordered list of transcoding engines priority # Ordered list of transcoding engines priority
# -------------------------------------------- # --------------------------------------------
# All engines should be included regardless of their enabled status. Set blank # All engines should be included regardless of their enabled status. Set blank
# to have the default list generated upon next start. # to have the default list generated upon next start.
# Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,AviSynthFFmpeg,AviSynthMEncoder,FFmpegAudio,tsMuxeRAudio,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,VLCVideo,DCRaw" # Default: "FFmpegVideo,MEncoderVideo,tsMuxeRVideo,AviSynthFFmpeg,AviSynthMEncoder,FFmpegAudio,tsMuxeRAudio,youtubeDl,FFmpegWebVideo,VLCWebVideo,VLCVideoStreaming,MEncoderWebVideo,VLCAudioStreaming,VLCVideo,DCRaw"
engines_priority = engines_priority =
# ---------------------------------------------------------------------------- # ----------------------------------------------------------------------------

29
conf/WEB.conf.default
View file

@ -2,9 +2,7 @@
# # # #
# WEB.conf: configure support for web feeds and streams # # WEB.conf: configure support for web feeds and streams #
# # # #
# NOTE: This file must be placed in the profile directory to work: # # NOTE: This file must be placed in the profile directory to work #
# #
# http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=3507&p=32731#p32731 #
# # # #
# Supported types: # # Supported types: #
# # # #
@ -12,37 +10,29 @@
# # # #
# Format for feeds: # # Format for feeds: #
# # # #
# type.folders,separated,by,commas=URL # # type.folders,separated,by,commas=URL,,,name #
# # # #
# Format for streams: # # Format for streams: #
# # # #
# type.folders,separated,by,commas=name for audio/video stream,URL,optional thumbnail URL # # type.folders,separated,by,commas=name,URL,optional thumbnail URL #
# #
# For more web feed/stream options, see: #
# #
# http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=3507&p=37084#p37084 #
# http://www.ps3mediaserver.org/forum/viewtopic.php?f=6&t=8776&p=46696#p46696 #
# # # #
########################################################################################################## ##########################################################################################################
# image feeds # image feeds
imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?format=rss2 imagefeed.Web,Pictures=https://api.flickr.com/services/feeds/photos_public.gne?format=rss2
imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=39453068@N05&format=rss2 imagefeed.Web,Pictures=https://api.flickr.com/services/feeds/photos_public.gne?id=39453068@N05&format=rss2
imagefeed.Web,Pictures=http://api.flickr.com/services/feeds/photos_public.gne?id=14362684@N08&format=rss2 imagefeed.Web,Pictures=https://api.flickr.com/services/feeds/photos_public.gne?id=14362684@N08&format=rss2
imagefeed.Web,Pictures=http://picasaweb.google.fr/data/feed/base/user/nefuisalbum/albumid/5218433104757705489?alt=rss&kind=photo&hl=en_US
imagefeed.Web,Pictures=http://picasaweb.google.com/data/feed/base/user/FenderStratRocker?alt=rss&kind=album&hl=en_US&access=public
# audio feeds # audio feeds
audiofeed.Web,Podcasts=https://rss.art19.com/caliphate audiofeed.Web,Podcasts=https://rss.art19.com/caliphate
audiofeed.Web,Podcasts=https://www.nasa.gov/rss/dyn/Gravity-Assist.rss audiofeed.Web,Podcasts=https://www.nasa.gov/rss/dyn/Gravity-Assist.rss
audiofeed.Web,Podcasts=http://podcasts.joerogan.net/feed audiofeed.Web,Podcasts=http://podcasts.joerogan.net/feed
audiofeed.Web,Podcasts=http://wakingup.libsyn.com/rss audiofeed.Web,Podcasts=https://wakingup.libsyn.com/rss
audiofeed.Web,Podcasts=https://rss.art19.com/wolverine-the-long-night audiofeed.Web,Podcasts=https://rss.art19.com/wolverine-the-long-night
# video feeds # video feeds
videofeed.Web,Vodcasts=http://feeds.feedburner.com/tedtalks_video videofeed.Web,Vodcasts=https://feeds.feedburner.com/tedtalks_video
videofeed.Web,Vodcasts=https://www.nasa.gov/rss/dyn/nasax_vodcast.rss videofeed.Web,Vodcasts=https://www.nasa.gov/rss/dyn/nasax_vodcast.rss
videofeed.Web,Vodcasts=https://www.unicef.org/rss/unicef_television_vodcast.xml
videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC0PEAMcRK7Mnn2G1bCBXOWQ videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC0PEAMcRK7Mnn2G1bCBXOWQ
videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCccjdJEay2hpb5scz61zY6Q videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCccjdJEay2hpb5scz61zY6Q
videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCOiUKJ6lMU3yHbVNtNXJyfw videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCOiUKJ6lMU3yHbVNtNXJyfw
@ -51,6 +41,9 @@ videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_
videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC8-Th83bH_thdKZDJCrn88g videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UC8-Th83bH_thdKZDJCrn88g
videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCzRBkt4a2hy6HObM3cl-x7g videofeed.Web,YouTube Channels=https://www.youtube.com/feeds/videos.xml?channel_id=UCzRBkt4a2hy6HObM3cl-x7g
# audio streams
audiostream.Web,Radio=RNZ,http://radionz-ice.streamguys.com/national.mp3,https://www.rnz.co.nz/assets/cms_uploads/000/000/159/RNZ_logo-Te-Reo-NEG-500.png
# video streams # video streams
# videostream.Web,TV=France 24,mms://stream1.france24.yacast.net/f24_liveen,http://www.france24.com/en/sites/france24.com.en/themes/france24/logo-fr.png # videostream.Web,TV=France 24,mms://stream1.france24.yacast.net/f24_liveen,http://www.france24.com/en/sites/france24.com.en/themes/france24/logo-fr.png
# videostream.Web,TV=BFM TV (French TV),mms://vipmms9.yacast.net/bfm_bfmtv,http://upload.wikimedia.org/wikipedia/en/6/62/BFMTV.png # videostream.Web,TV=BFM TV (French TV),mms://vipmms9.yacast.net/bfm_bfmtv,http://upload.wikimedia.org/wikipedia/en/6/62/BFMTV.png

4
manifest.json
View file

@ -6,10 +6,10 @@
"en": "A DLNA, UPnP and HTTP(S) Media Server", "en": "A DLNA, UPnP and HTTP(S) Media Server",
"fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)" "fr": "Un Serveur Multimedia DLNA, UPnP et HTTP(S)"
}, },
"version": "10.9.0~ynh1", "version": "10.10.0~ynh1",
"url": "www.universalmediaserver.com", "url": "www.universalmediaserver.com",
"upstream": { "upstream": {
"version": "10.9.0", "version": "10.10.0",
"license": "GPL-2.0-or-later", "license": "GPL-2.0-or-later",
"website": "www.universalmediaserver.com", "website": "www.universalmediaserver.com",
"admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki", "admindoc": "https://github.com/UniversalMediaServer/UniversalMediaServer/wiki",

12
scripts/_common.sh
View file

@ -10,22 +10,22 @@ pkg_dependencies="mediainfo dcraw p7zip"
mach=`uname -m` mach=`uname -m`
case "$mach" in case "$mach" in
"armv6l" ) mach="armel" "armv6l" ) mach="armel"
sha256=ba056681a3f96afd700ad57d280cb56ab20c6f288fa2b3f89ac6c95d83f11651 sha256=4975bf06ad5cac301411302294a2dd36a337772d409f0b236640d75163e09dc1
#for some reason, jre is not in the tarball #for some reason, jre is not in the tarball
pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;; pkg_dependencies="$pkg_dependencies openjdk-8-jre" ;;
"armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then "armv7l" ) if [ $(dpkg --print-architecture) = "armhf" ]; then
mach="armhf" mach="armhf"
sha256=dc7a4e8108707c4b7a4206954591dfb9aa6891f713e9f34c43c259b3a239c0f4 sha256=ff3b7182d741b142b6708690239ff390c017ae0cdb0be0fd45bbd601686c61e1
pkg_dependencies="$pkg_dependencies openjdk-8-jre" pkg_dependencies="$pkg_dependencies openjdk-8-jre"
else else
mach="armel" mach="armel"
sha256=ba056681a3f96afd700ad57d280cb56ab20c6f288fa2b3f89ac6c95d83f11651 sha256=4975bf06ad5cac301411302294a2dd36a337772d409f0b236640d75163e09dc1
pkg_dependencies="$pkg_dependencies openjdk-8-jre" pkg_dependencies="$pkg_dependencies openjdk-8-jre"
fi ;; fi ;;
"armv8l" ) mach="arm64" "armv8l" ) mach="arm64"
sha256=dcba4970ab2c29aa994199a083db51ec0dee43581df4cf56503cbcf4592ba19c ;; sha256=9ee0844e9f32d14ffcbdec8f001767ae0bfc412e26bb3e63308f3df6b638bcb3 ;;
"x86_64" ) mach="x86_64" "x86_64" ) mach="x86_64"
sha256=58dda5dec6d37ad3a352060948ec5164439df066fdb54cbdc80a17c450877f84 ;; sha256=c0116491f44ae7345a6f991f847bc746761e54ccfeb54ad78a9059271c3af40b ;;
* ) mach="x86" * ) mach="x86"
sha256=5b0d0b5854db2c3f7dffbff9c017b7c1b7a23567852800a4ffb05fb7ae7b3e62 ;; sha256=426eebd0b516bc271fda4dab808e9fb2e1afd3a3e480d916e3ab6db456fd82d6 ;;
esac esac