Test

.gitea/workflows/build.yaml

@@ -32,7 +32,8 @@ jobs:
           cargo build --release 
       - name: Zip file 
         run: |
-          zip -rj build.zip ./target/release/ladose-caller ./font/
+          zip -r build.zip config.toml ./assets/*
+          zip -j build.zip ./target/release/ladose-caller
       - name: Upload Artifact
         uses: actions/upload-artifact@v3
         with:

Cargo.lock

@@ -107,15 +107,6 @@ version = "0.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724"
 
-[[package]]
-name = "cmake"
-version = "0.1.54"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7caa3f9de89ddbe2c607f4101924c5abec803763ae9534e4f4d7d8f84aa81f0"
-dependencies = [
- "cc",
-]
-
 [[package]]
 name = "cynic"
 version = "3.10.0"
@@ -1074,7 +1065,6 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "951deab27af08ed9c6068b7b0d05a93c91f0a8eb16b6b816a5e73452a43521d3"
 dependencies = [
  "cfg-if",
- "cmake",
  "libc",
  "version-compare",
 ]

config.toml

@@ -1,9 +1,12 @@
 tournament = 'tournoi-kiouze-test'
 update = 2
-fullscreen = true
+fullscreen = false
+tournament_image = './assets/images/xsb_white.png'
+font = './assets/fonts/achemine_regular.ttf'
+font_departure = './assets/fonts/achemine_bold.ttf'
 font_size = 40
 font_size_departure = 60
 smash_key = 'Bearer API_KEY'
 margin = 10
-w = 1920
-h = 1080
+w = 800
+h = 600

src/main.rs

@@ -2,12 +2,13 @@ extern crate sdl2;
 mod smashquery;
 mod smashrequest;
 
-
+use sdl2::render::Texture;
+use sdl2::image::LoadTexture;
 use sdl2::pixels::{Color, PixelFormatEnum};
 use sdl2::event::Event;
 use sdl2::keyboard::Keycode;
 use sdl2::rect::Rect;
-use sdl2::render::{Canvas, TextureQuery};
+use sdl2::render::{Canvas, TextureCreator, TextureQuery};
 use smashrequest::SmashQueue;
 
 use std::sync::{Arc, Mutex};
@@ -24,12 +25,20 @@ pub struct Config {
     update: Option<u32>,
     fullscreen: Option<bool>,
     smash_key: String,
+    font: String,
+    font_departure: String,
     font_size: u16,
     font_size_departure : u16,
     margin: u32,
     tournament_image: Option<String>
 
 }
+#[warn(dead_code)]
+impl Config {
+    fn new() -> Self {
+        Self { tournament: String::new(), update: Some(1),fullscreen:Some(false), smash_key: String::new(), font_size: 30 , font_size_departure : 45, margin: 10,tournament_image: None , w : 1920, h: 1080, font: String::from("./assets/fonts/achemine_regular.ttf"), font_departure: String::from("./assets/fonts/achemine_bold.ttf"),}
+    }
+}
 
 struct Line<'a> { 
     height : u32,
@@ -40,13 +49,12 @@ struct Line<'a> {
     y: u32
 }
 
-impl Config {
-    fn new() -> Self {
-        Self { tournament: String::new(), update: Some(1),fullscreen:Some(false), smash_key: String::new(), font_size: 30 , font_size_departure : 45, margin: 10,tournament_image: None , w : 1920, h: 1080}
-    }
+struct Asset<'a> {
+    height: i32,
+    width: i32,
+    data : Box<sdl2::render::Texture<'a>>
 }
 
-
 pub fn render(canvas : &mut Canvas<sdl2::video::Window> , queues : &Vec<smashrequest::SmashQueue>,font : &sdl2::ttf::Font<'_, '_> , font_departure : &sdl2::ttf::Font<'_, '_>, config : &Config ){
 
 
@@ -63,15 +71,31 @@ pub fn render(canvas : &mut Canvas<sdl2::video::Window> , queues : &Vec<smashreq
     let mut y : u32 = 0; 
     let mut index = 0;
     let mut lines = Vec::<Line>::new();
+    let mut texture_tournament : Option<sdl2::render::Texture> = None;
+    //Departure !
+    let d_surface = font_departure.render("Départ / Departure").blended(Color::RGBA(130, 218, 255, 255)).map_err(|e| e.to_string()).unwrap();
+    let d_text = texture_creator.create_texture_from_surface(&d_surface).unwrap();
+    let d_textq  : TextureQuery = d_text.query();
+    let angle : f64 = f64::from(-90.0);
+    let d_x = canvas.viewport().width() as i32 - d_textq.height as i32  - 10 ;
+    let d_y = canvas.viewport().height() as i32 -10 ;
+    let dst = Rect::new(d_x, d_y,d_textq.width,d_textq.height);
+
+    match &config.tournament_image {
+        Some(img_path) => {
+            texture_tournament = Some(texture_creator.load_texture(img_path).unwrap());
+        },
+        _ => {}
+    }
+
+    //Parse the Queue 
     for sq in queues {
 
         let surface: sdl2::surface::Surface<'_> = font.render(sq.name.as_str()).blended(Color::RGBA(255, 255, 0, 255)).map_err(|e| e.to_string()).unwrap();
         let text = texture_creator.create_texture_from_surface(&surface).unwrap();
         let textq  : TextureQuery = text.query();
         let _ = canvas.copy(&text, None, Rect::new(0, y.try_into().map_err(|_| 0).unwrap(), textq.width, textq.height));
-
-        y += textq.height+config.margin  * 2;
-
+        y += textq.height + config.margin;
         //compute line 
         for current_match in &sq.matches {
 
@@ -89,39 +113,39 @@ pub fn render(canvas : &mut Canvas<sdl2::video::Window> , queues : &Vec<smashreq
                 players : var_name,
                 texture : texture_creator.create_texture_from_surface(&surface).unwrap(),
                 alt_color : switch_col,
-                y: 0
+                y: y
             };
+
+            y += line.height + (config.margin*2);
             lines.push(line);
 
         }
-        let prev_y = y;
+    }
+
     // background 
     for l in &lines {
         if l.alt_color {
-                let _ = canvas.copy(&backline_text, None, Rect::new(0, y as i32 - config.margin as i32 , canvas.viewport().width(), l.height + config.margin ));
+            let _ = canvas.copy(&backline_text, None, Rect::new(0, l.y as i32 , canvas.viewport().width(), l.height + config.margin ));
         }            
-            y += l.height + (config.margin*2);
     }
-        // depart ! 
-        let d_surface = font_departure.render("Départ / Departure").blended(Color::RGBA(130, 218, 255, 255)).map_err(|e| e.to_string()).unwrap();
-        let d_text = texture_creator.create_texture_from_surface(&d_surface).unwrap();
-        let d_textq  : TextureQuery = d_text.query();
-        
-        let angle : f64 = f64::from(-90.0);
-        let d_x = canvas.viewport().width() as i32 - (d_textq.width as i32/2) - d_textq.height as i32;
-        let d_y = canvas.viewport().height() as i32 - ( d_textq.width as i32 /2) - d_textq.height as i32;
-        let dst = Rect::new(d_x, d_y,d_textq.width,d_textq.height);
-        let _ = canvas.copy_ex(&d_text, None, dst,angle,None,false,false).unwrap();// d_textq.width, d_textq.height));
 
+    let _ = canvas.copy_ex(&d_text, None, dst,angle,sdl2::rect::Point::new(0,0),false,false).unwrap();// d_textq.width, d_textq.height));
 
     // foreground 
-        y = prev_y;
     for l in &lines {
-            let _ = canvas.copy(&l.texture, None, Rect::new(10, y as i32 - config.margin as i32/2 , l.width, l.height));
-            y += l.height + (config.margin *2)  ;
+        match &texture_tournament {
+            Some(t) => {
+                let _ = canvas.copy(&t, None, Rect::new(5,l.y as i32,100,l.height));
+                let _ = canvas.copy(&l.texture, None, Rect::new(100, l.y as i32 + (config.margin/2) as i32 , l.width, l.height));
+
+            },
+            _ => {
+                let _ = canvas.copy(&l.texture, None, Rect::new(10, l.y as i32 + (config.margin/2) as i32 , l.width, l.height));
+            },
+        }
+        //let _ = canvas.copy(&l.texture, None, Rect::new(10, l.y as i32 + (config.margin/2) as i32 , l.width, l.height));
     }
 
-    }
 
 }
 
@@ -134,7 +158,7 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
     let box_config : Box<Config> = if config_file.is_ok() {
         Box::new(toml::from_str(&config_file.unwrap()).unwrap())
     } else {
-        Box::new(Config::new())
+        panic!("Error No config file!")
     };
     let update_timer = match box_config.update {
         Some(v) => v,
@@ -174,13 +198,10 @@ pub fn main() -> Result<(), Box<dyn std::error::Error>> {
 
     let mut canvas: Canvas<sdl2::video::Window> = window.into_canvas().build().unwrap();
     let ttf_context = sdl2::ttf::init().unwrap();
-    let font : sdl2::ttf::Font<'_, '_> = ttf_context.load_font("font/achemine_bold.ttf", box_config.font_size).unwrap();
-    let font_departure : sdl2::ttf::Font<'_, '_> = ttf_context.load_font("font/achemine_bold.ttf", box_config.font_size_departure).unwrap();
-
+    let font : sdl2::ttf::Font<'_, '_> = ttf_context.load_font(&box_config.font, box_config.font_size).unwrap();
+    let font_departure : sdl2::ttf::Font<'_, '_> = ttf_context.load_font(&box_config.font_departure, box_config.font_size_departure).unwrap();
     let timer = sdl_context.timer()?;
-
     let test_clone = Arc::clone(&test);
-
     let callback = Box::new(|| {  
         println!("Smash!");
         let data = smashrequest::get_matches(box_config.tournament.as_str(), box_config.smash_key.as_str());

src/smashrequest.rs

@@ -48,7 +48,7 @@ fn request_stream_queue(tournament :&str, key : &str ) -> GraphQlResponse<MyQuer
                 slug:Some(tournament)
             } );
 
-
+        println!("{}", key);
         let resp = reqwest::blocking::Client::new().post(URL_SMASH).header("Authorization", key).json(&query).send().unwrap();
         return resp.json().unwrap();