-
-
Notifications
You must be signed in to change notification settings - Fork 1.2k
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.
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
Transmission DSM7 support #4719
Merged
Merged
Changes from 23 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
a51155e
[Transmission] Acquire Shared folder resource/permissions
publicarray 5096590
Transmission: Remove busybox from deps (#4373)
zyrill 4b4a035
Transmission: mentionnès -> mentionnés
publicarray f184908
Transmission fix upgrade from dsm6
publicarray 9d92dcd
fix shared folder resource worker on DSM6
publicarray 8c5efcf
style fix
publicarray 248c714
Also update the download folder on upgrades
publicarray 89ecc38
set default volume
publicarray 3a9dc6d
fix shellcheck warning
publicarray 54383ea
improve messages
publicarray 504d53b
transmission: attempt to create folders
publicarray ec52657
transmission: Let the package manage the "watch" and "incomplete"
publicarray 85c10f2
fix DSM Version specific Wizards
publicarray 222a49d
transmission: Let the package manage the "watch" and "incomplete"
publicarray 65be930
Move the upgrade wizard to DSM7 only
publicarray 53aca47
only update folder if DSM7
publicarray ca0dfd5
remove old wizards
publicarray 6942ad6
remove the extra validation
publicarray 5462944
revert some unnecessary changes
publicarray 992ede4
Migrate files
publicarray c20363d
create folder first
publicarray 2549bf4
make sure the config is consistent with the install config after upgrade
publicarray 8b0dae7
copy hidden folder/files too
publicarray 05a3a96
Update python path
publicarray cf67243
don't use legacy group for DSM7
publicarray e7de616
cleanup
publicarray File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
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 |
---|---|---|
@@ -0,0 +1,91 @@ | ||
[ | ||
{ | ||
"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", | ||
"desc": "Download shared folder", | ||
"defaultValue": "downloads", | ||
"validator": { | ||
"allowBlank": false, | ||
"regex": { | ||
"expr": "/^[\\w _-]+$/", | ||
"errorText": "Subdirectories are not supported." | ||
} | ||
} | ||
} | ||
] | ||
} | ||
] | ||
}, | ||
{ | ||
"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." | ||
} | ||
] | ||
} | ||
] |
Oops, something went wrong.
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.
As there is no
SPK_DEPENDS=python...
in this package, it is not defined which python should be used.For synocommunity packages the path
/usr/local/{package}
must not be used anymore, i.e. it must be defined as/var/packages/{package}/target
.I suppose that python2 should not be used anymore, so the package must be
python3
orpython38
.Proposal:
remove these lines and rely on python that is already installed and available in the path.
if no python is found in path, a lookup for synocommunity python3 and python38 could be used here to add it to the path for transmission.
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.
Thanks. Good catch! I didn't even notice that python can be used from transmission.
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.
As of DSM 7, Python 3 is standard available and can be found via the path.
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.
@hgy59 I didn't do any fancy detection because that is what $PATH is for anyway. Don't need to do it twice and this way it still works if a python package is added or removed. Agreed, for DSM7 the build in Python should be good enough.