Skip to content

Commit 7801f3d

Browse files
committed
🐛 fix: Fix template icons + force Browser mode for DRM templates
Template icon fixes → map to existing GTK icon names: messenger→messenger-indicator, signal→signal-desktop, twitch→twitch-indicator, prime-video→amazon, disney-plus→video-television, ms-teams→teams, onedrive→skydrive, canva→applications-graphics, chatgpt→applications-internet, claude→applications-internet, linkedin→applications-internet, google-calendar→calendar DRM handling → WebKitGTK lacks Widevine CDM backend, force Browser mode for DRM-dependent services: - Add requires_drm field to WebAppTemplate - Mark 7 media templates: spotify, youtube-music, netflix, prime-video, disney-plus, tidal, deezer - Lock mode switch + show DRM notice in webapp dialog - Add DRM badge in template gallery - URL-based DRM detection fallback for non-template webapps
1 parent 8a781c7 commit 7801f3d

11 files changed

Lines changed: 244 additions & 15 deletions

File tree

‎.serena/.gitignore‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
/cache
2+
/project.local.yml

‎.serena/project.yml‎

Lines changed: 154 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,154 @@
1+
# the name by which the project can be referenced within Serena
2+
project_name: "biglinux-webapps"
3+
4+
5+
# list of languages for which language servers are started; choose from:
6+
# al bash clojure cpp csharp
7+
# csharp_omnisharp dart elixir elm erlang
8+
# fortran fsharp go groovy haskell
9+
# haxe java julia kotlin lua
10+
# markdown
11+
# matlab nix pascal perl php
12+
# php_phpactor powershell python python_jedi r
13+
# rego ruby ruby_solargraph rust scala
14+
# swift terraform toml typescript typescript_vts
15+
# vue yaml zig
16+
# (This list may be outdated. For the current list, see values of Language enum here:
17+
# https://github.com/oraios/serena/blob/main/src/solidlsp/ls_config.py
18+
# For some languages, there are alternative language servers, e.g. csharp_omnisharp, ruby_solargraph.)
19+
# Note:
20+
# - For C, use cpp
21+
# - For JavaScript, use typescript
22+
# - For Free Pascal/Lazarus, use pascal
23+
# Special requirements:
24+
# Some languages require additional setup/installations.
25+
# See here for details: https://oraios.github.io/serena/01-about/020_programming-languages.html#language-servers
26+
# When using multiple languages, the first language server that supports a given file will be used for that file.
27+
# The first language is the default language and the respective language server will be used as a fallback.
28+
# Note that when using the JetBrains backend, language servers are not used and this list is correspondingly ignored.
29+
languages:
30+
- rust
31+
32+
# the encoding used by text files in the project
33+
# For a list of possible encodings, see https://docs.python.org/3.11/library/codecs.html#standard-encodings
34+
encoding: "utf-8"
35+
36+
# line ending convention to use when writing source files.
37+
# Possible values: unset (use global setting), "lf", "crlf", or "native" (platform default)
38+
# This does not affect Serena's own files (e.g. memories and configuration files), which always use native line endings.
39+
line_ending:
40+
41+
# The language backend to use for this project.
42+
# If not set, the global setting from serena_config.yml is used.
43+
# Valid values: LSP, JetBrains
44+
# Note: the backend is fixed at startup. If a project with a different backend
45+
# is activated post-init, an error will be returned.
46+
language_backend:
47+
48+
# whether to use project's .gitignore files to ignore files
49+
ignore_all_files_in_gitignore: true
50+
51+
# advanced configuration option allowing to configure language server-specific options.
52+
# Maps the language key to the options.
53+
# Have a look at the docstring of the constructors of the LS implementations within solidlsp (e.g., for C# or PHP) to see which options are available.
54+
# No documentation on options means no options are available.
55+
ls_specific_settings: {}
56+
57+
# list of additional paths to ignore in this project.
58+
# Same syntax as gitignore, so you can use * and **.
59+
# Note: global ignored_paths from serena_config.yml are also applied additively.
60+
ignored_paths: []
61+
62+
# whether the project is in read-only mode
63+
# If set to true, all editing tools will be disabled and attempts to use them will result in an error
64+
# Added on 2025-04-18
65+
read_only: false
66+
67+
# list of tool names to exclude.
68+
# This extends the existing exclusions (e.g. from the global configuration)
69+
#
70+
# Below is the complete list of tools for convenience.
71+
# To make sure you have the latest list of tools, and to view their descriptions,
72+
# execute `uv run scripts/print_tool_overview.py`.
73+
#
74+
# * `activate_project`: Activates a project based on the project name or path.
75+
# * `check_onboarding_performed`: Checks whether project onboarding was already performed.
76+
# * `create_text_file`: Creates/overwrites a file in the project directory.
77+
# * `delete_memory`: Delete a memory file. Should only happen if a user asks for it explicitly,
78+
# for example by saying that the information retrieved from a memory file is no longer correct
79+
# or no longer relevant for the project.
80+
# * `edit_memory`: Replaces content matching a regular expression in a memory.
81+
# * `execute_shell_command`: Executes a shell command.
82+
# * `find_file`: Finds files in the given relative paths
83+
# * `find_referencing_symbols`: Finds symbols that reference the given symbol using the language server backend
84+
# * `find_symbol`: Performs a global (or local) search using the language server backend.
85+
# * `get_current_config`: Prints the current configuration of the agent, including the active and available projects, tools, contexts, and modes.
86+
# * `get_symbols_overview`: Gets an overview of the top-level symbols defined in a given file.
87+
# * `initial_instructions`: Provides instructions Serena usage (i.e. the 'Serena Instructions Manual')
88+
# for clients that do not read the initial instructions when the MCP server is connected.
89+
# * `insert_after_symbol`: Inserts content after the end of the definition of a given symbol.
90+
# * `insert_before_symbol`: Inserts content before the beginning of the definition of a given symbol.
91+
# * `list_dir`: Lists files and directories in the given directory (optionally with recursion).
92+
# * `list_memories`: List available memories. Any memory can be read using the `read_memory` tool.
93+
# * `onboarding`: Performs onboarding (identifying the project structure and essential tasks, e.g. for testing or building).
94+
# * `read_file`: Reads a file within the project directory.
95+
# * `read_memory`: Read the content of a memory file. This tool should only be used if the information
96+
# is relevant to the current task. You can infer whether the information
97+
# is relevant from the memory file name.
98+
# You should not read the same memory file multiple times in the same conversation.
99+
# * `rename_memory`: Renames or moves a memory. Moving between project and global scope is supported
100+
# (e.g., renaming "global/foo" to "bar" moves it from global to project scope).
101+
# * `rename_symbol`: Renames a symbol throughout the codebase using language server refactoring capabilities.
102+
# For JB, we use a separate tool.
103+
# * `replace_content`: Replaces content in a file (optionally using regular expressions).
104+
# * `replace_symbol_body`: Replaces the full definition of a symbol using the language server backend.
105+
# * `safe_delete_symbol`:
106+
# * `search_for_pattern`: Performs a search for a pattern in the project.
107+
# * `write_memory`: Write some information (utf-8-encoded) about this project that can be useful for future tasks to a memory in md format.
108+
# The memory name should be meaningful.
109+
excluded_tools: []
110+
111+
# list of tools to include that would otherwise be disabled (particularly optional tools that are disabled by default).
112+
# This extends the existing inclusions (e.g. from the global configuration).
113+
included_optional_tools: []
114+
115+
# fixed set of tools to use as the base tool set (if non-empty), replacing Serena's default set of tools.
116+
# This cannot be combined with non-empty excluded_tools or included_optional_tools.
117+
fixed_tools: []
118+
119+
# list of mode names to that are always to be included in the set of active modes
120+
# The full set of modes to be activated is base_modes + default_modes.
121+
# If the setting is undefined, the base_modes from the global configuration (serena_config.yml) apply.
122+
# Otherwise, this setting overrides the global configuration.
123+
# Set this to [] to disable base modes for this project.
124+
# Set this to a list of mode names to always include the respective modes for this project.
125+
base_modes:
126+
127+
# list of mode names that are to be activated by default.
128+
# The full set of modes to be activated is base_modes + default_modes.
129+
# If the setting is undefined, the default_modes from the global configuration (serena_config.yml) apply.
130+
# Otherwise, this overrides the setting from the global configuration (serena_config.yml).
131+
# This setting can, in turn, be overridden by CLI parameters (--mode).
132+
default_modes:
133+
134+
# initial prompt for the project. It will always be given to the LLM upon activating the project
135+
# (contrary to the memories, which are loaded on demand).
136+
initial_prompt: ""
137+
138+
# time budget (seconds) per tool call for the retrieval of additional symbol information
139+
# such as docstrings or parameter information.
140+
# This overrides the corresponding setting in the global configuration; see the documentation there.
141+
# If null or missing, use the setting from the global configuration.
142+
symbol_info_budget:
143+
144+
# list of regex patterns which, when matched, mark a memory entry as read‑only.
145+
# Extends the list from the global configuration, merging the two lists.
146+
read_only_memory_patterns: []
147+
148+
# list of regex patterns for memories to completely ignore.
149+
# Matching memories will not appear in list_memories or activate_project output
150+
# and cannot be accessed via read_memory or write_memory.
151+
# To access ignored memory files, use the read_file tool on the raw file path.
152+
# Extends the list from the global configuration, merging the two lists.
153+
# Example: ["_archive/.*", "_episodes/.*"]
154+
ignored_memory_patterns: []

‎crates/webapps-core/src/models/webapp.rs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,11 @@ impl WebApp {
131131
self.app_icon_url = tpl.icon.clone();
132132
self.app_categories = tpl.category.clone();
133133

134+
// DRM sites require browser engine (Widevine) → force Browser mode
135+
if tpl.requires_drm {
136+
self.app_mode = AppMode::Browser;
137+
}
138+
134139
if !tpl.mime_types.is_empty() {
135140
self.mime_types = format!("{};", tpl.mime_types.join(";"));
136141
}

‎crates/webapps-core/src/templates/communication.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
5959
template_id: "messenger".into(),
6060
name: "Messenger".into(),
6161
url: "https://www.messenger.com".into(),
62-
icon: "messenger".into(),
62+
icon: "messenger-indicator".into(),
6363
category: "Network".into(),
6464
comment: "Messaging from Facebook Messenger".into(),
6565
generic_name: "Instant Messaging".into(),
@@ -83,7 +83,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
8383
template_id: "signal".into(),
8484
name: "Signal".into(),
8585
url: "https://signal.org/".into(),
86-
icon: "signal".into(),
86+
icon: "signal-desktop".into(),
8787
category: "Network".into(),
8888
comment: "Private messaging from Signal".into(),
8989
generic_name: "Instant Messaging".into(),

‎crates/webapps-core/src/templates/google.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
9292
template_id: "google-calendar".into(),
9393
name: "Google Calendar".into(),
9494
url: "https://calendar.google.com".into(),
95-
icon: "google-calendar".into(),
95+
icon: "calendar".into(),
9696
category: "Office".into(),
9797
comment: "Calendar and scheduling from Google".into(),
9898
generic_name: "Calendar".into(),

‎crates/webapps-core/src/templates/media.rs‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
1717
keywords: svec!["spotify", "music", "streaming", "audio", "playlist"],
1818
features: svec!["notifications", "media-keys"],
1919
url_schemes: svec!["spotify"],
20+
requires_drm: true,
2021
..Default::default()
2122
},
2223
WebAppTemplate {
@@ -30,6 +31,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
3031
keywords: svec!["youtube", "music", "streaming", "google"],
3132
features: svec!["notifications", "media-keys"],
3233
profile: "google".into(),
34+
requires_drm: true,
3335
..Default::default()
3436
},
3537
WebAppTemplate {
@@ -41,28 +43,31 @@ pub fn templates() -> Vec<WebAppTemplate> {
4143
comment: "Watch movies and TV shows on Netflix".into(),
4244
generic_name: "Video Player".into(),
4345
keywords: svec!["netflix", "streaming", "movies", "series"],
46+
requires_drm: true,
4447
..Default::default()
4548
},
4649
WebAppTemplate {
4750
template_id: "prime-video".into(),
4851
name: "Amazon Prime Video".into(),
4952
url: "https://www.primevideo.com".into(),
50-
icon: "prime-video".into(),
53+
icon: "amazon".into(),
5154
category: "AudioVideo".into(),
5255
comment: "Watch movies and TV shows on Prime Video".into(),
5356
generic_name: "Video Player".into(),
5457
keywords: svec!["amazon", "prime", "video", "streaming", "movies"],
58+
requires_drm: true,
5559
..Default::default()
5660
},
5761
WebAppTemplate {
5862
template_id: "disney-plus".into(),
5963
name: "Disney+".into(),
6064
url: "https://www.disneyplus.com".into(),
61-
icon: "disney-plus".into(),
65+
icon: "video-television".into(),
6266
category: "AudioVideo".into(),
6367
comment: "Watch Disney, Marvel, Star Wars and more".into(),
6468
generic_name: "Video Player".into(),
6569
keywords: svec!["disney", "streaming", "movies", "marvel", "star wars"],
70+
requires_drm: true,
6671
..Default::default()
6772
},
6873
WebAppTemplate {
@@ -75,6 +80,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
7580
generic_name: "Music Player".into(),
7681
keywords: svec!["tidal", "music", "hifi", "streaming", "lossless"],
7782
features: svec!["media-keys"],
83+
requires_drm: true,
7884
..Default::default()
7985
},
8086
WebAppTemplate {
@@ -87,13 +93,14 @@ pub fn templates() -> Vec<WebAppTemplate> {
8793
generic_name: "Music Player".into(),
8894
keywords: svec!["deezer", "music", "streaming"],
8995
features: svec!["media-keys"],
96+
requires_drm: true,
9097
..Default::default()
9198
},
9299
WebAppTemplate {
93100
template_id: "twitch".into(),
94101
name: "Twitch".into(),
95102
url: "https://www.twitch.tv".into(),
96-
icon: "twitch".into(),
103+
icon: "twitch-indicator".into(),
97104
category: "AudioVideo".into(),
98105
comment: "Live streaming platform".into(),
99106
generic_name: "Streaming".into(),

‎crates/webapps-core/src/templates/office365.rs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
117117
template_id: "office365-teams".into(),
118118
name: "Microsoft Teams".into(),
119119
url: "https://teams.microsoft.com".into(),
120-
icon: "ms-teams".into(),
120+
icon: "teams".into(),
121121
category: "Network".into(),
122122
comment: "Chat and video conferencing with Microsoft Teams".into(),
123123
generic_name: "Instant Messaging".into(),
@@ -133,7 +133,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
133133
template_id: "office365-onedrive".into(),
134134
name: "Microsoft OneDrive".into(),
135135
url: "https://onedrive.live.com".into(),
136-
icon: "onedrive".into(),
136+
icon: "skydrive".into(),
137137
category: "Network".into(),
138138
comment: "Cloud storage from Microsoft OneDrive".into(),
139139
generic_name: "Cloud Storage".into(),

‎crates/webapps-core/src/templates/productivity.rs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
5757
template_id: "canva".into(),
5858
name: "Canva".into(),
5959
url: "https://www.canva.com".into(),
60-
icon: "canva".into(),
60+
icon: "applications-graphics".into(),
6161
category: "Graphics".into(),
6262
comment: "Online graphic design tool".into(),
6363
generic_name: "Design Tool".into(),
@@ -92,7 +92,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
9292
template_id: "chatgpt".into(),
9393
name: "ChatGPT".into(),
9494
url: "https://chatgpt.com".into(),
95-
icon: "chatgpt".into(),
95+
icon: "applications-internet".into(),
9696
category: "Utility".into(),
9797
comment: "AI assistant from OpenAI".into(),
9898
generic_name: "AI Assistant".into(),
@@ -103,7 +103,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
103103
template_id: "claude".into(),
104104
name: "Claude".into(),
105105
url: "https://claude.ai".into(),
106-
icon: "claude".into(),
106+
icon: "applications-internet".into(),
107107
category: "Utility".into(),
108108
comment: "AI assistant from Anthropic".into(),
109109
generic_name: "AI Assistant".into(),
@@ -114,7 +114,7 @@ pub fn templates() -> Vec<WebAppTemplate> {
114114
template_id: "linkedin".into(),
115115
name: "LinkedIn".into(),
116116
url: "https://www.linkedin.com".into(),
117-
icon: "linkedin".into(),
117+
icon: "applications-internet".into(),
118118
category: "Network".into(),
119119
comment: "Professional networking platform".into(),
120120
generic_name: "Social Network".into(),

‎crates/webapps-core/src/templates/registry.rs‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ pub struct WebAppTemplate {
2525
pub generic_name: String,
2626
pub keywords: Vec<String>,
2727
pub file_handler: FileHandler,
28+
/// Site needs DRM (Widevine) → force Browser mode
29+
pub requires_drm: bool,
2830
}
2931

3032
impl Default for WebAppTemplate {
@@ -43,6 +45,7 @@ impl Default for WebAppTemplate {
4345
generic_name: String::new(),
4446
keywords: Vec::new(),
4547
file_handler: FileHandler::None,
48+
requires_drm: false,
4649
}
4750
}
4851
}
@@ -121,6 +124,16 @@ impl TemplateRegistry {
121124
})
122125
.collect()
123126
}
127+
128+
/// Check if a webapp needs DRM — match by template_id or URL domain
129+
pub fn requires_drm(&self, template_id: &str, url: &str) -> bool {
130+
if let Some(tpl) = self.templates.get(template_id) {
131+
return tpl.requires_drm;
132+
}
133+
self.match_url(url)
134+
.map(|tpl| tpl.requires_drm)
135+
.unwrap_or(false)
136+
}
124137
}
125138

126139
/// Build registry with all bundled templates

‎crates/webapps-manager/src/template_gallery.rs‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -153,6 +153,15 @@ fn add_category_section(
153153
crate::webapp_row::load_icon(&icon, &tpl.icon);
154154
row.add_prefix(&icon);
155155

156+
// DRM badge → indicate Browser mode required
157+
if tpl.requires_drm {
158+
let drm_icon = gtk::Image::from_icon_name("web-browser-symbolic");
159+
drm_icon.set_pixel_size(16);
160+
drm_icon.set_tooltip_text(Some(&gettext("Requires Browser mode (DRM)")));
161+
drm_icon.add_css_class("dim-label");
162+
row.add_suffix(&drm_icon);
163+
}
164+
156165
// fire callback immediately, then close gallery
157166
let cb = callback.clone();
158167
let tid = tpl.template_id.clone();

0 commit comments

Comments
 (0)