robin/vdf-reader
1
0
Fork 0
mirror of https://codeberg.org/icewind/vdf-reader.git synced 2026-06-03 18:14:07 +02:00
Code Issues Projects Releases Packages Wiki Activity

transparent entry serde

Browse source
This commit is contained in:
Robin Appelman 2023-12-18 20:54:49 +01:00
commit 3d0ca31840
8 changed files with 132 additions and 128 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/entry/array.rs
View file

@ -1,9 +1,10 @@
use super::Entry;
use serde::Serialize;
use serde::{Deserialize, Serialize};
use std::ops::{Deref, DerefMut};
/// An array of entries (items that have the same key).
#[derive(Clone, PartialEq, Eq, Debug, Serialize)]
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
#[serde(transparent)]
pub struct Array(Vec<Entry>);
impl From<Entry> for Array {

5
src/entry/mod.rs
View file

@ -13,7 +13,8 @@ pub use table::Table;
pub use value::Value;
/// The kinds of entry.
#[derive(Clone, PartialEq, Eq, Debug, Serialize)]
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
#[serde(untagged)]
pub enum Entry {
/// A table.
Table(Table),
@ -174,7 +175,7 @@ macro_rules! from_str {
);
}
use serde::Serialize;
use serde::{Deserialize, Serialize};
use std::net::{IpAddr, Ipv4Addr, Ipv6Addr, SocketAddr, SocketAddrV4, SocketAddrV6};
from_str!(for IpAddr Ipv4Addr Ipv6Addr SocketAddr SocketAddrV4 SocketAddrV6);
from_str!(for i8 i16 i32 i64 isize u8 u16 u32 u64 usize f32 f64);

5
src/entry/statement.rs
View file

@ -1,10 +1,11 @@
use super::Entry;
use serde::Serialize;
use serde::{Deserialize, Serialize};
use std::borrow::Cow;
use std::ops::Deref;
/// A statement.
#[derive(Clone, PartialEq, Eq, Debug, Serialize)]
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
#[serde(transparent)]
pub struct Statement(String);
impl From<Cow<'_, str>> for Statement {

5
src/entry/table.rs
View file

@ -2,13 +2,14 @@ use super::{Array, Entry};
use crate::entry::{Statement, Value};
use crate::event::{EntryEvent, GroupStartEvent};
use crate::{Event, Item, Reader, Result};
use serde::{Serialize, Serializer};
use serde::{Deserialize, Serialize, Serializer};
use std::collections::hash_map;
use std::collections::HashMap;
use std::ops::Deref;
/// A table of entries.
#[derive(Clone, PartialEq, Eq, Debug, Serialize)]
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
#[serde(transparent)]
pub struct Table(#[serde(serialize_with = "ordered_map")] HashMap<String, Entry>);
fn ordered_map<S, K: Ord + Serialize, V: Serialize>(

4
src/entry/value.rs
View file

@ -1,9 +1,9 @@
use super::Entry;
use serde::Serialize;
use serde::{Deserialize, Serialize};
use std::borrow::Cow;
use std::ops::Deref;
#[derive(Clone, PartialEq, Eq, Debug, Serialize)]
#[derive(Clone, PartialEq, Eq, Debug, Deserialize, Serialize)]
pub struct Value(String);
impl From<Cow<'_, str>> for Value {

216
tests/snapshots/parse__tests__data__DialogConfigOverlay_1280x720.vdf.snap
View file

@ -2,21 +2,21 @@
source: tests/parse.rs
expression: parsed
---
Table({
"UserConfigData": Table({
"FriendsMainDialog": Table({
"FriendPanelSelf": Table({}),
"FriendsDialogSheet": Table({
"FriendsClansPage": Table({
"BuddyList": Table({
{
"UserConfigData": {
"FriendsMainDialog": {
"FriendPanelSelf": {},
"FriendsDialogSheet": {
"FriendsClansPage": {
"BuddyList": {
"0_collapsed": Value("0"),
"1_collapsed": Value("0"),
"2_collapsed": Value("0"),
"3_collapsed": Value("0"),
}),
}),
"FriendsFriendsPage": Table({
"BuddyList": Table({
},
},
"FriendsFriendsPage": {
"BuddyList": {
"0_collapsed": Value("0"),
"1_collapsed": Value("0"),
"2_collapsed": Value("0"),
@ -24,132 +24,132 @@ Table({
"4_collapsed": Value("0"),
"5_collapsed": Value("0"),
"allfriends_collapsed": Value("0"),
}),
}),
}),
"FriendsState": Table({}),
},
},
},
"FriendsState": {},
"tall": Value("440"),
"wide": Value("252"),
"xpos": Value("1028"),
"ypos": Value("280"),
}),
"Servers": Table({
"DialogServerBrowser.res": Table({
"GameTabs": Table({
"FavoriteGames": Table({
"gamelist": Table({
"#ServerBrowser_Bots_hidden": Statement("1"),
"#ServerBrowser_Game_hidden": Statement("0"),
"#ServerBrowser_IPAddress_hidden": Statement("1"),
"#ServerBrowser_Latency_hidden": Statement("0"),
"#ServerBrowser_Map_hidden": Statement("0"),
"#ServerBrowser_Password_hidden": Statement("0"),
"#ServerBrowser_Players_hidden": Statement("0"),
"#ServerBrowser_Secure_hidden": Statement("0"),
"#ServerBrowser_Servers_hidden": Statement("0"),
},
"Servers": {
"DialogServerBrowser.res": {
"GameTabs": {
"FavoriteGames": {
"gamelist": {
"#ServerBrowser_Bots_hidden": "1",
"#ServerBrowser_Game_hidden": "0",
"#ServerBrowser_IPAddress_hidden": "1",
"#ServerBrowser_Latency_hidden": "0",
"#ServerBrowser_Map_hidden": "0",
"#ServerBrowser_Password_hidden": "0",
"#ServerBrowser_Players_hidden": "0",
"#ServerBrowser_Secure_hidden": "0",
"#ServerBrowser_Servers_hidden": "0",
"sort_column": Value("#ServerBrowser_Latency"),
"sort_column_asc": Value("1"),
"sort_column_secondary": Value(""),
"sort_column_secondary_asc": Value("1"),
}),
}),
"FriendsGames": Table({
"gamelist": Table({
"#ServerBrowser_Bots_hidden": Statement("1"),
"#ServerBrowser_Game_hidden": Statement("0"),
"#ServerBrowser_IPAddress_hidden": Statement("1"),
"#ServerBrowser_Latency_hidden": Statement("0"),
"#ServerBrowser_Map_hidden": Statement("0"),
"#ServerBrowser_Password_hidden": Statement("0"),
"#ServerBrowser_Players_hidden": Statement("0"),
"#ServerBrowser_Secure_hidden": Statement("0"),
"#ServerBrowser_Servers_hidden": Statement("0"),
},
},
"FriendsGames": {
"gamelist": {
"#ServerBrowser_Bots_hidden": "1",
"#ServerBrowser_Game_hidden": "0",
"#ServerBrowser_IPAddress_hidden": "1",
"#ServerBrowser_Latency_hidden": "0",
"#ServerBrowser_Map_hidden": "0",
"#ServerBrowser_Password_hidden": "0",
"#ServerBrowser_Players_hidden": "0",
"#ServerBrowser_Secure_hidden": "0",
"#ServerBrowser_Servers_hidden": "0",
"sort_column": Value("#ServerBrowser_Latency"),
"sort_column_asc": Value("1"),
"sort_column_secondary": Value(""),
"sort_column_secondary_asc": Value("1"),
}),
}),
"HistoryGames": Table({
"gamelist": Table({
"#ServerBrowser_Bots_hidden": Statement("1"),
"#ServerBrowser_Game_hidden": Statement("0"),
"#ServerBrowser_IPAddress_hidden": Statement("1"),
"#ServerBrowser_LastPlayed_hidden": Statement("0"),
"#ServerBrowser_Latency_hidden": Statement("0"),
"#ServerBrowser_Map_hidden": Statement("0"),
"#ServerBrowser_Password_hidden": Statement("0"),
"#ServerBrowser_Players_hidden": Statement("0"),
"#ServerBrowser_Secure_hidden": Statement("0"),
"#ServerBrowser_Servers_hidden": Statement("0"),
},
},
"HistoryGames": {
"gamelist": {
"#ServerBrowser_Bots_hidden": "1",
"#ServerBrowser_Game_hidden": "0",
"#ServerBrowser_IPAddress_hidden": "1",
"#ServerBrowser_LastPlayed_hidden": "0",
"#ServerBrowser_Latency_hidden": "0",
"#ServerBrowser_Map_hidden": "0",
"#ServerBrowser_Password_hidden": "0",
"#ServerBrowser_Players_hidden": "0",
"#ServerBrowser_Secure_hidden": "0",
"#ServerBrowser_Servers_hidden": "0",
"sort_column": Value("#ServerBrowser_LastPlayed"),
"sort_column_asc": Value("1"),
"sort_column_secondary": Value("#ServerBrowser_Latency"),
"sort_column_secondary_asc": Value("1"),
}),
}),
"InternetGames": Table({
"gamelist": Table({
"#ServerBrowser_Bots_hidden": Statement("1"),
"#ServerBrowser_Game_hidden": Statement("0"),
"#ServerBrowser_IPAddress_hidden": Statement("1"),
"#ServerBrowser_Latency_hidden": Statement("0"),
"#ServerBrowser_Map_hidden": Statement("0"),
"#ServerBrowser_Password_hidden": Statement("0"),
"#ServerBrowser_Players_hidden": Statement("0"),
"#ServerBrowser_Secure_hidden": Statement("0"),
"#ServerBrowser_Servers_hidden": Statement("0"),
},
},
"InternetGames": {
"gamelist": {
"#ServerBrowser_Bots_hidden": "1",
"#ServerBrowser_Game_hidden": "0",
"#ServerBrowser_IPAddress_hidden": "1",
"#ServerBrowser_Latency_hidden": "0",
"#ServerBrowser_Map_hidden": "0",
"#ServerBrowser_Password_hidden": "0",
"#ServerBrowser_Players_hidden": "0",
"#ServerBrowser_Secure_hidden": "0",
"#ServerBrowser_Servers_hidden": "0",
"sort_column": Value("#ServerBrowser_Latency"),
"sort_column_asc": Value("1"),
"sort_column_secondary": Value(""),
"sort_column_secondary_asc": Value("1"),
}),
}),
"LanGames": Table({
"gamelist": Table({
"#ServerBrowser_Bots_hidden": Statement("1"),
"#ServerBrowser_Game_hidden": Statement("0"),
"#ServerBrowser_IPAddress_hidden": Statement("1"),
"#ServerBrowser_Latency_hidden": Statement("0"),
"#ServerBrowser_Map_hidden": Statement("0"),
"#ServerBrowser_Password_hidden": Statement("0"),
"#ServerBrowser_Players_hidden": Statement("0"),
"#ServerBrowser_Secure_hidden": Statement("0"),
"#ServerBrowser_Servers_hidden": Statement("0"),
},
},
"LanGames": {
"gamelist": {
"#ServerBrowser_Bots_hidden": "1",
"#ServerBrowser_Game_hidden": "0",
"#ServerBrowser_IPAddress_hidden": "1",
"#ServerBrowser_Latency_hidden": "0",
"#ServerBrowser_Map_hidden": "0",
"#ServerBrowser_Password_hidden": "0",
"#ServerBrowser_Players_hidden": "0",
"#ServerBrowser_Secure_hidden": "0",
"#ServerBrowser_Servers_hidden": "0",
"sort_column": Value("#ServerBrowser_Latency"),
"sort_column_asc": Value("1"),
"sort_column_secondary": Value(""),
"sort_column_secondary_asc": Value("1"),
}),
}),
"SpectateGames": Table({
"gamelist": Table({
"#ServerBrowser_Bots_hidden": Statement("1"),
"#ServerBrowser_Game_hidden": Statement("0"),
"#ServerBrowser_IPAddress_hidden": Statement("1"),
"#ServerBrowser_Latency_hidden": Statement("0"),
"#ServerBrowser_Map_hidden": Statement("0"),
"#ServerBrowser_Password_hidden": Statement("0"),
"#ServerBrowser_Players_hidden": Statement("0"),
"#ServerBrowser_Secure_hidden": Statement("0"),
"#ServerBrowser_Servers_hidden": Statement("0"),
},
},
"SpectateGames": {
"gamelist": {
"#ServerBrowser_Bots_hidden": "1",
"#ServerBrowser_Game_hidden": "0",
"#ServerBrowser_IPAddress_hidden": "1",
"#ServerBrowser_Latency_hidden": "0",
"#ServerBrowser_Map_hidden": "0",
"#ServerBrowser_Password_hidden": "0",
"#ServerBrowser_Players_hidden": "0",
"#ServerBrowser_Secure_hidden": "0",
"#ServerBrowser_Servers_hidden": "0",
"sort_column": Value("#ServerBrowser_Latency"),
"sort_column_asc": Value("1"),
"sort_column_secondary": Value(""),
"sort_column_secondary_asc": Value("1"),
}),
}),
}),
},
},
},
"tall": Value("720"),
"wide": Value("1280"),
"xpos": Value("0"),
"ypos": Value("0"),
}),
}),
"Steam": Table({
"cached": Table({
"OverlaySplash.res": Table({}),
}),
}),
}),
})
},
},
"Steam": {
"cached": {
"OverlaySplash.res": {},
},
},
},
}

8
tests/snapshots/parse__tests__data__concrete.vmt.snap
View file

@ -2,8 +2,8 @@
source: tests/parse.rs
expression: parsed
---
Table({
"LightmappedGeneric": Table({
{
"LightmappedGeneric": {
"$baseTexture": Value("cp_mountainlab/concrete/concretefloor003"),
"$bumpmap": Value("concrete/concretefloor007b_height-ssbump"),
"$detail": Value("overlays/detail001"),
@ -12,5 +12,5 @@ Table({
"$detailscale": Value("1.9"),
"$ssbump": Value("1"),
"%keywords": Value("tf"),
}),
})
},
}

12
tests/snapshots/parse__tests__data__messy.vdf.snap
View file

@ -2,18 +2,18 @@
source: tests/parse.rs
expression: parsed
---
Table({
"Resource/specificPanel.res": Table({
{
"Resource/specificPanel.res": {
"$envmaptint": Value(".5"),
".5": Value(".5"),
"\\\\\"$translucent\"": Value("1"),
"array": Array([
"array": [
Value("1"),
Value("2"),
Value("3"),
]),
],
"empty": Value(""),
"empty quoted": Value("\"\""),
"windows_path": Value("C:\\test\\no newline"),
}),
})
},
}