Use installer resources for DSM6, update TCL package #4562
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,125 @@ | ||
| [ | ||
| { | ||
| "step_title": "Basic configuration", | ||
| "items": [ | ||
| { | ||
| "type": "combobox", | ||
| "desc": "Please select a volume to use for the download folder", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_volume", | ||
| "desc": "volume name", | ||
| "displayField": "display_name", | ||
| "valueField": "volume_path", | ||
| "editable": false, | ||
| "mode": "remote", | ||
| "api_store": { | ||
| "api": "SYNO.Core.Storage.Volume", | ||
| "method": "list", | ||
| "version": 1, | ||
| "baseParams": { | ||
| "limit": -1, | ||
| "offset": 0, | ||
| "location": "internal" | ||
| }, | ||
| "root": "volumes", | ||
| "idProperty": "volume_path", | ||
| "fields": [ | ||
| "display_name", | ||
| "volume_path" | ||
| ] | ||
| }, | ||
| "validator": { | ||
| "fn": "{console.log(arguments);return true;}" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "textfield", | ||
| "desc": "Download shared folder (using the volume chosen above)", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_download_dir", | ||
|
There was a problem hiding this comment. Aaah, that is the trick, to use separate wizard variables for the volume and the share name! but this should work in the demoservice too. There was a problem hiding this comment. Only the folder name is used in the worker (not the full path), maybe we need to use Edit: Yes it works with the demoservice, I just messed up earlier (I still passed on the full path) There was a problem hiding this comment. Example from documentation: "data-share": {
"shares": [{
"name": "music",
"permission": {
"ro": ["AudioStation"]
}
}]
}There was a problem hiding this comment. @hgy59 whichever way we go, (new wizards or patch to remove spksrc/spk/demoservice/Makefile Lines 21 to 25 in 83f850f |
||
| "desc": "Download shared folder", | ||
| "defaultValue": "downloads", | ||
| "validator": { | ||
| "allowBlank": false, | ||
| "regex": { | ||
| "expr": "/^[\\w _-]+$/", | ||
| "errorText": "Subdirectories are not supported." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "textfield", | ||
| "desc": "Watch a directory for torrent files and add them to transmission. Leave empty to disable", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_watch_dir", | ||
| "desc": "Watch directory", | ||
| "validator": { | ||
| "allowBlank": true, | ||
| "regex": { | ||
| "expr": "/^\\\/volume\\w*[0-9]{1,2}\\\/[^<>: */?\"]*/", | ||
| "errorText": "Path should begin with /volumename?/ where volumename can be 'volume' or also 'volumeUSB' and ? is the volume number (1-99)." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "textfield", | ||
| "desc": "Directory to keep files in until torrent is complete. Leave empty to disable", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_incomplete_dir", | ||
| "desc": "Incomplete directory", | ||
| "validator": { | ||
| "allowBlank": true, | ||
| "regex": { | ||
| "expr": "/^\\\/volume\\w*[0-9]{1,2}\\\/[^<>: */?\"]*/", | ||
| "errorText": "Path should begin with /volumename?/ where volumename can be 'volume' or also 'volumeUSB' and ? is the volume number (1-99)." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "step_title": "Basic configuration", | ||
| "items": [ | ||
| { | ||
| "type": "textfield", | ||
| "desc": "Web interface username. Defaults to admin", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_username", | ||
| "desc": "Username" | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "password", | ||
| "desc": "Web interface password. Defaults to admin", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_password", | ||
| "desc": "Password" | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "step_title": "DSM Permissions", | ||
| "items": [ | ||
| { | ||
| "desc": "Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details." | ||
| } | ||
| ] | ||
| } | ||
| ] | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,60 @@ | ||
| [{ | ||
| "step_title": "DSM Permissions", | ||
| "items": [{ | ||
| "desc": "Please read <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> for details." | ||
| }, | ||
| { | ||
| "desc": "<strong style='color:red'>NOTE:</strong> The package upgrade will try to set the correct permissions on your folders. If you get permission errors within Transmission, manually set Read/Write permissions on the reported folders using File Station." | ||
| }, | ||
| { | ||
| "type": "combobox", | ||
| "desc": "Please select a volume to use for the download folder", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_volume", | ||
| "desc": "volume name", | ||
| "displayField": "display_name", | ||
| "valueField": "volume_path", | ||
| "editable": false, | ||
| "mode": "remote", | ||
| "api_store": { | ||
| "api": "SYNO.Core.Storage.Volume", | ||
| "method": "list", | ||
| "version": 1, | ||
| "baseParams": { | ||
| "limit": -1, | ||
| "offset": 0, | ||
| "location": "internal" | ||
| }, | ||
| "root": "volumes", | ||
| "idProperty": "volume_path", | ||
| "fields": [ | ||
| "display_name", | ||
| "volume_path" | ||
| ] | ||
| }, | ||
| "validator": { | ||
| "fn": "{console.log(arguments);return true;}" | ||
| } | ||
| } | ||
| ] | ||
| }, | ||
| { | ||
| "type": "textfield", | ||
| "desc": "Download shared folder (using the volume chosen above)", | ||
| "subitems": [ | ||
| { | ||
| "key": "wizard_download_dir", | ||
| "desc": "Download shared folder", | ||
| "defaultValue": "downloads", | ||
| "validator": { | ||
| "allowBlank": false, | ||
| "regex": { | ||
| "expr": "/^[\\w _-]+$/", | ||
| "errorText": "Subdirectories are not supported." | ||
| } | ||
| } | ||
| } | ||
| ] | ||
| }] | ||
| }] |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,9 +1,9 @@ | ||
| [{ | ||
| "step_title": "Permissions DSM", | ||
| "items": [{ | ||
| "desc": "Merci de lire <a target=\"_blank\" href=\"https://github.com/SynoCommunity/spksrc/wiki/Permission-Management\">Permission Management</a> pour plus de détails." | ||
| }, | ||
| { | ||
| "desc": "En cas d'erreur de permission dans Transmission, donner les droits de Lecture/Ecriture sur les repertoires mentionnés depuis File Station." | ||
| }] | ||
| }] |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Something interesting to note:
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I have to test shared folders with DSM6 anyway. I will look whether dsm6 resource worker will create such links too.