Skip to content

Commit 2574b3f

Browse files
committed
- Voice channel configurations are not required (help clean up busy config files)
1 parent 02ee87d commit 2574b3f

File tree

4 files changed

+16
-27
lines changed

4 files changed

+16
-27
lines changed

.github/workflows/contributors.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ on:
33
push:
44
branches:
55
- master
6+
- main
67
jobs:
78
update_contributors:
89
name: Add all contributors to README

.schema/config_v2.schema.json

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -244,13 +244,7 @@
244244
},
245245
"required": [
246246
"Name",
247-
"AlternateName",
248-
"Albums",
249-
"Artists",
250-
"Episodes",
251-
"Movies",
252-
"Series",
253-
"Tracks"
247+
"AlternateName"
254248
]
255249
},
256250
"combinedLibrarySubLibrary": {
@@ -330,13 +324,7 @@
330324
},
331325
"required": [
332326
"Name",
333-
"Libraries",
334-
"Albums",
335-
"Artists",
336-
"Episodes",
337-
"Movies",
338-
"Series",
339-
"Tracks"
327+
"Libraries"
340328
]
341329
}
342330
},

modules/settings/config_parser.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -271,22 +271,22 @@ def to_model(self) -> settings_models.LibraryStats:
271271
voice_channel_name = alternate_name if alternate_name else library_name
272272
movie = VoiceChannelConfig(channel_name=voice_channel_name,
273273
emoji=Emoji.Movie,
274-
data=details_config.get_subsection_data("Movies")).to_model()
274+
data=details_config.get_subsection_data("Movies", optional=True)).to_model()
275275
album = VoiceChannelConfig(channel_name=voice_channel_name,
276276
emoji=Emoji.Album,
277-
data=details_config.get_subsection_data("Albums")).to_model()
277+
data=details_config.get_subsection_data("Albums", optional=True)).to_model()
278278
artist = VoiceChannelConfig(channel_name=voice_channel_name,
279279
emoji=Emoji.Artist,
280-
data=details_config.get_subsection_data("Artists")).to_model()
280+
data=details_config.get_subsection_data("Artists", optional=True)).to_model()
281281
episode = VoiceChannelConfig(channel_name=voice_channel_name,
282282
emoji=Emoji.Episode,
283-
data=details_config.get_subsection_data("Episodes")).to_model()
283+
data=details_config.get_subsection_data("Episodes", optional=True)).to_model()
284284
series = VoiceChannelConfig(channel_name=voice_channel_name,
285285
emoji=Emoji.Series,
286-
data=details_config.get_subsection_data("Series")).to_model()
286+
data=details_config.get_subsection_data("Series", optional=True)).to_model()
287287
track = VoiceChannelConfig(channel_name=voice_channel_name,
288288
emoji=Emoji.Track,
289-
data=details_config.get_subsection_data("Tracks")).to_model()
289+
data=details_config.get_subsection_data("Tracks", optional=True)).to_model()
290290
recently_added = RecentlyAddedVoiceChannelConfig(channel_name=voice_channel_name,
291291
emoji=Emoji.RecentlyAdded,
292292
data=details_config.get_subsection_data(
@@ -333,22 +333,22 @@ def to_model(self) -> settings_models.LibraryStats:
333333

334334
movie = VoiceChannelConfig(channel_name=combined_library_name,
335335
emoji=Emoji.Movie,
336-
data=details_config.get_subsection_data("Movies")).to_model()
336+
data=details_config.get_subsection_data("Movies", optional=True)).to_model()
337337
album = VoiceChannelConfig(channel_name=combined_library_name,
338338
emoji=Emoji.Album,
339-
data=details_config.get_subsection_data("Albums")).to_model()
339+
data=details_config.get_subsection_data("Albums", optional=True)).to_model()
340340
artist = VoiceChannelConfig(channel_name=combined_library_name,
341341
emoji=Emoji.Artist,
342-
data=details_config.get_subsection_data("Artists")).to_model()
342+
data=details_config.get_subsection_data("Artists", optional=True)).to_model()
343343
episode = VoiceChannelConfig(channel_name=combined_library_name,
344344
emoji=Emoji.Episode,
345-
data=details_config.get_subsection_data("Episodes")).to_model()
345+
data=details_config.get_subsection_data("Episodes", optional=True)).to_model()
346346
series = VoiceChannelConfig(channel_name=combined_library_name,
347347
emoji=Emoji.Series,
348-
data=details_config.get_subsection_data("Series")).to_model()
348+
data=details_config.get_subsection_data("Series", optional=True)).to_model()
349349
track = VoiceChannelConfig(channel_name=combined_library_name,
350350
emoji=Emoji.Track,
351-
data=details_config.get_subsection_data("Tracks")).to_model()
351+
data=details_config.get_subsection_data("Tracks", optional=True)).to_model()
352352
recently_added = RecentlyAddedVoiceChannelConfig(channel_name=combined_library_name,
353353
emoji=Emoji.RecentlyAdded,
354354
data=details_config.get_subsection_data(

requirements.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,4 @@ Flask~=3.0.2
1010
matplotlib==3.9.2
1111
SQLAlchemy~=2.0.25
1212
sqlalchemy-utils==0.41.1
13-
pydantic>=2.6.0
13+
pydantic>=2.10.0

0 commit comments

Comments
 (0)