common/types: flatten to types

src/commands/audio_output_devices/disableoutput.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::AudioOutputId,
+    types::AudioOutputId,
 };
 
 pub struct DisableOutput;

src/commands/audio_output_devices/enableoutput.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::AudioOutputId,
+    types::AudioOutputId,
 };
 
 pub struct EnableOutput;

src/commands/audio_output_devices/outputs.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
-    common::types::AudioOutputId,
     response_tokenizer::{ResponseAttributes, expect_property_type},
+    types::AudioOutputId,
 };
 
 pub struct Outputs;

src/commands/audio_output_devices/outputset.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::AudioOutputId,
     request_tokenizer::RequestTokenizer,
+    types::AudioOutputId,
 };
 
 pub struct OutputSet;

src/commands/audio_output_devices/toggleoutput.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::AudioOutputId,
+    types::AudioOutputId,
 };
 
 pub struct ToggleOutput;

src/commands/client_to_client/channels.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
-    common::types::ChannelName,
     response_tokenizer::{ResponseAttributes, expect_property_type},
+    types::ChannelName,
 };
 
 pub struct Channels;

src/commands/client_to_client/readmessages.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
-    common::types::ChannelName,
     response_tokenizer::{ResponseAttributes, expect_property_type},
+    types::ChannelName,
 };
 
 pub struct ReadMessages;

src/commands/client_to_client/sendmessage.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::ChannelName,
     request_tokenizer::RequestTokenizer,
+    types::ChannelName,
 };
 
 pub struct SendMessage;

src/commands/client_to_client/subscribe.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::ChannelName,
+    types::ChannelName,
 };
 
 pub struct Subscribe;

src/commands/client_to_client/unsubscribe.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::ChannelName,
+    types::ChannelName,
 };
 
 pub struct Unsubscribe;

src/commands/connection_settings/protocol_disable.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::Feature,
     request_tokenizer::RequestTokenizer,
+    types::Feature,
 };
 
 pub struct ProtocolDisable;

src/commands/connection_settings/protocol_enable.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::Feature,
     request_tokenizer::RequestTokenizer,
+    types::Feature,
 };
 
 pub struct ProtocolEnable;

src/commands/connection_settings/tag_types_disable.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::TagName,
     request_tokenizer::RequestTokenizer,
+    types::TagName,
 };
 
 pub struct TagTypesDisable;

src/commands/connection_settings/tag_types_enable.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::TagName,
     request_tokenizer::RequestTokenizer,
+    types::TagName,
 };
 
 pub struct TagTypesEnable;

src/commands/connection_settings/tag_types_reset.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::TagName,
     request_tokenizer::RequestTokenizer,
+    types::TagName,
 };
 
 pub struct TagTypesReset;

src/commands/controlling_playback/play.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::SongPosition,
+    types::SongPosition,
 };
 
 pub struct Play;

src/commands/controlling_playback/playid.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::SongId,
+    types::SongId,
 };
 
 pub struct PlayId;

src/commands/controlling_playback/seek.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongPosition, TimeWithFractions},
     request_tokenizer::RequestTokenizer,
+    types::{SongPosition, TimeWithFractions},
 };
 
 pub struct Seek;

src/commands/controlling_playback/seekcur.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SeekMode, TimeWithFractions},
     request_tokenizer::RequestTokenizer,
+    types::{SeekMode, TimeWithFractions},
 };
 
 pub struct SeekCur;

src/commands/controlling_playback/seekid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongId, TimeWithFractions},
     request_tokenizer::RequestTokenizer,
+    types::{SongId, TimeWithFractions},
 };
 
 pub struct SeekId;

src/commands/mounts_and_neighbors/mount.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{MountPath, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{MountPath, Uri},
 };
 
 pub struct Mount;

src/commands/mounts_and_neighbors/unmount.rs

@@ -1,8 +1,8 @@
 use crate::{
-    MountPath,
     commands::{
         Command, CommandRequest, RequestParserError, RequestTokenizer, empty_command_response,
     },
+    types::MountPath,
 };
 
 pub struct Unmount;

src/commands/music_database/albumart.rs

@@ -4,9 +4,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{Offset, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property, get_property},
+    types::{Offset, Uri},
 };
 
 pub struct AlbumArt;

src/commands/music_database/count.rs

@@ -4,10 +4,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::GroupType,
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
+    types::GroupType,
 };
 
 pub struct Count;

src/commands/music_database/find.rs

@@ -2,10 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{DbSelectionPrintResponse, DbSongInfo, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{DbSelectionPrintResponse, DbSongInfo, Sort, WindowRange},
 };
 
 pub struct Find;

src/commands/music_database/findadd.rs

@@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongPosition, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
+    types::{SongPosition, Sort, WindowRange},
 };
 
 pub struct FindAdd;

src/commands/music_database/getfingerprint.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, single_item_command_request},
-    common::types::Uri,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
+    types::Uri,
 };
 
 pub struct GetFingerprint;

src/commands/music_database/list.rs

@@ -2,10 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{GroupType, TagName, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
+    types::{GroupType, TagName, WindowRange},
 };
 
 pub struct List;

src/commands/music_database/listall.rs

@@ -1,13 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSelectionPrintResponse,
     commands::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::Uri,
     response_tokenizer::ResponseAttributes,
+    types::{DbSelectionPrintResponse, Uri},
 };
 
 pub struct ListAll;
@@ -43,7 +42,7 @@ impl Command<'_, '_> for ListAll {
 mod tests {
     use std::path::PathBuf;
 
-    use crate::{DbDirectoryInfo, DbPlaylistInfo, DbSongInfo};
+    use crate::types::{DbDirectoryInfo, DbPlaylistInfo, DbSongInfo};
 
     use super::*;
 

src/commands/music_database/listallinfo.rs

@@ -1,13 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSelectionPrintResponse,
     commands::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::Uri,
     response_tokenizer::ResponseAttributes,
+    types::{DbSelectionPrintResponse, Uri},
 };
 
 pub struct ListAllInfo;
@@ -43,7 +42,7 @@ impl Command<'_, '_> for ListAllInfo {
 mod tests {
     use std::path::PathBuf;
 
-    use crate::{DbDirectoryInfo, DbPlaylistInfo, DbSongInfo, Tag};
+    use crate::types::{DbDirectoryInfo, DbPlaylistInfo, DbSongInfo, Tag};
 
     use super::*;
 

src/commands/music_database/listfiles.rs

@@ -1,13 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbDirectoryInfo, DbSelectionPrintResponse,
     commands::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::Uri,
     response_tokenizer::ResponseAttributes,
+    types::{DbDirectoryInfo, DbSelectionPrintResponse, Uri},
 };
 
 pub struct ListFiles;

src/commands/music_database/lsinfo.rs

@@ -1,13 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSelectionPrintResponse,
     commands::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::Uri,
     response_tokenizer::ResponseAttributes,
+    types::{DbSelectionPrintResponse, Uri},
 };
 
 pub struct LsInfo;
@@ -42,7 +41,7 @@ impl Command<'_, '_> for LsInfo {
 mod tests {
     use std::path::PathBuf;
 
-    use crate::{DbDirectoryInfo, DbPlaylistInfo};
+    use crate::types::{DbDirectoryInfo, DbPlaylistInfo};
 
     use super::*;
 

src/commands/music_database/readcomments.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, single_item_command_request},
-    common::types::Uri,
     response_tokenizer::{GenericResponseValue, ResponseAttributes},
+    types::Uri,
 };
 
 pub struct ReadComments;

src/commands/music_database/readpicture.rs

@@ -4,11 +4,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{Offset, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{
         ResponseAttributes, get_and_parse_property, get_optional_property, get_property,
     },
+    types::{Offset, Uri},
 };
 
 pub struct ReadPicture;

src/commands/music_database/rescan.rs

@@ -7,8 +7,8 @@ use crate::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::Uri,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
+    types::Uri,
 };
 
 pub struct Rescan;

src/commands/music_database/search.rs

@@ -1,12 +1,11 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSelectionPrintResponse, DbSongInfo,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{DbSelectionPrintResponse, DbSongInfo, Sort, WindowRange},
 };
 
 pub struct Search;

src/commands/music_database/searchadd.rs

@@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongPosition, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
+    types::{SongPosition, Sort, WindowRange},
 };
 
 pub struct SearchAdd;

src/commands/music_database/searchaddpl.rs

@@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{PlaylistName, SongPosition, Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
+    types::{PlaylistName, SongPosition, Sort, WindowRange},
 };
 
 pub struct SearchAddPl;

src/commands/music_database/searchcount.rs

@@ -3,12 +3,11 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    Seconds,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::GroupType,
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
+    types::{GroupType, Seconds},
 };
 
 pub struct SearchCount;

src/commands/music_database/update.rs

@@ -7,8 +7,8 @@ use crate::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::Uri,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
+    types::Uri,
 };
 
 pub struct Update;

src/commands/partition_commands/delpartition.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::PartitionName,
+    types::PartitionName,
 };
 
 pub struct DelPartition;

src/commands/partition_commands/listpartitions.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{Command, ResponseParserError, empty_command_request, multi_item_command_response},
-    common::types::PartitionName,
     response_tokenizer::expect_property_type,
+    types::PartitionName,
 };
 
 pub struct ListPartitions;

src/commands/partition_commands/newpartition.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::PartitionName,
+    types::PartitionName,
 };
 
 pub struct NewPartition;

src/commands/partition_commands/partition.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::PartitionName,
+    types::PartitionName,
 };
 
 pub struct Partition;

src/commands/playback_options/consume.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::BoolOrOneshot,
+    types::BoolOrOneshot,
 };
 
 pub struct Consume;

src/commands/playback_options/crossfade.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::Seconds,
+    types::Seconds,
 };
 
 pub struct Crossfade;

src/commands/playback_options/getvol.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_request, single_item_command_response},
-    common::types::VolumeValue,
+    types::VolumeValue,
 };
 
 pub struct GetVol;

src/commands/playback_options/mixrampdelay.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::Seconds,
+    types::Seconds,
 };
 
 pub struct MixRampDelay;

src/commands/playback_options/replay_gain_mode.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::ReplayGainModeMode,
+    types::ReplayGainModeMode,
 };
 
 pub struct ReplayGainMode;

src/commands/playback_options/replay_gain_status.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
-    common::types::ReplayGainModeMode,
     response_tokenizer::{ResponseAttributes, get_property},
+    types::ReplayGainModeMode,
 };
 
 pub struct ReplayGainStatus;

src/commands/playback_options/setvol.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::VolumeValue,
+    types::VolumeValue,
 };
 
 pub struct SetVol;

src/commands/playback_options/single.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::BoolOrOneshot,
+    types::BoolOrOneshot,
 };
 
 pub struct Single;

src/commands/playback_options/volume.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::VolumeValue,
+    types::VolumeValue,
 };
 
 pub struct Volume;

src/commands/querying_mpd_status/currentsong.rs

@@ -3,11 +3,11 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo, Priority, SongId, SongPosition,
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
     response_tokenizer::{
         ResponseAttributes, get_and_parse_optional_property, get_and_parse_property,
     },
+    types::{DbSongInfo, Priority, SongId, SongPosition},
 };
 
 /// Displays the song info of the current song (same song that is identified in status)

src/commands/querying_mpd_status/idle.rs

@@ -2,8 +2,8 @@ use std::str::FromStr;
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::SubSystem,
     request_tokenizer::RequestTokenizer,
+    types::SubSystem,
 };
 
 pub struct Idle;

src/commands/querying_mpd_status/status.rs

@@ -5,11 +5,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
-    common::types::{Audio, BoolOrOneshot, SongId, SongPosition},
     response_tokenizer::{
         ResponseAttributes, get_and_parse_optional_property, get_and_parse_property,
         get_optional_property, get_property,
     },
+    types::{Audio, BoolOrOneshot, SongId, SongPosition},
 };
 
 pub struct Status;

src/commands/queue/add.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{SongPosition, Uri},
 };
 
 pub struct Add;

src/commands/queue/addid.rs

@@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{SongId, SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, get_next_and_parse_property},
+    types::{SongId, SongPosition, Uri},
 };
 
 pub struct AddId;

src/commands/queue/addtagid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongId, TagName, TagValue},
     request_tokenizer::RequestTokenizer,
+    types::{SongId, TagName, TagValue},
 };
 
 pub struct AddTagId;

src/commands/queue/cleartagid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongId, TagName},
     request_tokenizer::RequestTokenizer,
+    types::{SongId, TagName},
 };
 
 pub struct ClearTagId;

src/commands/queue/delete.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::OneOrRange,
+    types::OneOrRange,
 };
 
 pub struct Delete;

src/commands/queue/deleteid.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::SongId,
+    types::SongId,
 };
 
 pub struct DeleteId;

src/commands/queue/move_.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{AbsouluteRelativeSongPosition, OneOrRange},
     request_tokenizer::RequestTokenizer,
+    types::{AbsouluteRelativeSongPosition, OneOrRange},
 };
 
 pub struct Move;

src/commands/queue/moveid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{AbsouluteRelativeSongPosition, SongId},
     request_tokenizer::RequestTokenizer,
+    types::{AbsouluteRelativeSongPosition, SongId},
 };
 
 pub struct MoveId;

src/commands/queue/playlist.rs

@@ -1,9 +1,9 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    Uri,
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
     response_tokenizer::ResponseAttributes,
+    types::Uri,
 };
 
 pub struct Playlist;

src/commands/queue/playlistfind.rs

@@ -1,12 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo, Priority, Response, SongId, SongPosition,
+    Response,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{DbSongInfo, Priority, SongId, SongPosition, Sort, WindowRange},
 };
 
 pub struct PlaylistFind;

src/commands/queue/playlistid.rs

@@ -1,10 +1,9 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo, Priority, SongPosition,
     commands::{Command, CommandResponse, ResponseParserError, single_item_command_request},
-    common::types::SongId,
     response_tokenizer::ResponseAttributes,
+    types::{DbSongInfo, Priority, SongId, SongPosition},
 };
 
 pub struct PlaylistId;

src/commands/queue/playlistinfo.rs

@@ -1,13 +1,12 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo, Priority, SongId, SongPosition,
     commands::{
         Command, CommandResponse, RequestParserError, ResponseParserError,
         single_optional_item_command_request,
     },
-    common::types::OneOrRange,
     response_tokenizer::ResponseAttributes,
+    types::{DbSongInfo, OneOrRange, Priority, SongId, SongPosition},
 };
 
 pub struct PlaylistInfo;

src/commands/queue/playlistsearch.rs

@@ -1,12 +1,11 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo, Priority, SongId, SongPosition,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{Sort, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{DbSongInfo, Priority, SongId, SongPosition, Sort, WindowRange},
 };
 
 pub struct PlaylistSearch;

src/commands/queue/plchanges.rs

@@ -1,11 +1,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo, Priority, SongId, SongPosition,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{PlaylistVersion, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{DbSongInfo, PlaylistVersion, Priority, SongId, SongPosition, WindowRange},
 };
 
 pub struct PlChanges;

src/commands/queue/plchangesposid.rs

@@ -1,11 +1,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    SongId, SongPosition,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{PlaylistVersion, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{PlaylistVersion, SongId, SongPosition, WindowRange},
 };
 
 pub struct PlChangesPosId;

src/commands/queue/prio.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{Priority, WindowRange},
     request_tokenizer::RequestTokenizer,
+    types::{Priority, WindowRange},
 };
 
 pub struct Prio;

src/commands/queue/prioid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{Priority, SongId},
     request_tokenizer::RequestTokenizer,
+    types::{Priority, SongId},
 };
 
 pub struct PrioId;

src/commands/queue/rangeid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{SongId, TimeInterval},
     request_tokenizer::RequestTokenizer,
+    types::{SongId, TimeInterval},
 };
 
 pub struct RangeId;

src/commands/queue/shuffle.rs

@@ -2,7 +2,7 @@ use crate::{
     commands::{
         Command, RequestParserError, empty_command_response, single_optional_item_command_request,
     },
-    common::types::OneOrRange,
+    types::OneOrRange,
 };
 
 pub struct Shuffle;

src/commands/queue/swap.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::SongPosition,
     request_tokenizer::RequestTokenizer,
+    types::SongPosition,
 };
 
 pub struct Swap;

src/commands/queue/swapid.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::SongId,
     request_tokenizer::RequestTokenizer,
+    types::SongId,
 };
 
 pub struct SwapId;

src/commands/stickers/sticker_dec.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{StickerType, Uri},
 };
 
 pub struct StickerDec;

src/commands/stickers/sticker_delete.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{StickerType, Uri},
 };
 
 pub struct StickerDelete;

src/commands/stickers/sticker_find.rs

@@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{Sort, StickerType, Uri, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
+    types::{Sort, StickerType, Uri, WindowRange},
 };
 
 pub struct StickerFind;

src/commands/stickers/sticker_get.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, single_item_command_response},
-    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{StickerType, Uri},
 };
 
 pub struct StickerGet;

src/commands/stickers/sticker_inc.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{StickerType, Uri},
 };
 
 pub struct StickerInc;

src/commands/stickers/sticker_list.rs

@@ -4,9 +4,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{GenericResponseValue, ResponseAttributes},
+    types::{StickerType, Uri},
 };
 
 pub struct StickerList;

src/commands/stickers/sticker_set.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{StickerType, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{StickerType, Uri},
 };
 
 pub struct StickerSet;

src/commands/stickers/stickernamestypes.rs

@@ -4,9 +4,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::StickerType,
     request_tokenizer::RequestTokenizer,
     response_tokenizer::{ResponseAttributes, expect_property_type},
+    types::StickerType,
 };
 
 pub struct StickerNamesTypes;

src/commands/stored_playlists/listplaylist.rs

@@ -7,9 +7,9 @@ use crate::{
         Command, CommandRequest, RequestParserError, ResponseParserError,
         multi_item_command_response,
     },
-    common::types::{PlaylistName, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::expect_property_type,
+    types::{PlaylistName, WindowRange},
 };
 
 pub struct ListPlaylist;

src/commands/stored_playlists/listplaylistinfo.rs

@@ -1,11 +1,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    DbSongInfo,
     commands::{Command, CommandRequest, CommandResponse, RequestParserError, ResponseParserError},
-    common::types::{PlaylistName, WindowRange},
     request_tokenizer::RequestTokenizer,
     response_tokenizer::ResponseAttributes,
+    types::{DbSongInfo, PlaylistName, WindowRange},
 };
 
 pub struct ListPlaylistInfo;

src/commands/stored_playlists/listplaylists.rs

@@ -1,9 +1,9 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    PlaylistName,
     commands::{Command, CommandResponse, ResponseParserError, empty_command_request},
     response_tokenizer::{ResponseAttributes, get_next_and_parse_property, get_next_property},
+    types::PlaylistName,
 };
 
 pub struct ListPlaylists;

src/commands/stored_playlists/load.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{PlaylistName, SongPosition, WindowRange},
     request_tokenizer::RequestTokenizer,
+    types::{PlaylistName, SongPosition, WindowRange},
 };
 
 pub struct Load;

src/commands/stored_playlists/playlistadd.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{PlaylistName, SongPosition, Uri},
     request_tokenizer::RequestTokenizer,
+    types::{PlaylistName, SongPosition, Uri},
 };
 
 pub struct PlaylistAdd;

src/commands/stored_playlists/playlistclear.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::PlaylistName,
+    types::PlaylistName,
 };
 
 pub struct PlaylistClear;

src/commands/stored_playlists/playlistdelete.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{OneOrRange, PlaylistName},
     request_tokenizer::RequestTokenizer,
+    types::{OneOrRange, PlaylistName},
 };
 
 pub struct PlaylistDelete;

src/commands/stored_playlists/playlistlength.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandResponse, ResponseParserError, single_item_command_request},
-    common::types::PlaylistName,
     response_tokenizer::{ResponseAttributes, get_and_parse_property},
+    types::PlaylistName,
 };
 
 pub struct PlaylistLength;

src/commands/stored_playlists/playlistmove.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{OneOrRange, PlaylistName, SongPosition},
     request_tokenizer::RequestTokenizer,
+    types::{OneOrRange, PlaylistName, SongPosition},
 };
 
 pub struct PlaylistMove;

src/commands/stored_playlists/rm.rs

@@ -1,6 +1,6 @@
 use crate::{
     commands::{Command, empty_command_response, single_item_command_request},
-    common::types::PlaylistName,
+    types::PlaylistName,
 };
 
 pub struct Rm;

src/commands/stored_playlists/save.rs

@@ -2,8 +2,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{PlaylistName, SaveMode},
     request_tokenizer::RequestTokenizer,
+    types::{PlaylistName, SaveMode},
 };
 
 pub struct Save;

src/commands/stored_playlists/searchplaylist.rs

@@ -2,9 +2,9 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{Command, CommandRequest, RequestParserError, empty_command_response},
-    common::types::{PlaylistName, WindowRange},
     filter::Filter,
     request_tokenizer::RequestTokenizer,
+    types::{PlaylistName, WindowRange},
 };
 
 pub struct SearchPlaylist;

src/common.rs

@@ -1 +0,0 @@
-pub(crate) mod types;

src/filter/filter.rs

@@ -6,7 +6,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::RequestParserError,
-    common::types::{Priority, Tag},
+    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::types::Tag;
+use crate::types::Tag;
 
 grammar;