Compare commits

...
7 Commits
4 changed files with 26 additions and 10 deletions

No files matched your search

+1 -1
View File
@@ -134,7 +134,7 @@ jobs:
push_to_registry: push_to_registry:
name: Build Docker image name: Build Docker image
if: github.event_name == 'push' if: startsWith(github.ref, 'refs/tags/') == false && github.event_name == 'push'
runs-on: ubuntu-latest runs-on: ubuntu-latest
needs: needs:
- "cross" - "cross"
Generated
+2 -2
View File
@@ -1027,7 +1027,7 @@ dependencies = [
[[package]] [[package]]
name = "neolink" name = "neolink"
version = "0.4.0" version = "0.5.0"
dependencies = [ dependencies = [
"aes", "aes",
"anyhow", "anyhow",
@@ -1065,7 +1065,7 @@ dependencies = [
[[package]] [[package]]
name = "neolink_core" name = "neolink_core"
version = "0.4.0" version = "0.5.0"
dependencies = [ dependencies = [
"aes", "aes",
"assert_matches", "assert_matches",
+17 -5
View File
@@ -59,7 +59,7 @@ Make a config file see below.
### RTSP ### RTSP
To use neolinks you need a config file. To use `neolink` you need a config file.
There's a more complete example [here](https://github.com/QuantumEntangledAndy/neolink/blob/master/sample_config.toml), There's a more complete example [here](https://github.com/QuantumEntangledAndy/neolink/blob/master/sample_config.toml),
but the following should work as a minimal example. but the following should work as a minimal example.
@@ -80,8 +80,10 @@ password = "password"
uid = "BCDEF0123456789A" uid = "BCDEF0123456789A"
``` ```
Create a text file with those contents named `neolink.toml` in the same folder as neolink and then run the following command Create a text file with called `neolink.toml` in the same folder as the neolink binary. With your config options.
in your terminal in the same folder as neolink and the config file.
When ready start `neolink` with the following command
using the terminal in the same folder the neolink binary is in.
```bash ```bash
./neolink rtsp --config=neolink.toml ./neolink rtsp --config=neolink.toml
@@ -132,7 +134,7 @@ Query Messages:
### Pause ### Pause
To use the pause featrue you will need to adjust your config file as such: To use the pause feature you will need to adjust your config file as such:
```toml ```toml
bind = "0.0.0.0" bind = "0.0.0.0"
@@ -144,7 +146,7 @@ password = "password"
uid = "ABCDEF0123456789" uid = "ABCDEF0123456789"
[cameras.pause] [cameras.pause]
on_motion = true # Should pause when no motion on_motion = true # Should pause when no motion
on_client = false # Should pause when no rtsp client on_client = true # Should pause when no rtsp client
mode = "none" # What to do when paused values are: none, black, still, test mode = "none" # What to do when paused values are: none, black, still, test
timeout = 2.1 # How long to wait after motion stops before pausing timeout = 2.1 # How long to wait after motion stops before pausing
``` ```
@@ -155,6 +157,16 @@ Then start the rtsp server as usual:
./neolink rtsp --config=neolink.toml ./neolink rtsp --config=neolink.toml
``` ```
### Docker
[Docker](https://hub.docker.com/r/quantumentangledandy/neolink) builds are also provided
in multiple architectures. The latest tag tracks master while each branch gets it's own tag.
```bash
docker pull quantumentangledandy/neolink
```
## License ## License
Neolink is free software, released under the GNU Affero General Public License Neolink is free software, released under the GNU Affero General Public License
+6 -2
View File
@@ -35,7 +35,7 @@ impl Shared {
} }
pub(super) fn get_paths(&self, stream: &Stream) -> Vec<String> { pub(super) fn get_paths(&self, stream: &Stream) -> Vec<String> {
match stream { let mut streams = match stream {
Stream::Main => vec![ Stream::Main => vec![
format!("/{}", &self.name), format!("/{}", &self.name),
format!("/{}/mainStream", &self.name), format!("/{}/mainStream", &self.name),
@@ -44,7 +44,11 @@ impl Shared {
Stream::Extern => { Stream::Extern => {
vec![format!("/{}/externStream", &self.name)] vec![format!("/{}/externStream", &self.name)]
} }
} };
// Later VLC clients seem to only support lower case streams
let mut lowercase_streams: Vec<String> = streams.iter().map(|i| i.to_lowercase()).collect();
streams.append(&mut lowercase_streams);
streams
} }
} }