From 7834bbd9565eb9baa8a448137c91b3cdb57ae294 Mon Sep 17 00:00:00 2001 From: h7x4 Date: Fri, 5 Dec 2025 20:59:19 +0900 Subject: [PATCH] common: don't expose types directly --- src/commands/audio_output_devices/disableoutput.rs | 2 +- src/commands/audio_output_devices/enableoutput.rs | 2 +- src/commands/audio_output_devices/outputs.rs | 2 +- src/commands/audio_output_devices/outputset.rs | 2 +- src/commands/audio_output_devices/toggleoutput.rs | 2 +- src/commands/client_to_client/channels.rs | 2 +- src/commands/client_to_client/readmessages.rs | 2 +- src/commands/client_to_client/sendmessage.rs | 2 +- src/commands/client_to_client/subscribe.rs | 2 +- src/commands/client_to_client/unsubscribe.rs | 2 +- src/commands/connection_settings/protocol_disable.rs | 2 +- src/commands/connection_settings/protocol_enable.rs | 2 +- src/commands/connection_settings/tag_types_disable.rs | 2 +- src/commands/connection_settings/tag_types_enable.rs | 2 +- src/commands/connection_settings/tag_types_reset.rs | 2 +- src/commands/controlling_playback/play.rs | 2 +- src/commands/controlling_playback/playid.rs | 2 +- src/commands/controlling_playback/seek.rs | 2 +- src/commands/controlling_playback/seekcur.rs | 2 +- src/commands/controlling_playback/seekid.rs | 2 +- src/commands/music_database/albumart.rs | 2 +- src/commands/music_database/count.rs | 2 +- src/commands/music_database/find.rs | 2 +- src/commands/music_database/findadd.rs | 2 +- src/commands/music_database/getfingerprint.rs | 2 +- src/commands/music_database/list.rs | 2 +- src/commands/music_database/listall.rs | 2 +- src/commands/music_database/listallinfo.rs | 2 +- src/commands/music_database/listfiles.rs | 2 +- src/commands/music_database/lsinfo.rs | 2 +- src/commands/music_database/readcomments.rs | 2 +- src/commands/music_database/readpicture.rs | 2 +- src/commands/music_database/rescan.rs | 2 +- src/commands/music_database/search.rs | 2 +- src/commands/music_database/searchadd.rs | 2 +- src/commands/music_database/searchaddpl.rs | 2 +- src/commands/music_database/searchcount.rs | 2 +- src/commands/music_database/update.rs | 2 +- src/commands/partition_commands/delpartition.rs | 2 +- src/commands/partition_commands/listpartitions.rs | 2 +- src/commands/partition_commands/newpartition.rs | 2 +- src/commands/partition_commands/partition.rs | 2 +- src/commands/playback_options/consume.rs | 4 ++-- src/commands/playback_options/crossfade.rs | 2 +- src/commands/playback_options/getvol.rs | 2 +- src/commands/playback_options/mixrampdelay.rs | 2 +- src/commands/playback_options/replay_gain_mode.rs | 2 +- src/commands/playback_options/replay_gain_status.rs | 2 +- src/commands/playback_options/setvol.rs | 2 +- src/commands/playback_options/single.rs | 4 ++-- src/commands/playback_options/volume.rs | 2 +- src/commands/querying_mpd_status/idle.rs | 2 +- src/commands/querying_mpd_status/status.rs | 2 +- src/commands/queue/add.rs | 2 +- src/commands/queue/addid.rs | 2 +- src/commands/queue/addtagid.rs | 2 +- src/commands/queue/cleartagid.rs | 2 +- src/commands/queue/delete.rs | 2 +- src/commands/queue/deleteid.rs | 2 +- src/commands/queue/move_.rs | 2 +- src/commands/queue/moveid.rs | 2 +- src/commands/queue/playlistfind.rs | 2 +- src/commands/queue/playlistid.rs | 2 +- src/commands/queue/playlistinfo.rs | 2 +- src/commands/queue/playlistsearch.rs | 2 +- src/commands/queue/plchanges.rs | 2 +- src/commands/queue/plchangesposid.rs | 2 +- src/commands/queue/prio.rs | 2 +- src/commands/queue/prioid.rs | 2 +- src/commands/queue/rangeid.rs | 2 +- src/commands/queue/shuffle.rs | 2 +- src/commands/queue/swap.rs | 2 +- src/commands/queue/swapid.rs | 2 +- src/commands/stickers/sticker_dec.rs | 2 +- src/commands/stickers/sticker_delete.rs | 2 +- src/commands/stickers/sticker_find.rs | 2 +- src/commands/stickers/sticker_get.rs | 2 +- src/commands/stickers/sticker_inc.rs | 2 +- src/commands/stickers/sticker_list.rs | 2 +- src/commands/stickers/sticker_set.rs | 2 +- src/commands/stickers/stickernamestypes.rs | 2 +- src/commands/stored_playlists/listplaylist.rs | 2 +- src/commands/stored_playlists/listplaylistinfo.rs | 2 +- src/commands/stored_playlists/load.rs | 2 +- src/commands/stored_playlists/playlistadd.rs | 2 +- src/commands/stored_playlists/playlistclear.rs | 2 +- src/commands/stored_playlists/playlistdelete.rs | 2 +- src/commands/stored_playlists/playlistlength.rs | 2 +- src/commands/stored_playlists/playlistmove.rs | 2 +- src/commands/stored_playlists/rm.rs | 2 +- src/commands/stored_playlists/save.rs | 2 +- src/commands/stored_playlists/searchplaylist.rs | 2 +- src/common.rs | 3 +-- src/filter/filter.rs | 2 +- src/filter/filter_grammar.lalrpop | 2 +- src/request.rs | 2 +- src/server.rs | 2 +- 97 files changed, 99 insertions(+), 100 deletions(-) diff --git a/src/commands/audio_output_devices/disableoutput.rs b/src/commands/audio_output_devices/disableoutput.rs index 54fc78c9..44d030c0 100644 --- a/src/commands/audio_output_devices/disableoutput.rs +++ b/src/commands/audio_output_devices/disableoutput.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::AudioOutputId, + common::types::AudioOutputId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/audio_output_devices/enableoutput.rs b/src/commands/audio_output_devices/enableoutput.rs index e8c45ab8..758ede1c 100644 --- a/src/commands/audio_output_devices/enableoutput.rs +++ b/src/commands/audio_output_devices/enableoutput.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::AudioOutputId, + common::types::AudioOutputId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/audio_output_devices/outputs.rs b/src/commands/audio_output_devices/outputs.rs index 37a9ab67..9b4e4ce3 100644 --- a/src/commands/audio_output_devices/outputs.rs +++ b/src/commands/audio_output_devices/outputs.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::AudioOutputId, + common::types::AudioOutputId, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/audio_output_devices/outputset.rs b/src/commands/audio_output_devices/outputset.rs index f5955096..2f787845 100644 --- a/src/commands/audio_output_devices/outputset.rs +++ b/src/commands/audio_output_devices/outputset.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::AudioOutputId, + common::types::AudioOutputId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/audio_output_devices/toggleoutput.rs b/src/commands/audio_output_devices/toggleoutput.rs index 87d8ad85..46434dfb 100644 --- a/src/commands/audio_output_devices/toggleoutput.rs +++ b/src/commands/audio_output_devices/toggleoutput.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::AudioOutputId, + common::types::AudioOutputId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/client_to_client/channels.rs b/src/commands/client_to_client/channels.rs index f703095a..19aacdc2 100644 --- a/src/commands/client_to_client/channels.rs +++ b/src/commands/client_to_client/channels.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::ChannelName, + common::types::ChannelName, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/client_to_client/readmessages.rs b/src/commands/client_to_client/readmessages.rs index d7b2d22b..60f0ea1d 100644 --- a/src/commands/client_to_client/readmessages.rs +++ b/src/commands/client_to_client/readmessages.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::ChannelName, + common::types::ChannelName, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/client_to_client/sendmessage.rs b/src/commands/client_to_client/sendmessage.rs index 2f6b9746..f209f1ab 100644 --- a/src/commands/client_to_client/sendmessage.rs +++ b/src/commands/client_to_client/sendmessage.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::ChannelName, + common::types::ChannelName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/client_to_client/subscribe.rs b/src/commands/client_to_client/subscribe.rs index 1a8722ab..424b6a6e 100644 --- a/src/commands/client_to_client/subscribe.rs +++ b/src/commands/client_to_client/subscribe.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::ChannelName, + common::types::ChannelName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/client_to_client/unsubscribe.rs b/src/commands/client_to_client/unsubscribe.rs index 200f2ca5..d5be5d95 100644 --- a/src/commands/client_to_client/unsubscribe.rs +++ b/src/commands/client_to_client/unsubscribe.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::ChannelName, + common::types::ChannelName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/connection_settings/protocol_disable.rs b/src/commands/connection_settings/protocol_disable.rs index b93efa6a..adef3487 100644 --- a/src/commands/connection_settings/protocol_disable.rs +++ b/src/commands/connection_settings/protocol_disable.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::Feature, + common::types::Feature, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/connection_settings/protocol_enable.rs b/src/commands/connection_settings/protocol_enable.rs index b8469f79..9db44eda 100644 --- a/src/commands/connection_settings/protocol_enable.rs +++ b/src/commands/connection_settings/protocol_enable.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::Feature, + common::types::Feature, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/connection_settings/tag_types_disable.rs b/src/commands/connection_settings/tag_types_disable.rs index b06d1d18..279f86cd 100644 --- a/src/commands/connection_settings/tag_types_disable.rs +++ b/src/commands/connection_settings/tag_types_disable.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::TagName, + common::types::TagName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/connection_settings/tag_types_enable.rs b/src/commands/connection_settings/tag_types_enable.rs index d3021273..59e352c2 100644 --- a/src/commands/connection_settings/tag_types_enable.rs +++ b/src/commands/connection_settings/tag_types_enable.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::TagName, + common::types::TagName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/connection_settings/tag_types_reset.rs b/src/commands/connection_settings/tag_types_reset.rs index c7508495..c6a5f234 100644 --- a/src/commands/connection_settings/tag_types_reset.rs +++ b/src/commands/connection_settings/tag_types_reset.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::TagName, + common::types::TagName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/controlling_playback/play.rs b/src/commands/controlling_playback/play.rs index bd4697fd..69904908 100644 --- a/src/commands/controlling_playback/play.rs +++ b/src/commands/controlling_playback/play.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::SongPosition, + common::types::SongPosition, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/controlling_playback/playid.rs b/src/commands/controlling_playback/playid.rs index 06615f0b..859d3d57 100644 --- a/src/commands/controlling_playback/playid.rs +++ b/src/commands/controlling_playback/playid.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::SongId, + common::types::SongId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/controlling_playback/seek.rs b/src/commands/controlling_playback/seek.rs index 0b4d3b52..ba5f0bc7 100644 --- a/src/commands/controlling_playback/seek.rs +++ b/src/commands/controlling_playback/seek.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongPosition, TimeWithFractions}, + common::types::{SongPosition, TimeWithFractions}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/controlling_playback/seekcur.rs b/src/commands/controlling_playback/seekcur.rs index 243c7a3c..e6ec0f9b 100644 --- a/src/commands/controlling_playback/seekcur.rs +++ b/src/commands/controlling_playback/seekcur.rs @@ -5,7 +5,7 @@ use crate::{ Command, Request, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{SeekMode, TimeWithFractions}, + common::types::{SeekMode, TimeWithFractions}, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/controlling_playback/seekid.rs b/src/commands/controlling_playback/seekid.rs index 32f290de..6f8c9725 100644 --- a/src/commands/controlling_playback/seekid.rs +++ b/src/commands/controlling_playback/seekid.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongId, TimeWithFractions}, + common::types::{SongId, TimeWithFractions}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/music_database/albumart.rs b/src/commands/music_database/albumart.rs index 9c9b729c..859d7b2e 100644 --- a/src/commands/music_database/albumart.rs +++ b/src/commands/music_database/albumart.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Offset, Uri}, + common::types::{Offset, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property, get_property}, }; diff --git a/src/commands/music_database/count.rs b/src/commands/music_database/count.rs index 6cff71a5..c7a55d88 100644 --- a/src/commands/music_database/count.rs +++ b/src/commands/music_database/count.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::GroupType, + common::types::GroupType, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, diff --git a/src/commands/music_database/find.rs b/src/commands/music_database/find.rs index 290f903a..180ea7fd 100644 --- a/src/commands/music_database/find.rs +++ b/src/commands/music_database/find.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Sort, WindowRange}, + common::types::{Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, diff --git a/src/commands/music_database/findadd.rs b/src/commands/music_database/findadd.rs index ae16d01a..9087b693 100644 --- a/src/commands/music_database/findadd.rs +++ b/src/commands/music_database/findadd.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongPosition, Sort, WindowRange}, + common::types::{SongPosition, Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, diff --git a/src/commands/music_database/getfingerprint.rs b/src/commands/music_database/getfingerprint.rs index cbd67ad4..37738b35 100644 --- a/src/commands/music_database/getfingerprint.rs +++ b/src/commands/music_database/getfingerprint.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, }; diff --git a/src/commands/music_database/list.rs b/src/commands/music_database/list.rs index c5efd548..204b31b7 100644 --- a/src/commands/music_database/list.rs +++ b/src/commands/music_database/list.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{GroupType, TagName, WindowRange}, + common::types::{GroupType, TagName, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, diff --git a/src/commands/music_database/listall.rs b/src/commands/music_database/listall.rs index 9ee7a4a2..8c35b9e2 100644 --- a/src/commands/music_database/listall.rs +++ b/src/commands/music_database/listall.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/music_database/listallinfo.rs b/src/commands/music_database/listallinfo.rs index b9662742..623fb4f9 100644 --- a/src/commands/music_database/listallinfo.rs +++ b/src/commands/music_database/listallinfo.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/music_database/listfiles.rs b/src/commands/music_database/listfiles.rs index 58226ff5..2dfd9226 100644 --- a/src/commands/music_database/listfiles.rs +++ b/src/commands/music_database/listfiles.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/music_database/lsinfo.rs b/src/commands/music_database/lsinfo.rs index e08bf5f4..495543a1 100644 --- a/src/commands/music_database/lsinfo.rs +++ b/src/commands/music_database/lsinfo.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/music_database/readcomments.rs b/src/commands/music_database/readcomments.rs index 98c6e67c..17764ef1 100644 --- a/src/commands/music_database/readcomments.rs +++ b/src/commands/music_database/readcomments.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::{GenericResponseValue, ResponseAttributes}, }; diff --git a/src/commands/music_database/readpicture.rs b/src/commands/music_database/readpicture.rs index 4c875974..a269c974 100644 --- a/src/commands/music_database/readpicture.rs +++ b/src/commands/music_database/readpicture.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Offset, Uri}, + common::types::{Offset, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::{ ResponseAttributes, get_and_parse_property, get_optional_property, get_property, diff --git a/src/commands/music_database/rescan.rs b/src/commands/music_database/rescan.rs index c25ccdff..eb5be15c 100644 --- a/src/commands/music_database/rescan.rs +++ b/src/commands/music_database/rescan.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, }; diff --git a/src/commands/music_database/search.rs b/src/commands/music_database/search.rs index 610aaef2..de3601dd 100644 --- a/src/commands/music_database/search.rs +++ b/src/commands/music_database/search.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Sort, WindowRange}, + common::types::{Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, diff --git a/src/commands/music_database/searchadd.rs b/src/commands/music_database/searchadd.rs index dad97aec..c84e14ce 100644 --- a/src/commands/music_database/searchadd.rs +++ b/src/commands/music_database/searchadd.rs @@ -5,7 +5,7 @@ use crate::{ Command, Request, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{SongPosition, Sort, WindowRange}, + common::types::{SongPosition, Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/music_database/searchaddpl.rs b/src/commands/music_database/searchaddpl.rs index 2258bc68..bdb2be0e 100644 --- a/src/commands/music_database/searchaddpl.rs +++ b/src/commands/music_database/searchaddpl.rs @@ -5,7 +5,7 @@ use crate::{ Command, Request, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{PlaylistName, SongPosition, Sort, WindowRange}, + common::types::{PlaylistName, SongPosition, Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/music_database/searchcount.rs b/src/commands/music_database/searchcount.rs index 28c229fa..ab986e84 100644 --- a/src/commands/music_database/searchcount.rs +++ b/src/commands/music_database/searchcount.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::GroupType, + common::types::GroupType, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, diff --git a/src/commands/music_database/update.rs b/src/commands/music_database/update.rs index 809b62f7..f37ef56c 100644 --- a/src/commands/music_database/update.rs +++ b/src/commands/music_database/update.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::Uri, + common::types::Uri, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, }; diff --git a/src/commands/partition_commands/delpartition.rs b/src/commands/partition_commands/delpartition.rs index b3152c7b..4fe6cc78 100644 --- a/src/commands/partition_commands/delpartition.rs +++ b/src/commands/partition_commands/delpartition.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::PartitionName, + common::types::PartitionName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/partition_commands/listpartitions.rs b/src/commands/partition_commands/listpartitions.rs index cd7d51fd..6da20105 100644 --- a/src/commands/partition_commands/listpartitions.rs +++ b/src/commands/partition_commands/listpartitions.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::PartitionName, + common::types::PartitionName, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/partition_commands/newpartition.rs b/src/commands/partition_commands/newpartition.rs index 73c69cf2..23bc6a9a 100644 --- a/src/commands/partition_commands/newpartition.rs +++ b/src/commands/partition_commands/newpartition.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::PartitionName, + common::types::PartitionName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/partition_commands/partition.rs b/src/commands/partition_commands/partition.rs index b5f72efc..f64d12b8 100644 --- a/src/commands/partition_commands/partition.rs +++ b/src/commands/partition_commands/partition.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::PartitionName, + common::types::PartitionName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/playback_options/consume.rs b/src/commands/playback_options/consume.rs index aacd22e9..76291637 100644 --- a/src/commands/playback_options/consume.rs +++ b/src/commands/playback_options/consume.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::BoolOrOneshot, + common::types::BoolOrOneshot, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; @@ -20,7 +20,7 @@ impl Command for Consume { fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> { let state = match parts.next() { - Some(s) => crate::common::BoolOrOneshot::from_str(s) + Some(s) => crate::common::types::BoolOrOneshot::from_str(s) .map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?, None => return Err(RequestParserError::UnexpectedEOF), }; diff --git a/src/commands/playback_options/crossfade.rs b/src/commands/playback_options/crossfade.rs index fa092d79..ba7f2865 100644 --- a/src/commands/playback_options/crossfade.rs +++ b/src/commands/playback_options/crossfade.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Seconds, + common::types::Seconds, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/playback_options/getvol.rs b/src/commands/playback_options/getvol.rs index deb2d5cc..7966893c 100644 --- a/src/commands/playback_options/getvol.rs +++ b/src/commands/playback_options/getvol.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::VolumeValue, + common::types::VolumeValue, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, }; diff --git a/src/commands/playback_options/mixrampdelay.rs b/src/commands/playback_options/mixrampdelay.rs index 3922dc72..f74c7e33 100644 --- a/src/commands/playback_options/mixrampdelay.rs +++ b/src/commands/playback_options/mixrampdelay.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::Seconds, + common::types::Seconds, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/playback_options/replay_gain_mode.rs b/src/commands/playback_options/replay_gain_mode.rs index 6f626594..a50fb342 100644 --- a/src/commands/playback_options/replay_gain_mode.rs +++ b/src/commands/playback_options/replay_gain_mode.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::ReplayGainModeMode, + common::types::ReplayGainModeMode, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/playback_options/replay_gain_status.rs b/src/commands/playback_options/replay_gain_status.rs index 07e64e36..cfa34b78 100644 --- a/src/commands/playback_options/replay_gain_status.rs +++ b/src/commands/playback_options/replay_gain_status.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::ReplayGainModeMode, + common::types::ReplayGainModeMode, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_property}, }; diff --git a/src/commands/playback_options/setvol.rs b/src/commands/playback_options/setvol.rs index 4e5d7ba8..c956f95d 100644 --- a/src/commands/playback_options/setvol.rs +++ b/src/commands/playback_options/setvol.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::VolumeValue, + common::types::VolumeValue, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/playback_options/single.rs b/src/commands/playback_options/single.rs index f17b1d98..b26305e7 100644 --- a/src/commands/playback_options/single.rs +++ b/src/commands/playback_options/single.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::BoolOrOneshot, + common::types::BoolOrOneshot, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; @@ -20,7 +20,7 @@ impl Command for Single { fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> { let state = match parts.next() { - Some(s) => crate::common::BoolOrOneshot::from_str(s) + Some(s) => crate::common::types::BoolOrOneshot::from_str(s) .map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?, None => return Err(RequestParserError::UnexpectedEOF), }; diff --git a/src/commands/playback_options/volume.rs b/src/commands/playback_options/volume.rs index 91570ed9..ce37f721 100644 --- a/src/commands/playback_options/volume.rs +++ b/src/commands/playback_options/volume.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::VolumeValue, + common::types::VolumeValue, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/querying_mpd_status/idle.rs b/src/commands/querying_mpd_status/idle.rs index cdb0d367..dede02b5 100644 --- a/src/commands/querying_mpd_status/idle.rs +++ b/src/commands/querying_mpd_status/idle.rs @@ -2,7 +2,7 @@ use std::str::FromStr; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::SubSystem, + common::types::SubSystem, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/querying_mpd_status/status.rs b/src/commands/querying_mpd_status/status.rs index af49aa80..828e900f 100644 --- a/src/commands/querying_mpd_status/status.rs +++ b/src/commands/querying_mpd_status/status.rs @@ -5,7 +5,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::{Audio, BoolOrOneshot, SongId, SongPosition}, + common::types::{Audio, BoolOrOneshot, SongId, SongPosition}, request_tokenizer::RequestTokenizer, response_tokenizer::{ GenericResponseValue, ResponseAttributes, get_and_parse_optional_property, diff --git a/src/commands/queue/add.rs b/src/commands/queue/add.rs index a5a48f3b..f656608f 100644 --- a/src/commands/queue/add.rs +++ b/src/commands/queue/add.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongPosition, Uri}, + common::types::{SongPosition, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/addid.rs b/src/commands/queue/addid.rs index a8a37c7a..917cf9b5 100644 --- a/src/commands/queue/addid.rs +++ b/src/commands/queue/addid.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongId, SongPosition, Uri}, + common::types::{SongId, SongPosition, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_next_and_parse_property}, }; diff --git a/src/commands/queue/addtagid.rs b/src/commands/queue/addtagid.rs index aeefe830..3b486abb 100644 --- a/src/commands/queue/addtagid.rs +++ b/src/commands/queue/addtagid.rs @@ -5,7 +5,7 @@ use crate::{ commands::{ Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{SongId, TagName, TagValue}, + common::types::{SongId, TagName, TagValue}, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/queue/cleartagid.rs b/src/commands/queue/cleartagid.rs index f35f64b1..ab9e3caa 100644 --- a/src/commands/queue/cleartagid.rs +++ b/src/commands/queue/cleartagid.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongId, TagName}, + common::types::{SongId, TagName}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/delete.rs b/src/commands/queue/delete.rs index 9ce9938d..5d19894f 100644 --- a/src/commands/queue/delete.rs +++ b/src/commands/queue/delete.rs @@ -3,7 +3,7 @@ use std::str::FromStr; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::OneOrRange, + common::types::OneOrRange, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/deleteid.rs b/src/commands/queue/deleteid.rs index 9a5fadf2..d74c2ac0 100644 --- a/src/commands/queue/deleteid.rs +++ b/src/commands/queue/deleteid.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::SongId, + common::types::SongId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/move_.rs b/src/commands/queue/move_.rs index 18686c35..ea8023a9 100644 --- a/src/commands/queue/move_.rs +++ b/src/commands/queue/move_.rs @@ -5,7 +5,7 @@ use crate::{ commands::{ Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{AbsouluteRelativeSongPosition, OneOrRange}, + common::types::{AbsouluteRelativeSongPosition, OneOrRange}, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/queue/moveid.rs b/src/commands/queue/moveid.rs index 76704327..bc560625 100644 --- a/src/commands/queue/moveid.rs +++ b/src/commands/queue/moveid.rs @@ -5,7 +5,7 @@ use crate::{ commands::{ Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{AbsouluteRelativeSongPosition, SongId}, + common::types::{AbsouluteRelativeSongPosition, SongId}, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/queue/playlistfind.rs b/src/commands/queue/playlistfind.rs index 5343e5cc..0c4ec946 100644 --- a/src/commands/queue/playlistfind.rs +++ b/src/commands/queue/playlistfind.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Sort, WindowRange}, + common::types::{Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, diff --git a/src/commands/queue/playlistid.rs b/src/commands/queue/playlistid.rs index 3e84d856..d9a1f70a 100644 --- a/src/commands/queue/playlistid.rs +++ b/src/commands/queue/playlistid.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::SongId, + common::types::SongId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/playlistinfo.rs b/src/commands/queue/playlistinfo.rs index bfaeb594..c7ffa746 100644 --- a/src/commands/queue/playlistinfo.rs +++ b/src/commands/queue/playlistinfo.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::OneOrRange, + common::types::OneOrRange, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/playlistsearch.rs b/src/commands/queue/playlistsearch.rs index ccfb51a7..0c4abf3c 100644 --- a/src/commands/queue/playlistsearch.rs +++ b/src/commands/queue/playlistsearch.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Sort, WindowRange}, + common::types::{Sort, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, diff --git a/src/commands/queue/plchanges.rs b/src/commands/queue/plchanges.rs index 5a4c8679..67ce9b82 100644 --- a/src/commands/queue/plchanges.rs +++ b/src/commands/queue/plchanges.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistVersion, WindowRange}, + common::types::{PlaylistVersion, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/plchangesposid.rs b/src/commands/queue/plchangesposid.rs index 0480e4d2..a69f0159 100644 --- a/src/commands/queue/plchangesposid.rs +++ b/src/commands/queue/plchangesposid.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistVersion, WindowRange}, + common::types::{PlaylistVersion, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/prio.rs b/src/commands/queue/prio.rs index 5f8289e8..d90bccd9 100644 --- a/src/commands/queue/prio.rs +++ b/src/commands/queue/prio.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Priority, WindowRange}, + common::types::{Priority, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/prioid.rs b/src/commands/queue/prioid.rs index 51dad9fc..e1d218b7 100644 --- a/src/commands/queue/prioid.rs +++ b/src/commands/queue/prioid.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Priority, SongId}, + common::types::{Priority, SongId}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/rangeid.rs b/src/commands/queue/rangeid.rs index 6c5cf511..92faad42 100644 --- a/src/commands/queue/rangeid.rs +++ b/src/commands/queue/rangeid.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::{SongId, TimeInterval}, + common::types::{SongId, TimeInterval}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/shuffle.rs b/src/commands/queue/shuffle.rs index 798ddbd1..2cd2d381 100644 --- a/src/commands/queue/shuffle.rs +++ b/src/commands/queue/shuffle.rs @@ -1,7 +1,7 @@ use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::OneOrRange, + common::types::OneOrRange, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/swap.rs b/src/commands/queue/swap.rs index 3086bca2..d8e333f8 100644 --- a/src/commands/queue/swap.rs +++ b/src/commands/queue/swap.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::SongPosition, + common::types::SongPosition, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/queue/swapid.rs b/src/commands/queue/swapid.rs index 87ab2d33..d8d0ba97 100644 --- a/src/commands/queue/swapid.rs +++ b/src/commands/queue/swapid.rs @@ -3,7 +3,7 @@ use serde::{Deserialize, Serialize}; use crate::{ Request, commands::{Command, RequestParserError, RequestParserResult, ResponseParserError}, - common::SongId, + common::types::SongId, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stickers/sticker_dec.rs b/src/commands/stickers/sticker_dec.rs index c903c26f..285ee469 100644 --- a/src/commands/stickers/sticker_dec.rs +++ b/src/commands/stickers/sticker_dec.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{StickerType, Uri}, + common::types::{StickerType, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stickers/sticker_delete.rs b/src/commands/stickers/sticker_delete.rs index b9e2113b..148fcf32 100644 --- a/src/commands/stickers/sticker_delete.rs +++ b/src/commands/stickers/sticker_delete.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{StickerType, Uri}, + common::types::{StickerType, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stickers/sticker_find.rs b/src/commands/stickers/sticker_find.rs index abe17206..12adbbf0 100644 --- a/src/commands/stickers/sticker_find.rs +++ b/src/commands/stickers/sticker_find.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{Sort, StickerType, Uri, WindowRange}, + common::types::{Sort, StickerType, Uri, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/stickers/sticker_get.rs b/src/commands/stickers/sticker_get.rs index 338992b8..6fd65b40 100644 --- a/src/commands/stickers/sticker_get.rs +++ b/src/commands/stickers/sticker_get.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{StickerType, Uri}, + common::types::{StickerType, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_next_property}, }; diff --git a/src/commands/stickers/sticker_inc.rs b/src/commands/stickers/sticker_inc.rs index 4b97343d..2ffc54ab 100644 --- a/src/commands/stickers/sticker_inc.rs +++ b/src/commands/stickers/sticker_inc.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{StickerType, Uri}, + common::types::{StickerType, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stickers/sticker_list.rs b/src/commands/stickers/sticker_list.rs index 188b9f20..e29d1570 100644 --- a/src/commands/stickers/sticker_list.rs +++ b/src/commands/stickers/sticker_list.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{StickerType, Uri}, + common::types::{StickerType, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::{GenericResponseValue, ResponseAttributes}, }; diff --git a/src/commands/stickers/sticker_set.rs b/src/commands/stickers/sticker_set.rs index 34d2b94b..697e0e03 100644 --- a/src/commands/stickers/sticker_set.rs +++ b/src/commands/stickers/sticker_set.rs @@ -5,7 +5,7 @@ use crate::{ Command, Request, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError, }, - common::{StickerType, Uri}, + common::types::{StickerType, Uri}, request_tokenizer::RequestTokenizer, }; diff --git a/src/commands/stickers/stickernamestypes.rs b/src/commands/stickers/stickernamestypes.rs index 9b82a738..afd4676f 100644 --- a/src/commands/stickers/stickernamestypes.rs +++ b/src/commands/stickers/stickernamestypes.rs @@ -2,7 +2,7 @@ use std::collections::HashMap; use crate::{ commands::{Command, Request, RequestParserResult, ResponseParserError}, - common::StickerType, + common::types::StickerType, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/stored_playlists/listplaylist.rs b/src/commands/stored_playlists/listplaylist.rs index c44059b8..a5b93cf5 100644 --- a/src/commands/stored_playlists/listplaylist.rs +++ b/src/commands/stored_playlists/listplaylist.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistName, WindowRange}, + common::types::{PlaylistName, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, expect_property_type}, }; diff --git a/src/commands/stored_playlists/listplaylistinfo.rs b/src/commands/stored_playlists/listplaylistinfo.rs index b1c6a28d..0c5ae73c 100644 --- a/src/commands/stored_playlists/listplaylistinfo.rs +++ b/src/commands/stored_playlists/listplaylistinfo.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistName, WindowRange}, + common::types::{PlaylistName, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/load.rs b/src/commands/stored_playlists/load.rs index f3799e60..934147e8 100644 --- a/src/commands/stored_playlists/load.rs +++ b/src/commands/stored_playlists/load.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistName, SongPosition, WindowRange}, + common::types::{PlaylistName, SongPosition, WindowRange}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/playlistadd.rs b/src/commands/stored_playlists/playlistadd.rs index a62cd3aa..a5c240f1 100644 --- a/src/commands/stored_playlists/playlistadd.rs +++ b/src/commands/stored_playlists/playlistadd.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistName, SongPosition, Uri}, + common::types::{PlaylistName, SongPosition, Uri}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/playlistclear.rs b/src/commands/stored_playlists/playlistclear.rs index 9f1e7463..3df8027f 100644 --- a/src/commands/stored_playlists/playlistclear.rs +++ b/src/commands/stored_playlists/playlistclear.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::PlaylistName, + common::types::PlaylistName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/playlistdelete.rs b/src/commands/stored_playlists/playlistdelete.rs index 7c48ad50..549bdfd4 100644 --- a/src/commands/stored_playlists/playlistdelete.rs +++ b/src/commands/stored_playlists/playlistdelete.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{OneOrRange, PlaylistName}, + common::types::{OneOrRange, PlaylistName}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/playlistlength.rs b/src/commands/stored_playlists/playlistlength.rs index 8fcbe73e..8414741b 100644 --- a/src/commands/stored_playlists/playlistlength.rs +++ b/src/commands/stored_playlists/playlistlength.rs @@ -4,7 +4,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::PlaylistName, + common::types::PlaylistName, request_tokenizer::RequestTokenizer, response_tokenizer::{ResponseAttributes, get_and_parse_property}, }; diff --git a/src/commands/stored_playlists/playlistmove.rs b/src/commands/stored_playlists/playlistmove.rs index 044f90d7..690be20b 100644 --- a/src/commands/stored_playlists/playlistmove.rs +++ b/src/commands/stored_playlists/playlistmove.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{OneOrRange, PlaylistName, SongPosition}, + common::types::{OneOrRange, PlaylistName, SongPosition}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/rm.rs b/src/commands/stored_playlists/rm.rs index 32aa4912..1cb2d2be 100644 --- a/src/commands/stored_playlists/rm.rs +++ b/src/commands/stored_playlists/rm.rs @@ -1,6 +1,6 @@ use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::PlaylistName, + common::types::PlaylistName, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/save.rs b/src/commands/stored_playlists/save.rs index 7bf69a75..a5b334ec 100644 --- a/src/commands/stored_playlists/save.rs +++ b/src/commands/stored_playlists/save.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistName, SaveMode}, + common::types::{PlaylistName, SaveMode}, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, }; diff --git a/src/commands/stored_playlists/searchplaylist.rs b/src/commands/stored_playlists/searchplaylist.rs index 4eb3f666..e0862bea 100644 --- a/src/commands/stored_playlists/searchplaylist.rs +++ b/src/commands/stored_playlists/searchplaylist.rs @@ -2,7 +2,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError}, - common::{PlaylistName, WindowRange}, + common::types::{PlaylistName, WindowRange}, filter::Filter, request_tokenizer::RequestTokenizer, response_tokenizer::ResponseAttributes, diff --git a/src/common.rs b/src/common.rs index fe642b39..0d87a635 100644 --- a/src/common.rs +++ b/src/common.rs @@ -1,2 +1 @@ -mod types; -pub use types::*; +pub(crate) mod types; diff --git a/src/filter/filter.rs b/src/filter/filter.rs index 95988296..6169a92f 100644 --- a/src/filter/filter.rs +++ b/src/filter/filter.rs @@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize}; use crate::{ commands::RequestParserError, - common::{Priority, Tag}, + common::types::{Priority, Tag}, }; #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)] diff --git a/src/filter/filter_grammar.lalrpop b/src/filter/filter_grammar.lalrpop index 48616dac..156c87a7 100644 --- a/src/filter/filter_grammar.lalrpop +++ b/src/filter/filter_grammar.lalrpop @@ -1,7 +1,7 @@ use std::str::FromStr; use chrono::{DateTime, Utc}; use crate::filter::filter::{CaseSensitivity, ComparisonOperator, Filter, unescape_string}; -use crate::common::Tag; +use crate::common::types::Tag; grammar; diff --git a/src/request.rs b/src/request.rs index 8b1d7949..47a9e909 100644 --- a/src/request.rs +++ b/src/request.rs @@ -1,6 +1,6 @@ use serde::{Deserialize, Serialize}; -use crate::common::*; +use crate::common::types::*; use crate::request_tokenizer::RequestTokenizer; use crate::commands::*; diff --git a/src/server.rs b/src/server.rs index ea5b822a..6c5e62d9 100644 --- a/src/server.rs +++ b/src/server.rs @@ -1,4 +1,4 @@ -use crate::{Request, Response, common::SubSystem}; +use crate::{Request, Response, common::types::SubSystem}; pub trait MPDServer { type Error;