Fixed Format

This commit is contained in:
Evann Regnault 2023-10-19 11:34:21 +02:00
parent 54d0c52244
commit e201630a9a
5 changed files with 6 additions and 7 deletions

View file

@ -10,7 +10,6 @@ env:
DOCKER_REGISTRY: r.regnault.dev DOCKER_REGISTRY: r.regnault.dev
DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }} DOCKER_USERNAME: ${{ secrets.DOCKER_USERNAME }}
DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }} DOCKER_PASSWORD: ${{ secrets.DOCKER_PASSWORD }}
PORTAINER_API_KEY: ${{ secrets.PORTAINER_API_KEY }}
PORTAINER_API_WEBHOOK: ${{ secrets.PORTAINER_API_WEBHOOK }} PORTAINER_API_WEBHOOK: ${{ secrets.PORTAINER_API_WEBHOOK }}
jobs: jobs:
@ -55,7 +54,6 @@ jobs:
- name: Deploy to production - name: Deploy to production
uses: fjogeleit/http-request-action@v1.14.1 uses: fjogeleit/http-request-action@v1.14.1
with: with:
url: ${{ env.PORTAINER_API_WEBHOOK }} url: ${{ format('{0}?tag={1}',env.PORTAINER_API_WEBHOOK, env.VERSION) }}
method: 'POST' method: 'POST'
customHeaders: ${{ env.PORTAINER_API_KEY }}
preventFailureOnNoResponse: true preventFailureOnNoResponse: true

2
Cargo.lock generated
View file

@ -1390,7 +1390,7 @@ dependencies = [
[[package]] [[package]]
name = "obsessed-yanqing" name = "obsessed-yanqing"
version = "1.4.0" version = "1.4.3"
dependencies = [ dependencies = [
"chrono", "chrono",
"levenshtein", "levenshtein",

View file

@ -1,6 +1,6 @@
[package] [package]
name = "obsessed-yanqing" name = "obsessed-yanqing"
version = "1.4.2" version = "1.4.3"
edition = "2021" edition = "2021"
authors = ["Evann Regnault"] authors = ["Evann Regnault"]
license = "MIT" license = "MIT"

View file

@ -132,7 +132,8 @@ fn get_date(date_string: &str) -> Option<String> {
fn get_time(event: Node) -> EventTime { fn get_time(event: Node) -> EventTime {
event.find(Class("duration")).next().map(|x| { event.find(Class("duration")).next().map(|x| {
let text = x.text(); let text = x.text();
let dates = Regex::new(r" [-] ").expect("Can't create split time regex").split(text.as_str()).collect::<Vec<&str>>(); let dates = Regex::new(r"[-—–]").expect("Can't create split time regex").split(text.as_str()).collect::<Vec<&str>>();
println!("{:?}", dates);
let start_date_text = dates.first().expect("Cannot get start date string").to_owned(); let start_date_text = dates.first().expect("Cannot get start date string").to_owned();
let end_date_text = dates.get(1).expect("Cannot get end date string").to_owned(); let end_date_text = dates.get(1).expect("Cannot get end date string").to_owned();
let start = get_date(start_date_text).map(|x| { let start = get_date(start_date_text).map(|x| {

View file

@ -29,7 +29,7 @@ pub struct Character {
pub full_image: FullImage, pub full_image: FullImage,
pub description: Option<Description>, pub description: Option<Description>,
pub default_role: String, pub default_role: String,
pub affiliation: String, pub affiliation: Option<String>,
pub rarity: String, pub rarity: String,
pub element: String, pub element: String,
pub path: String, pub path: String,