Changed uses to have a better structure

This commit is contained in:
cosminperram 2022-10-23 14:03:59 +03:00
parent c0d07cf6f9
commit 3ac6a8b603
18 changed files with 113 additions and 97 deletions

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::ALIENS), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::ASRD), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, GatheringSettings, ServerPlayer, Server};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerPlayer, GatheringSettings};
#[derive(Debug)]
pub struct Player {
@ -69,7 +70,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::CSGO), Some(GatheringSettings {

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::CSS), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::DODS), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::GM), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::HL2DM), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::INS), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::INSMIC), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27131,
Some(port) => port
}, Some(App::INSS), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::L4D), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::L4D2), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, Server, ServerRule, ServerPlayer};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -71,7 +72,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::TF2), None)?;

View file

@ -1,5 +1,6 @@
use crate::{GDResult, valve};
use crate::valve::{ValveProtocol, App, ServerPlayer, Server, ServerRule};
use crate::GDResult;
use crate::protocols::valve;
use crate::protocols::valve::{App, Server, ServerRule, ServerPlayer};
#[derive(Debug)]
pub struct Player {
@ -83,7 +84,7 @@ impl Response {
}
pub fn query(address: &str, port: Option<u16>) -> GDResult<Response> {
let valve_response = ValveProtocol::query(address, match port {
let valve_response = valve::query(address, match port {
None => 27015,
Some(port) => port
}, Some(App::TS), None)?;