Merge pull request #48 from dunand/master

Use of {index} in the filename of a screenshot

Author: Hi-Fi

src/main/java/com/github/markusbernhardt/seleniumlibrary/keywords/Screenshot.java

@@ -54,10 +54,12 @@ public String setScreenshotDirectory(String path) {
 
 	@RobotKeyword("Take a screenshot of the current page and embed it into the log.\r\n" + 
 	        "\r\n" + 
-	        "The ``filename`` argument specifies the name of the file to write the screenshot into. If no filename is given, the screenshot is saved into file selenium-screenshot-<counter>.png under the directory where the Robot Framework log file is written into. The filename is also considered relative to the same directory, if it is not given in absolute format.\r\n" + 
+	        "The ``filename`` argument specifies the name of the file to write the screenshot into. If no filename is given, the screenshot is saved into file selenium-screenshot-{index}.png under the directory where the Robot Framework log file is written into. The filename is also considered relative to the same directory, if it is not given in absolute format.\r\n" + 
 	        "\r\n" + 
+		"if ``filename`` contains marker {index}, it will be automatically replaced with unique running index preventing files to be overwritten. Indices start from 1.\r\n" +
+		"\r\n" + 
 	        "A CSS can be used to modify how the screenshot is taken. By default the background color is changed to avoid possible problems with background leaking when the page layout is somehow broken.")
-	@ArgumentNames({ "filename=NONE" })
+	@ArgumentNames({ "filename=selenium-screenshot-{index}.png" })
 	public void capturePageScreenshot(String...params) {
 	    String filename = robot.getParamsValue(params, 0, null);
 		File logdir = screenshotDir != null ? screenshotDir : logging.getLogDir();
@@ -114,6 +116,10 @@ protected String normalizeFilename(String filename) {
 		if (filename == null) {
 			screenshotIndex++;
 			filename = String.format("selenium-screenshot-%d.png", screenshotIndex);
+		} else if(filename.contains("{index}")) {
+			screenshotIndex++;
+			filename = filename.replace("{index}", "%d");
+			filename = String.format(filename, screenshotIndex);
 		} else {
 			filename = filename.replace('/', File.separatorChar);
 		}