Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Move config path to "script-opts" #3

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Move config path to "script-opts" #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
0 script-settings/Blackbox.conf.example → script-opts/Blackbox.conf.example
View file
Open in desktop
File renamed without changes.
0 script-settings/Colorbox.conf.example → script-opts/Colorbox.conf.example
View file
Open in desktop
File renamed without changes.
0 script-settings/Leapfrog.conf.example → script-opts/Leapfrog.conf.example
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion script-settings/README.md → script-opts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Script Configurations

This folder contains example configuration files. To enable them on your own
system, simply create the `script-settings/` folder in your mpv config path,
system, simply create the `script-opts/` folder in your mpv config path,
exactly as shown here (side by side with your `scripts/` folder).

The configurations automatically follow the `<current script name>.conf` format,
Expand Down
2 changes: 1 addition & 1 deletion scripts/Blackbox.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -794,7 +794,7 @@ Blackbox.prototype.switchMenu = function(forcePage)
(function() {
// Read user configuration (uses defaults for any unconfigured options).
// * You can override these values via the configuration system, as follows:
// - Via permanent file: `<mpv config dir>/script-settings/Blackbox.conf`
// - Via permanent file: `<mpv config dir>/script-opts/Blackbox.conf`
// - Command override: `mpv --script-opts=Blackbox-favorites="{/path1}+{/path2}"`
// - Or by editing this file directly (not recommended, makes your updates harder).
var userConfig = new Options.advanced_options({
Expand Down
2 changes: 1 addition & 1 deletion scripts/Leapfrog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ Leapfrog.prototype.jump = function(offset, rawOptions)
(function() {
// Read user configuration (uses defaults for any unconfigured options).
// * You can override these values via the configuration system, as follows:
// - Via permanent file: `<mpv config dir>/script-settings/Leapfrog.conf`
// - Via permanent file: `<mpv config dir>/script-opts/Leapfrog.conf`
// - Command override: `mpv --script-opts=Leapfrog-font_size=16`
// - Or by editing this file directly (not recommended, makes your updates harder).
var userConfig = new Options.advanced_options({
Expand Down
5 changes: 4 additions & 1 deletion scripts/modules.js/Options.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,10 @@ var ScriptConfig = function(options, identifier)
// Find config file.
if (this.scriptName && this.scriptName.length) {
mp.msg.debug('Reading options for '+this.scriptName+'.');
this.configFile = mp.find_config_file('script-settings/'+this.scriptName+'.conf');
this.configFile = mp.find_config_file('script-opts/'+this.scriptName+'.conf');

if (!this.configFile) // Try legacy settings location as fallback.
this.configFile = mp.find_config_file('script-settings/'+this.scriptName+'.conf');
if (!this.configFile) // Try legacy settings location as fallback.
this.configFile = mp.find_config_file('lua-settings/'+this.scriptName+'.conf');
}
Expand Down