Commit 68a066dd authored by Kim Meiser's avatar Kim Meiser

fix documentation

parent 24bf9459
using System;
using System.Linq;
using OpenQA.Selenium;
namespace WebDisplay
......@@ -22,10 +21,11 @@ namespace WebDisplay
try
{
driver = DriverFabric.CreateDriverByName(parameters.DriverName);
var display = new Display
{
Flow = CreateFlowByName(parameters.FlowName),
Driver = DriverFabric.CreateDriverByName(parameters.DriverName),
Driver = driver,
Sleeper = new Sleeper(parameters.DefaultTimeout)
};
......@@ -56,7 +56,7 @@ namespace WebDisplay
{
return new DisplayArguments
{
FlowName = GetArgumentValue(args, "f", "WebDisplay.FreifunkFlowSaarCamp"),
FlowName = GetArgumentValue(args, "f", "WebDisplay.FreifunkFlowStandard"),
RepeatCount = Convert.ToInt32(GetArgumentValue(args, "r", "1")),
DriverName = GetArgumentValue(args, "d", "firefox"),
DefaultTimeout = Convert.ToInt32(GetArgumentValue(args, "t", "10000")),
......@@ -86,7 +86,7 @@ namespace WebDisplay
Console.WriteLine("f|flow: the {FLOW} to start.");
Console.WriteLine("h|help: show this message and exit.");
Console.WriteLine("---");
Console.WriteLine("Example: WebDisplay.exe -d=chrome -t10000 -r10 -fWebDisplay.HacksaarFlow");
Console.WriteLine("Example: WebDisplay.exe -d=chrome -t=10000 -r=10 -f=WebDisplay.HacksaarFlow");
}
}
}
......@@ -21,7 +21,7 @@ namespace WebDisplay
assistant.OpenAndWait("https://saar.freifunk.net", 0.5);
// Video: Lisa's Freifunk @ Vimeo
assistant.OpenVimeoVideo("64814620", 70_000);
assistant.OpenVimeoVideo("64814620", 70000);
// Zeige Minimap
assistant.OpenAndWait("https://mgmt.saar.freifunk.net/minimap/map.html", 0.5);
......
......@@ -21,7 +21,7 @@ namespace WebDisplay
assistant.OpenAndWait("https://saar.freifunk.net", 0.5);
// Video: Lisa's Freifunk @ Vimeo
assistant.OpenVimeoVideo("64814620", 70_000);
assistant.OpenVimeoVideo("64814620", 70000);
// Zeige Minimap
assistant.OpenAndWait("https://mgmt.saar.freifunk.net/minimap/map.html", 0.5);
......
......@@ -21,7 +21,7 @@ namespace WebDisplay
assistant.OpenAndWait("https://www.hacksaar.de", 0.5);
// Lightpaint Video
assistant.OpenYouTubeVideo("Rob-5MU_vEY", 55_000);
assistant.OpenYouTubeVideo("Rob-5MU_vEY", 55000);
// Projekte
assistant.OpenAndWait("https://wiki.hacksaar.de/Projekte");
......@@ -36,7 +36,7 @@ namespace WebDisplay
assistant.OpenAndWait("https://www.hacksaar.de/3-retrospiele-abend-am-01-03-2014-ab-15-uhr/");
// Electric Drift Trike
assistant.OpenYouTubeVideo("JDNi4qqN2Fw", 58_000);
assistant.OpenYouTubeVideo("JDNi4qqN2Fw", 58000);
// Buchbesprechung mit Whiskey
assistant.OpenAndWait("https://www.hacksaar.de/buchbesprechung-mit-whisky/");
......@@ -58,7 +58,7 @@ namespace WebDisplay
assistant.Scroll(scrollOffsetX: 0, scrollOffsetY: 200, animationTimeInMilliseconds: 300);
Sleeper.WaitDefaultTime();
assistant.OpenYouTubeVideo("JN9tlLpkGb0", 20_000);
assistant.OpenYouTubeVideo("JN9tlLpkGb0", 20000);
// Let's Hack
assistant.OpenAndWait("https://www.hacksaar.de/freifunk-radiointerview-am-31-01-2015/");
......@@ -70,7 +70,7 @@ namespace WebDisplay
assistant.OpenAndWait("https://www.hacksaar.de/anfahrt");
// Weg zum Hackerspace Video
assistant.OpenYouTubeVideo("cyAJALUpJQ8", 43_000);
assistant.OpenYouTubeVideo("cyAJALUpJQ8", 43000);
// Besuch im level2
assistant.OpenAndWait("https://www.hacksaar.de/level2-launch-party/");
......@@ -85,7 +85,7 @@ namespace WebDisplay
assistant.OpenAndWait("https://www.hacksaar.de/schliesssystem-zustaende/");
// Leap Motion Pong Video
assistant.OpenYouTubeVideo("Togo113Q30M", 20_000);
assistant.OpenYouTubeVideo("Togo113Q30M", 20000);
// Twitter Account @hacksaar
assistant.OpenTwitterAccount("hacksaar");
......@@ -99,7 +99,7 @@ namespace WebDisplay
// Zeige Minimap
assistant.OpenAndWait("https://mgmt.saar.freifunk.net/minimap/map.html", 0.5);
// Zoom Minimap: RV Saarbrücken Übersicht
assistant.MinimapSetViewAndWait(49.24342, 6.99, 13);
assistant.MinimapSetViewAndWait(latitude: 49.24342, longitude: 6.99, zoom: 13);
// Zoom Minimap: Saarbrücken Stadtmitte
assistant.MinimapSetViewAndWait(49.234, 6.997394, 15);
......
......@@ -4,11 +4,11 @@ using System.Threading;
namespace WebDisplay
{
/// <summary>
/// Zugriff auf einheitliche Wartemölgichkeiten.
/// Zugriff auf einheitliche Wartemöglichkeiten.
/// </summary>
public class Sleeper
{
public Sleeper(double defaultMilisecondsTimeout = 10_000)
public Sleeper(double defaultMilisecondsTimeout = 10000)
{
GlobalMilisecondsTimeout = defaultMilisecondsTimeout;
}
......
......@@ -60,8 +60,8 @@
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WebDriver, Version=3.4.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Selenium.WebDriver.3.4.0\lib\net40\WebDriver.dll</HintPath>
<Reference Include="WebDriver, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Selenium.WebDriver.3.6.0\lib\net45\WebDriver.dll</HintPath>
</Reference>
</ItemGroup>
<ItemGroup>
......@@ -81,6 +81,7 @@
<ItemGroup>
<None Include="App.config" />
<None Include="packages.config" />
<None Include="readme.md" />
</ItemGroup>
<ItemGroup>
<Content Include="chromedriver.exe">
......
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Selenium.WebDriver" version="3.6.0" targetFramework="net462" />
</packages>
\ No newline at end of file
......@@ -9,27 +9,27 @@ Options
```
d|driver: the {DRIVER} to use for the flows, e.g. chrome, firefox or edge.
t|timeout: the default {TIMOUT} in miliseconds between flow steps.
r|repeat: the number of {TIMES} to repeat the flow.
f|flow: the {FLOW} to start.
h|help: show this message and exit.
r|repeat: the number of {TIMES} how often the flow should be repeated.
f|flow: the specific {FLOW} to start. Or: which `slideshow` should be displayed?
h|help: this message and exit.
```
```
WebDisplay.exe -d=chrome -t10000 -r10 -fWebDisplay.HacksaarFlow
WebDisplay.exe -d=chrome -t=10000 -r=10 -f=WebDisplay.HacksaarFlow
```
```
WebDisplay.exe -d=firefox -t15000 -r99 -fWebDisplay.FreifunkFlowStandard
WebDisplay.exe -driver=firefox -timeout=15000 -repeat=99 -flow=WebDisplay.FreifunkFlowStandard
```
```
WebDisplay.exe -d=edge -t5000 -r500 -fWebDisplay.FreifunkFlowSaarCamp
WebDisplay.exe -d=edge -t=5000 -r=500 -f=WebDisplay.FreifunkFlowSaarCamp
```
Installation
============
Speichere vor der ersten Ausfhrung
Download
* [MicrosoftWebDriver/Edge](https://go.microsoft.com/fwlink/?linkid=619687)
* [Geckodriver/Firefox](https://developer.mozilla.org/en-US/docs/Mozilla/QA/Marionette/WebDriver)
* [ChromeDriver/Chrome](https://sites.google.com/a/chromium.org/chromedriver/downloads)
im gleichen Verzeichnis.
and save them in the same folder as WebDisplay.exe.
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment