common: don't expose types directly

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,
 };

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,
 };

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},
 };

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,
 };

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,
 };

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},
 };

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},
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };
 

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,
 };

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},
 };

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},

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,

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,

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},
 };

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},

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,
 };

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,
 };

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,
 };

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},
 };

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},
 };

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,

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},
 };

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,

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,
 };

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,
 };

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},

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},
 };

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,
 };

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},
 };

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,
 };

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,
 };

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),
         };

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,
 };

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},
 };

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,
 };

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,
 };

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},
 };

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,
 };

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),
         };

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,
 };

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,
 };

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,

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,
 };

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},
 };

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,
 };
 

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,
 };

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,
 };

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,
 };

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,
 };
 

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,
 };
 

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,

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,
 };

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,
 };

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,

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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},
 };

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},
 };

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,
 };

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},
 };

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,
 };
 

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},
 };

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},
 };

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,
 };

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,
 };

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,
 };

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,
 };

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,
 };

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},
 };

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,
 };

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,
 };

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,
 };

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,

src/common.rs

@@ -1,2 +1 @@
-mod types;
-pub use types::*;
+pub(crate) mod types;

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)]

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;
 

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::*;

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;