diff --git a/.github/workflows/rust.yml b/.github/workflows/rust.yml new file mode 100644 index 0000000..72747f6 --- /dev/null +++ b/.github/workflows/rust.yml @@ -0,0 +1,23 @@ +name: Rust + +on: + push: + branches: [ main ] + pull_request: + branches: [ main ] + workflow_dispatch: + +env: + CARGO_TERM_COLOR: always + +jobs: + build: + + runs-on: ubuntu-latest + + steps: + - uses: actions/checkout@v2 + - name: Build + run: cargo build --verbose + - name: Run tests + run: cargo test --verbose diff --git a/Cargo.lock b/Cargo.lock index 6644a46..7c6b9c6 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -345,9 +345,9 @@ checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed" [[package]] name = "fltk" -version = "1.2.7" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0953c34fd5b0c6ac1b615fdcda8845c81ed364165b115ddac46ae8953d456640" +checksum = "889d9b2176b88c6f8f90ba64b0b030e52807ed1d6e416df0c15611225b40cc1d" dependencies = [ "bitflags", "fltk-sys", @@ -356,9 +356,9 @@ dependencies = [ [[package]] name = "fltk-sys" -version = "1.2.7" +version = "1.2.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2df700440c014123cc1644fbef7d33dcdda18cdd80373a7552a9d5cec47ca63" +checksum = "e38b2f3fb23b4bd46fc492d5d8d099b0bf766a7ab5d18b8424d93089ae934a48" dependencies = [ "cmake", ] diff --git a/README.md b/README.md index ebbd3fe..28617be 100644 --- a/README.md +++ b/README.md @@ -226,4 +226,4 @@ For now, either email me (if you know me personally) or make a pull request to a PTTH is licensed under the [GNU AGPLv3](https://www.gnu.org/licenses/agpl-3.0.html) -Copyright 2020 "Trish" +Copyright 2020-2021 "Trish" diff --git a/handlebars/relay/debug.hbs b/handlebars/relay/debug.hbs index f89e422..b71df54 100644 --- a/handlebars/relay/debug.hbs +++ b/handlebars/relay/debug.hbs @@ -52,8 +52,6 @@ Lorem ipsum dolor set amet

Data sink (POST only) -

Persistent toggle is

{{persistent_toggle}}

-
diff --git a/handlebars/relay/root.hbs b/handlebars/relay/root.hbs index 98391fa..6d21b64 100644 --- a/handlebars/relay/root.hbs +++ b/handlebars/relay/root.hbs @@ -14,6 +14,10 @@ .entry_list div:nth-child(odd) { background-color: #ddd; } + .fine { + color: #444; + font-size: 12px; + } PTTH relay @@ -33,5 +37,12 @@ +

+Rendered by PTTH relay server. +Copyright 2020-2021 "Trish" ReactorScram. Licensed under the +GNU AGPLv3. +Download source code +

+ diff --git a/handlebars/relay/server_list.hbs b/handlebars/relay/server_list.hbs index 04ef3f1..84376a8 100644 --- a/handlebars/relay/server_list.hbs +++ b/handlebars/relay/server_list.hbs @@ -95,6 +95,13 @@ Git version: {{git_version}} {{else}} Not built from Git {{/if}} + +

+Rendered by PTTH relay server. +Copyright 2020-2021 "Trish" ReactorScram. Licensed under the +GNU AGPLv3. +Download source code +

diff --git a/handlebars/server/file_server_dir.html b/handlebars/server/file_server_dir.html index aca7991..857daca 100644 --- a/handlebars/server/file_server_dir.html +++ b/handlebars/server/file_server_dir.html @@ -27,6 +27,10 @@ AIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAA" rel="icon" type="image/x-icon" /> transition: var(--dark-mode-transition); } + .fine { + color: #444; + font-size: 12px; + } .light_switch { display: none; } @@ -40,7 +44,7 @@ AIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAA" rel="icon" type="image/x-icon" /> .light_switch_label::before { content: "[ ] "; } - a { + .app a { color: var(--main-link-color); transition: var(--dark-mode-transition); } @@ -122,6 +126,15 @@ AIABAACAAQAAgAEAAIABAACAAQAAgAEAAIABAACAAQAA" rel="icon" type="image/x-icon" /> - + + + +

+Rendered by PTTH end server. +Copyright 2020-2021 "Trish" ReactorScram. Licensed under the +GNU AGPLv3. +Download source code +

+ diff --git a/handlebars/server/file_server_root.html b/handlebars/server/file_server_root.html index 7cd63df..f55aab5 100644 --- a/handlebars/server/file_server_root.html +++ b/handlebars/server/file_server_root.html @@ -15,6 +15,10 @@ .entry_list div:nth-child(even) { background-color: #ddd; } + .fine { + color: #444; + font-size: 12px; + } {{metrics_startup.server_name}} @@ -22,10 +26,6 @@

{{metrics_startup.server_name}}

-

Gauges

- -

RSS MiB: {{metrics_interval.rss_mib}}

-
@@ -40,5 +40,12 @@
+

+Rendered by PTTH end server. +Copyright 2020-2021 "Trish" ReactorScram. Licensed under the +GNU AGPLv3. +Download source code +

+ diff --git a/prototypes/ptth_quic_client_gui/Cargo.toml b/prototypes/ptth_quic_client_gui/Cargo.toml index 23b6df2..b5f7b81 100644 --- a/prototypes/ptth_quic_client_gui/Cargo.toml +++ b/prototypes/ptth_quic_client_gui/Cargo.toml @@ -10,7 +10,7 @@ license = "AGPL-3.0" [dependencies] anyhow = "1.0.38" blake3 = "1.0.0" -fltk = "1.2.7" +fltk = "1.2.8" quic_demo = { path = "../quic_demo" } quinn = "0.7.2" rand = "0.8.4" diff --git a/prototypes/ptth_quic_client_gui/src/main.rs b/prototypes/ptth_quic_client_gui/src/main.rs index ad1c3f6..13c23f7 100644 --- a/prototypes/ptth_quic_client_gui/src/main.rs +++ b/prototypes/ptth_quic_client_gui/src/main.rs @@ -136,7 +136,9 @@ impl GuiClient <'_> { ports_col: &mut Flex, fltk_tx: fltk::app::Sender ) { - if self.ports.len () >= 5 { + const MAX_PORTS: usize = 15; + + if self.ports.len () >= MAX_PORTS { return; } @@ -151,7 +153,7 @@ impl GuiClient <'_> { self.ports.push (port); - if self.ports.len () >= 5 { + if self.ports.len () >= MAX_PORTS { self.but_add_port.deactivate (); } } @@ -224,7 +226,7 @@ fn main () -> anyhow::Result <()> { let connection_p2_p3 = rt.block_on (async move { let server_cert = match opt.cert_url.as_ref () { Some (url) => reqwest::get (url).await?.bytes ().await?, - None => tokio::fs::read ("ptth_quic_output/quic_server.crt").await?.into (), + None => tokio::fs::read ("ptth_quic_output/quic_server.crt").await.context ("can't read quic_server.crt from disk")?.into (), }; let endpoint = make_client_endpoint ("0.0.0.0:0".parse ()?, &[&server_cert])?; diff --git a/todo.md b/todo.md index e793417..186130c 100644 --- a/todo.md +++ b/todo.md @@ -1,6 +1,7 @@ Interesting issues will get a unique ID with `dd if=/dev/urandom bs=5 count=1 | base32` +- PTTH_QUIC: Report errors on client GUI (At least whether it's P2 or P4) - Fix long-running downloads restarting in the middle - [DMX6CO4G](issues/2021-01Jan/status-DMX6CO4G.md) fire-and-forget logs / key-value status data - ptth_tail