Skip to content

Commit b51439b

Browse files
Hiradorhgy59
andauthored
ps3netsrv: Update to v1.47.46e with ps3netsrv 20240210a (SynoCommunity#6090)
* Update to v1.47.46b with ps3netsrv 20240210 Updated the variables found on "spksrc/spk/ps3netsrv" and " spksrc/cross/ps3netsrv" to match the current version (v1.47.46b with ps3netsrv 20240210) of aldostools's ps3netsrv * Adjusted Changelog * Makefile updated Makefile updated so to meet requirements for the redesigned shared folder handling * ps3netsrv.conf updated ps3netsrv.conf updated so to meet requirements for the redesigned shared folder handling * service-setup.sh Updated service-setup.sh updated so to meet requirements for the redesigned shared folder handling * install_uifile updated install_uifile so to meet requirements for the redesigned shared folder handling * install_uifile_fre Updated install_uifile_fre updated so to meet requirements for the redesigned shared folder handling * install_uifile_rus Updated install_uifile_rus updated so to meet requirements for the redesigned shared folder handling * install_uifile_fre Update adjusted "step_title" * Fixed install_uifile Fixed syntax error found in Fixed install_uifile * Fix install_uifile_fre Fixed syntax error found in install_uifile_fre * Fix install_uifile_rus Fixed syntax error found on install_uifile_rus * Fix service-setup.sh adjusted sed function * ps3netsrv: add upgrade wizard - add upgrade page to configure shared folder when not recoverable from former installation - inspired by spk/sabnzbd/src/wizard/upgrade_uifile.sh but with priority on package config over installer-variables - correct the installer-variables file defining SHARE_PATH="name of the shared folder" on package updates - fixes DSM 6 update error "Failed to acquire resource after install ps3netsrv" --------- Co-authored-by: hgy59 <[email protected]>
1 parent 6278e13 commit b51439b

File tree

9 files changed

+181
-178
lines changed

9 files changed

+181
-178
lines changed

cross/ps3netsrv/Makefile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
PKG_NAME = ps3netsrv
2-
PKG_VERS = 1.47.45
2+
PKG_VERS = 1.47.46
33
PKG_EXT = tar.gz
44
PKG_DIST_NAME = $(PKG_VERS).$(PKG_EXT)
55
PKG_DIST_SITE = https://github.com/aldostools/webMAN-MOD/archive

cross/ps3netsrv/digests

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
ps3netsrv-1.47.45.tar.gz SHA1 4a7046a989d7bd0299c89e9e9ce4b2f43c1a7541
2-
ps3netsrv-1.47.45.tar.gz SHA256 50a686c3f14832c19361fee7105fda067f4f2341216acd27663903e041414f1e
3-
ps3netsrv-1.47.45.tar.gz MD5 a563112157101c7803aa632cdf529eff
1+
ps3netsrv-1.47.46.tar.gz SHA1 4660aed84e2ff74c482a163051abf1d8030c095c
2+
ps3netsrv-1.47.46.tar.gz SHA256 38db40a99cd5a9499381b24ddc80ec764567f2b739ea7520a8aefb1bba9f547c
3+
ps3netsrv-1.47.46.tar.gz MD5 7b4747444ac5a71fe8873dda21d07f93

spk/ps3netsrv/Makefile

+5-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
SPK_NAME = ps3netsrv
2-
SPK_VERS = 1.47.45
3-
SPK_REV = 8
2+
SPK_VERS = 1.47.46
3+
SPK_REV = 9
44
SPK_ICON = src/${SPK_NAME}.png
55

66
DEPENDS = cross/$(SPK_NAME)
@@ -10,7 +10,7 @@ MAINTAINER = Hirador
1010
DESCRIPTION = Allows PS3 content to be loaded from network. Please edit the default port “38008” to “14167” in your PS3's webMAN MOD Setup
1111
DESCRIPTION_FRE = Fournit l\'accès par le réseau aux contenus pour PS3. Veuillez modifier le port par défaut de "38008" à "14167" dans PS3 webMAN MOD Setup
1212
DISPLAY_NAME = ps3netsrv
13-
CHANGELOG = "Update to v1.47.45 with ps3netsrv 20220813."
13+
CHANGELOG = "Update to v1.47.46e with ps3netsrv 20240210a."
1414

1515
HOMEPAGE = https://github.com/aldostools/webMAN-MOD
1616
LICENSE = GPLv3
@@ -22,7 +22,8 @@ SERVICE_USER = auto
2222
SERVICE_SETUP = src/service-setup.sh
2323
SERVICE_PORT = 14167
2424
SERVICE_PORT_TITLE = $(DISPLAY_NAME)
25-
SERVICE_WIZARD_SHARE = wizard_data_directory
25+
WIZARDS_DIR = src/wizard/
26+
SERVICE_WIZARD_SHARENAME = wizard_shared_folder_name
2627
SERVICE_COMMAND = $${SYNOPKG_PKGDEST}/ps3netsrv-starter.sh
2728
NO_SERVICE_SHORTCUT = yes
2829

spk/ps3netsrv/src/ps3netsrv.conf

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
# ps3netsrv configuration
2-
PS3_DIR="@wizard_dir@"
2+
PS3_DIR="@share_path@"

spk/ps3netsrv/src/service-setup.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,6 @@ export CFG_FILE PID_FILE SERVICE_PORT
77
service_postinst ()
88
{
99
if [ "${SYNOPKG_PKG_STATUS}" == "INSTALL" ]; then
10-
sed -i -e "s|@wizard_dir@|${wizard_data_volume}/${wizard_data_directory}|g" ${CFG_FILE}
10+
sed -i -e "s|@share_path@|${SHARE_PATH}|g" ${CFG_FILE}
1111
fi
1212
}
+27-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,29 @@
11
[
2-
{
3-
"step_title": "PS3 files location",
4-
"items": [
5-
{
6-
"type": "combobox",
7-
"desc": "Please select a volume to use for the PS3 files folder",
8-
"subitems": [
9-
{
10-
"key": "wizard_data_volume",
11-
"desc": "Volume name",
12-
"displayField": "display_name",
13-
"valueField": "volume_path",
14-
"editable": false,
15-
"mode": "remote",
16-
"api_store": {
17-
"api": "SYNO.Core.Storage.Volume",
18-
"method": "list",
19-
"version": 1,
20-
"baseParams": {
21-
"limit": -1,
22-
"offset": 0,
23-
"location": "internal"
24-
},
25-
"root": "volumes",
26-
"idProperty": "volume_path",
27-
"fields": [
28-
"display_name",
29-
"volume_path"
30-
]
31-
},
32-
"validator": {
33-
"fn": "{console.log(arguments);return true;}"
34-
}
35-
}
2+
{
3+
"step_title": "PS3 files location",
4+
"items": [
5+
{
6+
"type": "textfield",
7+
"desc": "Please specify a shared folder for this package. This share is created at installation when it does not already exist.",
8+
"subitems": [
9+
{
10+
"key": "wizard_shared_folder_name",
11+
"desc": "Shared Folder",
12+
"defaultValue": "PS3",
13+
"validator": {
14+
"allowBlank": false,
15+
"regex": {
16+
"expr": "/^[\\w _-]+$/",
17+
"errorText": "Subdirectories are not supported."
18+
}
19+
}
20+
}
21+
]
22+
}, {
23+
"desc": "If you let the installer create the shared folder, it is created under the same volume as the package is installed. If you want to use a different volume for the share, you must create the shared folder in DSM Control Panel before, and enter the name of the existing share in the field above."
24+
}, {
25+
"desc": ""
26+
}
3627
]
37-
},
38-
{
39-
"type": "textfield",
40-
"desc": "Shared folder containing PS3 files (using the volume chosen above)",
41-
"subitems": [
42-
{
43-
"key": "wizard_data_directory",
44-
"desc": "Shared folder",
45-
"defaultValue": "PS3",
46-
"validator": {
47-
"allowBlank": false,
48-
"regex": {
49-
"expr": "/^[\\w _-]+$/",
50-
"errorText": "Subdirectories are not supported."
51-
}
52-
}
53-
}
54-
]
55-
}
56-
]
57-
}
58-
]
28+
}
29+
]
+27-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,29 @@
11
[
2-
{
3-
"step_title": "Emplacement des fichiers PS3",
4-
"items": [
5-
{
6-
"type": "combobox",
7-
"desc": "Veuillez sélectionner un volume à utiliser pour le dossier des fichiers PS3",
8-
"subitems": [
9-
{
10-
"key": "wizard_data_volume",
11-
"desc": "Nom du volume",
12-
"displayField": "display_name",
13-
"valueField": "volume_path",
14-
"editable": false,
15-
"mode": "remote",
16-
"api_store": {
17-
"api": "SYNO.Core.Storage.Volume",
18-
"method": "list",
19-
"version": 1,
20-
"baseParams": {
21-
"limit": -1,
22-
"offset": 0,
23-
"location": "internal"
24-
},
25-
"root": "volumes",
26-
"idProperty": "volume_path",
27-
"fields": [
28-
"display_name",
29-
"volume_path"
30-
]
31-
},
32-
"validator": {
33-
"fn": "{console.log(arguments);return true;}"
34-
}
35-
}
2+
{
3+
"step_title": "Emplacement des fichiers PS3",
4+
"items": [
5+
{
6+
"type": "textfield",
7+
"desc": "Veuillez spécifier un dossier partagé pour ce paquet.",
8+
"subitems": [
9+
{
10+
"key": "wizard_shared_folder_name",
11+
"desc": "Shared Folder",
12+
"defaultValue": "PS3",
13+
"validator": {
14+
"allowBlank": false,
15+
"regex": {
16+
"expr": "/^[\\w _-]+$/",
17+
"errorText": "Les sous-répertoires ne sont pas pris en charge."
18+
}
19+
}
20+
}
21+
]
22+
}, {
23+
"desc": "Si vous laissez le programme d'installation créer le dossier partagé, il est créé sous le même volume que celui où le paquet est installé. Si vous souhaitez utiliser un volume différent pour le partage, vous devez créer le dossier partagé dans le panneau de configuration DSM avant, et saisir le nom du partage existant dans le champ ci-dessus."
24+
}, {
25+
"desc": ""
26+
}
3627
]
37-
},
38-
{
39-
"type": "textfield",
40-
"desc": "Dossier partagé contenant des fichiers PS3 (en utilisant le volume choisi ci-dessus)",
41-
"subitems": [
42-
{
43-
"key": "wizard_data_directory",
44-
"desc": "Dossier partagé",
45-
"defaultValue": "PS3",
46-
"validator": {
47-
"allowBlank": false,
48-
"regex": {
49-
"expr": "/^[\\w _-]+$/",
50-
"errorText": "Les sous-répertoires ne sont pas pris en charge."
51-
}
52-
}
53-
}
54-
]
55-
}
56-
]
57-
}
58-
]
28+
}
29+
]
+27-56
Original file line numberDiff line numberDiff line change
@@ -1,58 +1,29 @@
11
[
2-
{
3-
"step_title": "Расположение файлов PS3",
4-
"items": [
5-
{
6-
"type": "combobox",
7-
"desc": "Выберите том, который будет использоваться для папки файлов PS3.",
8-
"subitems": [
9-
{
10-
"key": "wizard_data_volume",
11-
"desc": "Имя тома",
12-
"displayField": "display_name",
13-
"valueField": "volume_path",
14-
"editable": false,
15-
"mode": "remote",
16-
"api_store": {
17-
"api": "SYNO.Core.Storage.Volume",
18-
"method": "list",
19-
"version": 1,
20-
"baseParams": {
21-
"limit": -1,
22-
"offset": 0,
23-
"location": "internal"
24-
},
25-
"root": "volumes",
26-
"idProperty": "volume_path",
27-
"fields": [
28-
"display_name",
29-
"volume_path"
30-
]
31-
},
32-
"validator": {
33-
"fn": "{console.log(arguments);return true;}"
34-
}
35-
}
2+
{
3+
"step_title": "Расположение файлов PS3",
4+
"items": [
5+
{
6+
"type": "textfield",
7+
"desc": "Укажите общую папку для этого пакета. Этот общий ресурс создается при установке, когда он еще не существует.",
8+
"subitems": [
9+
{
10+
"key": "wizard_shared_folder_name",
11+
"desc": "Shared Folder",
12+
"defaultValue": "PS3",
13+
"validator": {
14+
"allowBlank": false,
15+
"regex": {
16+
"expr": "/^[\\w _-]+$/",
17+
"errorText": "Подкаталоги не поддерживаются."
18+
}
19+
}
20+
}
21+
]
22+
}, {
23+
"desc": "Если вы позволите установщику создать общую папку, она будет создана на том же томе, где установлен пакет. Если вы хотите использовать другой том для общей папки, необходимо заранее создать общую папку на панели управления DSM и ввести имя существующей общей папки в поле выше."
24+
}, {
25+
"desc": ""
26+
}
3627
]
37-
},
38-
{
39-
"type": "textfield",
40-
"desc": "Общая папка, содержащая файлы PS3 (используя выбранный выше том)",
41-
"subitems": [
42-
{
43-
"key": "wizard_data_directory",
44-
"desc": "Общая папка",
45-
"defaultValue": "PS3",
46-
"validator": {
47-
"allowBlank": false,
48-
"regex": {
49-
"expr": "/^[\\w _-]+$/",
50-
"errorText": "Подкаталоги не поддерживаются."
51-
}
52-
}
53-
}
54-
]
55-
}
56-
]
57-
}
58-
]
28+
}
29+
]

0 commit comments

Comments
 (0)