Merge pull request #4937 from ant-media/onvifCameraUrlEditFix

Refactor updateStreamSource method

Author: mekya

src/main/java/io/antmedia/ipcamera/OnvifCamera.java

@@ -36,9 +36,9 @@ public int connect(String address, String username, String password) {
 		int result = CONNECT_ERROR;
 		String camIP = "";
 		try {
-			
+
 			camIP = getURL(address);
-			
+
 			nvt = new OnvifDevice(camIP, username, password);
 			nvt.getSoap().setLogging(false);
 			nvt.getDevices().getCapabilities().getDevice();
@@ -47,7 +47,7 @@ public int connect(String address, String username, String password) {
 			profiles = nvt.getDevices().getProfiles();
 
 
-			if (profiles != null) 
+			if (profiles != null)
 			{
 				for (Profile profile : profiles) {
 					if (profile.getPTZConfiguration() != null) {
@@ -58,7 +58,7 @@ public int connect(String address, String username, String password) {
 				if (profileToken == null) {
 					profileToken = profiles.get(0).getToken();
 				}
-				
+
 				result = CONNECTION_SUCCESS;
 			}
 			else {
@@ -71,20 +71,20 @@ public int connect(String address, String username, String password) {
 
 			//connection error. Let the user check ip address
 			result = CONNECT_ERROR;
-		} 
+		}
 		return result;
 	}
-	
+
 	@Override
 	public String[] getProfiles() {
 		String profilesStr[] = null;
 		try {
 			List<Profile> profilesLocal = nvt.getDevices().getProfiles();
 
-			if (profilesLocal != null) 
+			if (profilesLocal != null)
 			{
 				int i = 0;
-				profilesStr = new String[profilesLocal.size()]; 
+				profilesStr = new String[profilesLocal.size()];
 				for (Profile profile : profilesLocal) {
 					if (profile.getPTZConfiguration() != null) {
 						profilesStr[i++] = nvt.getMedia().getRTSPStreamUri(profile.getToken());
@@ -93,7 +93,7 @@ public String[] getProfiles() {
 			}
 		} catch (ConnectException | SOAPException e) {
 			// nothing to do
-		} 
+		}
 		return profilesStr;
 	}
 
@@ -125,19 +125,19 @@ public String getTCPStreamURI() {
 
 		} catch (ConnectException | SOAPException e) {
 			logger.error(ExceptionUtils.getStackTrace(e));
-		} 
+		}
 		return rtspURL;
 	}
-	
-	
+
+
 	public boolean moveContinous(float x, float y, float zoom) {
 		return ptzDevices.continuousMove(profileToken, x, y, zoom);
 	}
-	
+
 	public boolean moveRelative(float x, float y, float zoom) {
 		return ptzDevices.relativeMove(profileToken, x, y, zoom);
 	}
-	
+
 	public boolean moveAbsolute(float x, float y, float zoom) {
 		boolean result = false;
 		try {
@@ -256,7 +256,7 @@ public boolean isFocusModeAuto() {
 	public boolean setDateTime(java.sql.Date date, java.sql.Time time) {
 		return false;
 	}
-	
+
 	public String getURL (String url) {
 
 		String[] ipAddrParts = null;
@@ -284,4 +284,4 @@ public String getURL (String url) {
 		return ipAddr;
 	}
 
-}
+}

src/main/java/io/antmedia/rest/RestServiceBase.java

@@ -438,50 +438,45 @@ private static void removeEmptyPlayListItems(Broadcast broadcast)
 	 * @return
 	 */
 	protected Result updateStreamSource(String streamId, Broadcast broadcast) {
+		logger.debug("Updating camera info for stream {}", broadcast.getStreamId());
 
-		boolean result = false;
-
-		boolean resultStopStreaming = false;
-
-		logger.debug("update cam info for stream {}", broadcast.getStreamId());
-
-		if(checkStreamUrl(broadcast.getStreamUrl()))
-		{
-			Broadcast broadcastInDB = getDataStore().get(streamId);
-			if (broadcastInDB != null)
-			{
-				resultStopStreaming = checkStopStreaming(broadcastInDB);
-
-				waitStopStreaming(broadcastInDB, resultStopStreaming);
-
-				if (AntMediaApplicationAdapter.IP_CAMERA.equals(broadcast.getType())) {
-					String rtspURL = connectToCamera(broadcast).getMessage();
-
-					if (rtspURL != null) {
+		if (!checkStreamUrl(broadcast.getStreamUrl())) {
+			return new Result(false, "Stream URL is not valid");
+		}
 
-						String authparam = broadcast.getUsername() + ":" + broadcast.getPassword() + "@";
-						String rtspURLWithAuth = RTSP + authparam + rtspURL.substring(RTSP.length());
-						logger.info("new RTSP URL: {}" , rtspURLWithAuth);
-						broadcast.setStreamUrl(rtspURLWithAuth);
-					}
-				}
+		Broadcast broadcastInDB = getDataStore().get(streamId);
+		if (broadcastInDB == null) {
+			streamId = streamId.replaceAll("[\n|\r|\t]", "_");
+			logger.info("Broadcast with stream id: {} is null", streamId);
+			return new Result(false, "Broadcast with streamId: " + streamId + " does not exist");
+		}
 
-				result = getDataStore().updateBroadcastFields(streamId, broadcast);
+		boolean resultStopStreaming = checkStopStreaming(broadcastInDB);
+		waitStopStreaming(broadcastInDB, resultStopStreaming);
 
-				if(result) {
-					Broadcast fetchedBroadcast = getDataStore().get(streamId);
-					getApplication().startStreaming(fetchedBroadcast);
-				}
-			}
-			else {
-				streamId = streamId.replaceAll("[\n|\r|\t]", "_");
-				logger.info("Broadcast with stream id: {} is null", streamId);
+		if (AntMediaApplicationAdapter.IP_CAMERA.equals(broadcast.getType())) {
+			Result connectionRes = connectToCamera(broadcast);
+			if (!connectionRes.isSuccess()) {
+				return connectionRes;
 			}
 
+			String rtspURL = connectionRes.getMessage();
+			String authparam = broadcast.getUsername() + ":" + broadcast.getPassword() + "@";
+			String rtspURLWithAuth = RTSP + authparam + rtspURL.substring(RTSP.length());
+			logger.info("New Stream Source URL: {}", rtspURLWithAuth);
+			broadcast.setStreamUrl(rtspURLWithAuth);
 		}
+
+		boolean result = getDataStore().updateBroadcastFields(streamId, broadcast);
+		if (result) {
+			Broadcast fetchedBroadcast = getDataStore().get(streamId);
+			getApplication().startStreaming(fetchedBroadcast);
+		}
+
 		return new Result(result);
 	}
 
+
 	public boolean checkStopStreaming(Broadcast broadcast)
 	{
 		// If broadcast status is broadcasting, this will force stop the streaming.