Skip unsupported cameras (gwell based)
This commit is contained in:
@@ -93,12 +93,10 @@ func apiDeviceList(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
var items []*api.Source
|
var items []*api.Source
|
||||||
for _, cam := range cameras {
|
for _, cam := range cameras {
|
||||||
streamURL := buildStreamURL(cam)
|
|
||||||
|
|
||||||
items = append(items, &api.Source{
|
items = append(items, &api.Source{
|
||||||
Name: cam.Nickname,
|
Name: cam.Nickname,
|
||||||
Info: fmt.Sprintf("%s | %s | %s", cam.ProductModel, cam.MAC, cam.IP),
|
Info: fmt.Sprintf("%s | %s | %s", cam.ProductModel, cam.MAC, cam.IP),
|
||||||
URL: streamURL,
|
URL: buildStreamURL(cam),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -171,12 +169,10 @@ func apiAuth(w http.ResponseWriter, r *http.Request) {
|
|||||||
|
|
||||||
var items []*api.Source
|
var items []*api.Source
|
||||||
for _, cam := range cameras {
|
for _, cam := range cameras {
|
||||||
streamURL := buildStreamURL(cam)
|
|
||||||
|
|
||||||
items = append(items, &api.Source{
|
items = append(items, &api.Source{
|
||||||
Name: cam.Nickname,
|
Name: cam.Nickname,
|
||||||
Info: fmt.Sprintf("%s | %s | %s", cam.ProductModel, cam.MAC, cam.IP),
|
Info: fmt.Sprintf("%s | %s | %s", cam.ProductModel, cam.MAC, cam.IP),
|
||||||
URL: streamURL,
|
URL: buildStreamURL(cam),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -196,6 +196,9 @@ func (c *Cloud) GetCameraList() ([]*Camera, error) {
|
|||||||
if dev.ProductType != "Camera" {
|
if dev.ProductType != "Camera" {
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
if dev.DeviceParams.IP == "" {
|
||||||
|
continue // skip cameras without IP (gwell protocol)
|
||||||
|
}
|
||||||
|
|
||||||
c.cameras = append(c.cameras, &Camera{
|
c.cameras = append(c.cameras, &Camera{
|
||||||
MAC: dev.MAC,
|
MAC: dev.MAC,
|
||||||
|
|||||||
Reference in New Issue
Block a user