feat(ui): add hash handler for configuration ids#2002

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

Merged
ReenigneArcher merged 2 commits into from
Jan 14, 2024
Merged

feat(ui): add hash handler for configuration ids #2002

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc01208
feat(ui): add hash handler for configuration ids
ReenigneArcher Jan 8, 2024
b8d1741
fix: replace defaultConfig with tab.options
ReenigneArcher Jan 8, 2024
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
8 changes: 5 additions & 3 deletions docs/source/about/advanced_usage.rst
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
.. code-block:: text

0x10, 0xA0,
0x11, 0xA2,
0x12, 0xA4
[
0x10, 0xA0,
0x11, 0xA2,
0x12, 0xA4
]

**Example**
.. code-block:: text
Expand Down
218 changes: 147 additions & 71 deletions src_assets/common/assets/web/config.html
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
import { createApp } from 'vue'
import Navbar from './Navbar.vue'

// Create dictionary for defaultConfig
//
// Note: Please keep this in alphabetical order!
const defaultConfig = {
"address_family": "ipv4",
"always_send_scancodes": "enabled",
"amd_coder": "auto",
"amd_preanalysis": "disabled",
"amd_quality": "balanced",
"amd_rc": "vbr_latency",
"amd_usage": "ultralowlatency",
"amd_vbaq": "enabled",
"av1_mode": 0,
"capture": "",
"controller": "enabled",
"ds4_back_as_touchpad_click": "enabled",
"encoder": "",
"fps": "[10,30,60,90,120]",
"gamepad": "auto",
"global_prep_cmd": "[]",
"hevc_mode": 0,
"high_resolution_scrolling": "enabled",
"install_steam_audio_drivers": "enabled",
"key_rightalt_to_key_win": "disabled",
"keyboard": "enabled",
"min_log_level": 2,
"motion_as_ds4": "enabled",
"mouse": "enabled",
"native_pen_touch": "enabled",
"nvenc_h264_cavlc": "disabled",
"nvenc_preset": "1",
"nvenc_realtime_hags": "enabled",
"nvenc_twopass": "quarter_res",
"origin_web_ui_allowed": "lan",
"qsv_coder": "auto",
"qsv_preset": "medium",
"resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
"sw_preset": "superfast",
"sw_tune": "zerolatency",
"touchpad_as_ds4": "enabled",
"upnp": "disabled",
"vt_coder": "auto",
"vt_realtime": "enabled",
"vt_software": "auto",
}

const app = createApp({
components: {
Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
{
id: "general",
name: "General",
options: {
"sunshine_name": "",
"min_log_level": 2,
"global_prep_cmd": "[]",
},
},
{
id: "files",
name: "Files",
options: {
"file_apps": "",
"credentials_file": "",
"log_path": "",
"pkey": "",
"cert": "",
"file_state": "",
},
},
{
id: "input",
name: "Input",
options: {
"controller": "enabled",
"gamepad": "auto",
"ds4_back_as_touchpad_click": "enabled",
"motion_as_ds4": "enabled",
"touchpad_as_ds4": "enabled",
"back_button_timeout": -1,
"keyboard": "enabled",
"key_repeat_delay": 500,
"key_repeat_frequency": 24.9,
"always_send_scancodes": "enabled",
"key_rightalt_to_key_win": "disabled",
"mouse": "enabled",
"high_resolution_scrolling": "enabled",
"native_pen_touch": "enabled",
"keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
},
},
{
id: "av",
name: "Audio/Video",
options: {
"audio_sink": "",
"virtual_sink": "",
"install_steam_audio_drivers": "enabled",
"adapter_name": "",
"output_name": "",
"resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
"fps": "[10,30,60,90,120]",
},
},
{
id: "network",
name: "Network",
options: {
"address_family": "ipv4",
"port": 47989,
"origin_web_ui_allowed": "lan",
"upnp": "disabled",
"external_ip": "",
"ping_timeout": 10000,
},
},
{
id: "advanced",
name: "Advanced",
options: {
"channels": 1,
"fec_percentage": 20,
"qp": 28,
"min_threads": 1,
"hevc_mode": 0,
"av1_mode": 0,
"capture": "",
"encoder": "",
},
},
{
id: "nv",
name: "NVIDIA NVENC Encoder",
options: {
"nvenc_preset": 1,
"nvenc_twopass": "quarter_res",
"nvenc_realtime_hags": "enabled",
"nvenc_h264_cavlc": "disabled",
},
},
{
id: "qsv",
name: "Intel QuickSync Encoder",
options: {
"qsv_preset": "medium",
"qsv_coder": "auto",
},
},
{
id: "amd",
name: "AMD AMF Encoder",
options: {
"amd_quality": "balanced",
"amd_rc": "vbr_latency",
"amd_usage": "ultralowlatency",
"amd_preanalysis": "disabled",
"amd_vbaq": "enabled",
"amd_coder": "auto",
},
},
{
id: "vt",
name: "VideoToolbox Encoder",
options: {
"vt_coder": "auto",
"vt_software": "auto",
"vt_realtime": "enabled",
},
},
{
id: "sw",
name: "Software Encoder",
options: {
"sw_preset": "superfast",
"sw_tune": "zerolatency",
},
},
],
};
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
delete this.config.platform;
delete this.config.status;
delete this.config.version;
//Populate default values if not present in config
for (let key in defaultConfig) {
if (this.config[key] === undefined) {
this.config[key] = defaultConfig[key]
}
}

// Populate default values from tabs options
this.tabs.forEach(tab => {
Object.keys(tab.options).forEach(optionKey => {
if (this.config[optionKey] === undefined) {
this.config[optionKey] = tab.options[optionKey];
}
});
});

this.fps = JSON.parse(this.config.fps);
//Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
let config = JSON.parse(JSON.stringify(this.config))

// delete default values from this.config
for (let key in defaultConfig) {
let delete_value = false
if (key === "resolutions" || key === "fps") {
let regex = /([\d]+x[\d]+)/g
// Use a regular expression to find each value and replace it with a quoted version

let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
this.tabs.forEach(tab => {
Object.keys(tab.options).forEach(optionKey => {
let delete_value = false
if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
// Use a regular expression to find each value and replace it with a quoted version

let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

if (config_value === default_value) {
delete_value = true
}
}

if (config_value === default_value) {
// todo: add proper type checking
if (String(config[optionKey]) === String(tab.options[optionKey])) {
delete_value = true
}
}

if (config[key] === defaultConfig[key]) {
delete_value = true
}

if (delete_value) {
delete config[key]
}
}
if (delete_value) {
delete config[optionKey]
}
});
});

return fetch("/api/config", {
method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
// If so, default to config port. Otherwise, use the value of port.
return port ? port : 47989
},
}
},
mounted() {
// Handle hashchange events
const handleHash = () => {
let hash = window.location.hash;
if (hash) {
// remove the # from the hash
let stripped_hash = hash.substring(1);

this.tabs.forEach(tab => {
Object.keys(tab.options).forEach(key => {
if (key === stripped_hash) {
this.currentTab = tab.id;

// sleep for 2 seconds to allow the page to load
setTimeout(() => {
let element = document.getElementById(stripped_hash);
if (element) {
window.location.hash = hash;
}
}, 2000);
}
});
})
}
};

// Call handleHash for the initial load
handleHash();

// Add hashchange event listener
window.addEventListener("hashchange", handleHash);
},
});

app.mount("#app");
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feat(ui): add hash handler for configuration ids#2002

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

 Merged

ReenigneArcher
merged 2 commits into

from

Jan 14, 2024
 Merged


feat(ui): add hash handler for configuration ids
#2002
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


2 commits


Select commit
Hold shift + click to select a range
bc01208

feat(ui): add hash handler for configuration ids


ReenigneArcher Jan 8, 2024
b8d1741

fix: replace defaultConfig with tab.options


ReenigneArcher Jan 8, 2024

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


8 changes: 5 additions & 3 deletions
docs/source/about/advanced_usage.rst

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -320,9 +320,11 @@ keybindings
**Default**
 .. code-block:: text

 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 [
 0x10, 0xA0,
 0x11, 0xA2,
 0x12, 0xA4
 ]

**Example**
 .. code-block:: text
Expand Down

218 changes: 147 additions & 71 deletions
src_assets/common/assets/web/config.html

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1074,52 +1074,6 @@ <h2 class="accordion-header">
 import { createApp } from 'vue'
 import Navbar from './Navbar.vue'

 // Create dictionary for defaultConfig
 //
 // Note: Please keep this in alphabetical order!
 const defaultConfig = {
 "address_family": "ipv4",
 "always_send_scancodes": "enabled",
 "amd_coder": "auto",
 "amd_preanalysis": "disabled",
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_vbaq": "enabled",
 "av1_mode": 0,
 "capture": "",
 "controller": "enabled",
 "ds4_back_as_touchpad_click": "enabled",
 "encoder": "",
 "fps": "[10,30,60,90,120]",
 "gamepad": "auto",
 "global_prep_cmd": "[]",
 "hevc_mode": 0,
 "high_resolution_scrolling": "enabled",
 "install_steam_audio_drivers": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "keyboard": "enabled",
 "min_log_level": 2,
 "motion_as_ds4": "enabled",
 "mouse": "enabled",
 "native_pen_touch": "enabled",
 "nvenc_h264_cavlc": "disabled",
 "nvenc_preset": "1",
 "nvenc_realtime_hags": "enabled",
 "nvenc_twopass": "quarter_res",
 "origin_web_ui_allowed": "lan",
 "qsv_coder": "auto",
 "qsv_preset": "medium",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 "touchpad_as_ds4": "enabled",
 "upnp": "disabled",
 "vt_coder": "auto",
 "vt_realtime": "enabled",
 "vt_software": "auto",
 }

 const app = createApp({
 components: {
 Navbar
Expand All@@ -1140,46 +1094,130 @@ <h2 class="accordion-header">
 {
 id: "general",
 name: "General",
 options: {
 "sunshine_name": "",
 "min_log_level": 2,
 "global_prep_cmd": "[]",
 },
 },
 {
 id: "files",
 name: "Files",
 options: {
 "file_apps": "",
 "credentials_file": "",
 "log_path": "",
 "pkey": "",
 "cert": "",
 "file_state": "",
 },
 },
 {
 id: "input",
 name: "Input",
 options: {
 "controller": "enabled",
 "gamepad": "auto",
 "ds4_back_as_touchpad_click": "enabled",
 "motion_as_ds4": "enabled",
 "touchpad_as_ds4": "enabled",
 "back_button_timeout": -1,
 "keyboard": "enabled",
 "key_repeat_delay": 500,
 "key_repeat_frequency": 24.9,
 "always_send_scancodes": "enabled",
 "key_rightalt_to_key_win": "disabled",
 "mouse": "enabled",
 "high_resolution_scrolling": "enabled",
 "native_pen_touch": "enabled",
 "keybindings": "[0x10,0xA0,0x11,0xA2,0x12,0xA4]", // todo: add this to UI
 },
 },
 {
 id: "av",
 name: "Audio/Video",
 options: {
 "audio_sink": "",
 "virtual_sink": "",
 "install_steam_audio_drivers": "enabled",
 "adapter_name": "",
 "output_name": "",
 "resolutions": "[352x240,480x360,858x480,1280x720,1920x1080,2560x1080,3440x1440,1920x1200,3840x2160,3840x1600]",
 "fps": "[10,30,60,90,120]",
 },
 },
 {
 id: "network",
 name: "Network",
 options: {
 "address_family": "ipv4",
 "port": 47989,
 "origin_web_ui_allowed": "lan",
 "upnp": "disabled",
 "external_ip": "",
 "ping_timeout": 10000,
 },
 },
 {
 id: "advanced",
 name: "Advanced",
 options: {
 "channels": 1,
 "fec_percentage": 20,
 "qp": 28,
 "min_threads": 1,
 "hevc_mode": 0,
 "av1_mode": 0,
 "capture": "",
 "encoder": "",
 },
 },
 {
 id: "nv",
 name: "NVIDIA NVENC Encoder",
 options: {
 "nvenc_preset": 1,
 "nvenc_twopass": "quarter_res",
 "nvenc_realtime_hags": "enabled",
 "nvenc_h264_cavlc": "disabled",
 },
 },
 {
 id: "qsv",
 name: "Intel QuickSync Encoder",
 options: {
 "qsv_preset": "medium",
 "qsv_coder": "auto",
 },
 },
 {
 id: "amd",
 name: "AMD AMF Encoder",
 options: {
 "amd_quality": "balanced",
 "amd_rc": "vbr_latency",
 "amd_usage": "ultralowlatency",
 "amd_preanalysis": "disabled",
 "amd_vbaq": "enabled",
 "amd_coder": "auto",
 },
 },
 {
 id: "vt",
 name: "VideoToolbox Encoder",
 options: {
 "vt_coder": "auto",
 "vt_software": "auto",
 "vt_realtime": "enabled",
 },
 },
 {
 id: "sw",
 name: "Software Encoder",
 options: {
 "sw_preset": "superfast",
 "sw_tune": "zerolatency",
 },
 },
 ],
 };
Expand DownExpand Up@@ -1212,12 +1250,15 @@ <h2 class="accordion-header">
 delete this.config.platform;
 delete this.config.status;
 delete this.config.version;
 //Populate default values if not present in config
 for (let key in defaultConfig) {
 if (this.config[key] === undefined) {
 this.config[key] = defaultConfig[key]
 }
 }

 // Populate default values from tabs options
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 if (this.config[optionKey] === undefined) {
 this.config[optionKey] = tab.options[optionKey];
 }
 });
 });

 this.fps = JSON.parse(this.config.fps);
 //Resolutions should be fixed because are not valid JSON
Expand DownExpand Up@@ -1259,28 +1300,31 @@ <h2 class="accordion-header">
 let config = JSON.parse(JSON.stringify(this.config))

 // delete default values from this.config
 for (let key in defaultConfig) {
 let delete_value = false
 if (key === "resolutions" || key === "fps") {
 let regex = /([\d]+x[\d]+)/g
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[key].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(defaultConfig[key].replace(regex, '"$1"')).toString()
 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(optionKey => {
 let delete_value = false
 if (optionKey === "global_prep_cmd" || optionKey === "resolutions" || optionKey === "fps") {
 let regex = /([\d]+x[\d]+)/g // this regex is only needed for resolutions
 // Use a regular expression to find each value and replace it with a quoted version

 let config_value = JSON.parse(config[optionKey].replace(regex, '"$1"')).toString()
 let default_value = JSON.parse(tab.options[optionKey].replace(regex, '"$1"')).toString()

 if (config_value === default_value) {
 delete_value = true
 }
 }

 if (config_value === default_value) {
 // todo: add proper type checking
 if (String(config[optionKey]) === String(tab.options[optionKey])) {
 delete_value = true
 }
 }

 if (config[key] === defaultConfig[key]) {
 delete_value = true
 }

 if (delete_value) {
 delete config[key]
 }
 }
 if (delete_value) {
 delete config[optionKey]
 }
 });
 });

 return fetch("/api/config", {
 method: "POST",
Expand DownExpand Up@@ -1332,7 +1376,39 @@ <h2 class="accordion-header">
 // If so, default to config port. Otherwise, use the value of port.
 return port ? port : 47989
 },
 }
 },
 mounted() {
 // Handle hashchange events
 const handleHash = () => {
 let hash = window.location.hash;
 if (hash) {
 // remove the # from the hash
 let stripped_hash = hash.substring(1);

 this.tabs.forEach(tab => {
 Object.keys(tab.options).forEach(key => {
 if (key === stripped_hash) {
 this.currentTab = tab.id;

 // sleep for 2 seconds to allow the page to load
 setTimeout(() => {
 let element = document.getElementById(stripped_hash);
 if (element) {
 window.location.hash = hash;
 }
 }, 2000);
 }
 });
 })
 }
 };

 // Call handleHash for the initial load
 handleHash();

 // Add hashchange event listener
 window.addEventListener("hashchange", handleHash);
 },
 });

 app.mount("#app");
Expand Down