DR_Team/Difficult-Rocket
DR_Team/Difficult-Rocket
6
2
Fork 0
Code Issues Pull Requests Projects Releases 25 Wiki Activity

add raise for SR1Ship

Browse Source
This commit is contained in:
shenjack 2023-07-24 09:45:40 +08:00
parent 7fed4032e0
commit e997633cc5
Signed by: shenjack
GPG Key ID: 7B1134A979775551
2 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mods/dr_game/Difficult_Rocket_rs/__init__.py
View File

@ -144,7 +144,14 @@ if TYPE_CHECKING:
def __init__(self,
file_path: Optional[str] = './assets/builtin/dock1.xml',
part_list: Optional[SR1PartList_rs] = None,
ship_name: Optional[str] = 'NewShip'): ...
ship_name: Optional[str] = 'NewShip'):
"""
读取 SR1Ship
:raise ValueError: 读取失败
:param file_path:
:param part_list:
:param ship_name:
"""
@property
def name(self) -> str: ...

22
mods/dr_game/Difficult_Rocket_rs/src/src/python.rs
View File

@ -9,6 +9,7 @@
pub mod data {
use std::collections::HashMap;
use pyo3::exceptions::PyValueError;
use pyo3::prelude::*;
use crate::sr1_data::part_list::RawPartList;
@ -170,14 +171,19 @@ pub mod data {
impl PySR1Ship {
#[new]
#[pyo3(text_signature = "(file_path = './assets/builtin/dock1.xml', part_list = None, ship_name = 'NewShip')")]
fn new(file_path: String, part_list: Option<PySR1PartList>, ship_name: Option<String>) -> Self {
let mut ship = SR1Ship::from_file(file_path, Some(ship_name.unwrap_or("new ship".to_string()))).unwrap();
let part_list = match part_list {
Some(part_list) => part_list.data,
None => SR1PartList::from_file("./assets/builtin/PartList.xml".to_string()).unwrap(),
};
ship.parse_part_list_to_part(&part_list);
Self { ship, part_list }
fn new(file_path: String, part_list: Option<PySR1PartList>, ship_name: Option<String>) -> PyResult<Self> {
let ship = SR1Ship::from_file(file_path.clone(), Some(ship_name.unwrap_or("new ship".to_string())));
match ship {
Some(mut ship) => {
let part_list = match part_list {
Some(part_list) => part_list.data,
None => SR1PartList::from_file("./assets/builtin/PartList.xml".to_string()).unwrap(),
};
ship.parse_part_list_to_part(&part_list);
Ok(Self { ship, part_list })
}
None => Err(PyValueError::new_err(format!("Parse ship failed! {}", file_path))),
}
}
#[getter]