Moved battery, os docking into a new "v1" module

Added all_info to a module in v1

src/api/endpoints_v1.rs

@@ -1,9 +1,8 @@
 use actix_web::web;
 use actix_web::{HttpResponse, get};
 
-use crate::docking;
+use crate::v1::{docking, os, all_info, battery};
 use crate::version;
-use crate::battery;
 
 #[get("/are_you_there")]
 pub async fn index() -> HttpResponse {
@@ -12,7 +11,7 @@ pub async fn index() -> HttpResponse {
 
 #[get("/all_info")]
 pub async fn get_all_info() -> HttpResponse {
-    match crate::api::all_info::get_all_info() {
+    match all_info::stats::get_all_info() {
         Ok(info) => {
 
             #[cfg(debug_assertions)]
@@ -48,7 +47,7 @@ pub async fn get_dock_info() -> HttpResponse {
 
 #[get("/os_info")]
 pub async fn get_os_info() -> HttpResponse {
-    match crate::os::stats::get_os() {
+    match os::stats::get_os() {
         Ok(info) => {
             #[cfg(debug_assertions)]
             {

src/api/mod.rs

@@ -1,4 +1,2 @@
 pub mod server;
 mod endpoints_v1;
-mod structs;
-mod all_info;

src/main.rs

@@ -1,6 +1,4 @@
-mod battery;
-mod docking;
-mod os;
+mod v1;
 
 mod version;
 use version::info::Version;

src/v1/all_info/stats.rs

@@ -1,6 +1,6 @@
-use crate::docking;
-use crate::battery;
-use crate::os;
+use crate::v1::docking;
+use crate::v1::battery;
+use crate::v1::os;
 use crate::version;
 
 use super::structs::Allinfo;

src/v1/all_info/structs.rs

@@ -1,5 +1,6 @@
 use serde::{Deserialize, Serialize};
-use crate::{os, battery, docking::{self, structs::DockInfo}, version};
+use crate::{v1::{os, battery, docking::{self, structs::DockInfo}}, version};
+
 
 #[derive(Deserialize, Serialize, Clone)]
 pub struct Allinfo {

src/v1/battery/stats.rs

@@ -1,4 +1,4 @@
-use crate::battery::structs::ChargingStatus;
+use crate::v1::battery::structs::ChargingStatus;
 
 use super::structs::BatteryInfo;
 

src/v1/docking/stats.rs

@@ -3,7 +3,7 @@ use std::{io::BufReader, fs::File};
 #[allow(unused_imports)]
 use std::collections::hash_set;
 
-use crate::{battery::{stats::get_battery_info, structs::ChargingStatus}, USE_FALLBACK_DOCK_DETECTION};
+use crate::{v1::{battery::{stats::get_battery_info, structs::ChargingStatus}}, USE_FALLBACK_DOCK_DETECTION};
 
 use super::structs::{Dock, DockInfo};
 

src/v1/mod.rs

@@ -0,0 +1,4 @@
+pub mod battery;
+pub mod docking;
+pub mod os;
+pub mod all_info;

src/v1/os/mod.rs

@@ -0,0 +1,2 @@
+pub mod stats;
+pub mod structs;