From 7c246f544653c65b7ecb7a61a66003a256e4791b Mon Sep 17 00:00:00 2001
From: Jake Probst <jake.probst@gmail.com>
Date: Sat, 8 Jun 2019 18:16:07 -0700
Subject: [PATCH] silence warnings, print strings in packets

---
 psopacket/src/lib.rs | 38 ++++++++++++++++++++++++++++----------
 src/patch/packet.rs  | 16 +++++++++++-----
 2 files changed, 39 insertions(+), 15 deletions(-)

diff --git a/psopacket/src/lib.rs b/psopacket/src/lib.rs
index 504cbc0..1f962ab 100644
--- a/psopacket/src/lib.rs
+++ b/psopacket/src/lib.rs
@@ -37,17 +37,35 @@ pub fn pso_packet(attr: TokenStream, item: TokenStream) -> TokenStream {
                     };
                     match *arr.elem {
                         syn::Type::Path(ref path) => {
-                            dbg_write_vars.push(quote! {
-                                write!(f, "    {}: {:?}\n", #ident_str, self.#ident.iter()).unwrap();
-                            });
+                            let ty = path.path.segments[0].ident.to_string();
+                            if ty.as_str() == "u8_str" {
+                                dbg_write_vars.push(quote! {
+                                    match std::str::from_utf8(&self.#ident) {
+                                        Ok(v) => write!(f, "    {}: {:?}\n", #ident_str, v).unwrap(),
+                                        Err(_) => write!(f, "    {}: {:?}\n", #ident_str, self.#ident.iter()).unwrap()
+                                    }
+                                });
+                            }
+                            else {
+                                dbg_write_vars.push(quote! {
+                                    write!(f, "    {}: {:?}\n", #ident_str, self.#ident.iter()).unwrap();
+                                });
+                            }
+                            //dbg_write_vars.push(quote! {
+                                //write!(f, "    {}: {:?}\n", #ident_str, self.#ident.iter()).unwrap();
+                                /*match std::str::from_utf8(&self.#ident) {
+                                    Ok(v) => write!(f, "    {}: {:?}\n", #ident_str, v).unwrap(),
+                                    Err(_) => write!(f, "    {}: {:?}\n", #ident_str, self.#ident.iter()).unwrap()
+                                }*/
+                                //write!(f, "    {}: {:?}\n", #ident_str, var_as_str).unwrap();
+                            //});
                             as_bytes.push(quote! {
                                 for f in self.#ident.iter() {
                                     buf.extend_from_slice(&f.to_le_bytes())
                                 }
                             });
-                            let ty = path.path.segments[0].ident.to_string();
                             match ty.as_str() {
-                                "u8" => {
+                                "u8" | "u8_str" => {
                                     from_bytes.push(quote! {
                                         #ident: {
                                             let mut b: [u8; #array_length] = [0; #array_length];
@@ -88,7 +106,7 @@ pub fn pso_packet(attr: TokenStream, item: TokenStream) -> TokenStream {
                     });
                     let ty = path.path.segments[0].ident.to_string();
                     match ty.as_str() {
-                        "u8" => {
+                        "u8" | "u8_str" => {
                             from_bytes.push(quote! {
                                 #ident: {
                                     let mut b: [u8; 1] = [0; 1];
@@ -178,9 +196,9 @@ pub fn pso_packet(attr: TokenStream, item: TokenStream) -> TokenStream {
         impl PSOPacket for #this_struct {
             fn from_bytes(data: &Vec<u8>) -> Result<#this_struct, PacketParseError> {
                 let mut cur = std::io::Cursor::new(data);
-                cur.seek(SeekFrom::Start(2));
+                cur.seek(SeekFrom::Start(2)).unwrap();
                 let mut b: [u8; 2] = [0; 2];
-                cur.read(&mut b);
+                cur.read(&mut b).unwrap();
                 let cmd = u16::from_le_bytes(b);
 
                 if cmd != #pkt_cmd {
@@ -188,10 +206,10 @@ pub fn pso_packet(attr: TokenStream, item: TokenStream) -> TokenStream {
                 }
                 
                 if #has_flag {
-                    cur.seek(SeekFrom::Start(4));
+                    cur.seek(SeekFrom::Start(4)).unwrap();
                 }
                 else {
-                    cur.seek(SeekFrom::Start(8));
+                    cur.seek(SeekFrom::Start(8)).unwrap();
                 }
                 Ok(#this_struct {
                     #(#from_bytes)*
diff --git a/src/patch/packet.rs b/src/patch/packet.rs
index 768bea5..e3bc013 100644
--- a/src/patch/packet.rs
+++ b/src/patch/packet.rs
@@ -3,10 +3,12 @@ use crate::{PSOPacket, PacketParseError};
 
 use std::io::{Read, Seek, SeekFrom};
 
+#[allow(non_camel_case_types)]
+type u8_str = u8;
 
 #[pso_packet(0x02)]
-struct PatchWelcome {
-    copyright: [u8; 44],
+pub struct PatchWelcome {
+    copyright: [u8_str; 44],
     padding: [u8; 20],
     server_key: u32,
     client_key: u32,
@@ -23,9 +25,10 @@ impl PatchWelcome {
     }
 }
 
-enum PatchPackets {
-    PatchWelcome(PatchWelcome)
+pub enum PatchPacket {
+    PatchWelcome(PatchWelcome),
 }
+ 
 
 #[cfg(test)]
 mod tests {
@@ -53,6 +56,9 @@ mod tests {
             padding: [0; 20],
             server_key: 123,
             client_key: 456,
-        }))
+        }));
+        if let Ok(p) = new_pkt {
+            println!("{:?}", p);
+        }
     }
 }