Web server (#7)

* Web Server

* Preparations for 1.3

* Fixes

* Fix Lint

esphomeyaml/components/wifi.py

@@ -1,25 +1,47 @@
 import voluptuous as vol
 
 import esphomeyaml.config_validation as cv
-from esphomeyaml.const import CONF_DNS1, CONF_DNS2, CONF_GATEWAY, CONF_HOSTNAME, CONF_ID, \
-    CONF_MANUAL_IP, CONF_PASSWORD, CONF_SSID, CONF_STATIC_IP, CONF_SUBNET, CONF_WIFI
+from esphomeyaml.const import CONF_AP, CONF_CHANNEL, CONF_DNS1, CONF_DNS2, CONF_GATEWAY, \
+    CONF_HOSTNAME, CONF_ID, CONF_MANUAL_IP, CONF_PASSWORD, CONF_SSID, CONF_STATIC_IP, CONF_SUBNET
 from esphomeyaml.helpers import App, MockObj, Pvariable, StructInitializer, add
 
-CONFIG_SCHEMA = cv.ID_SCHEMA.extend({
-    cv.GenerateID(CONF_WIFI): cv.register_variable_id,
-    vol.Required(CONF_SSID): cv.ssid,
-    vol.Optional(CONF_PASSWORD): cv.string,
-    vol.Optional(CONF_MANUAL_IP): vol.Schema({
-        vol.Required(CONF_STATIC_IP): cv.ipv4,
-        vol.Required(CONF_GATEWAY): cv.ipv4,
-        vol.Required(CONF_SUBNET): cv.ipv4,
-        vol.Inclusive(CONF_DNS1, 'dns'): cv.ipv4,
-        vol.Inclusive(CONF_DNS2, 'dns'): cv.ipv4,
+
+def validate_password(value):
+    value = cv.string(value)
+    if not value:
+        return value
+    if len(value) < 8:
+        raise vol.Invalid(u"WPA password must be at least 8 characters long")
+    if len(value) > 63:
+        raise vol.Invalid(u"WPA password must be at most 63 characters long")
+    return value
+
+
+AP_MANUAL_IP_SCHEMA = vol.Schema({
+    vol.Required(CONF_STATIC_IP): cv.ipv4,
+    vol.Required(CONF_GATEWAY): cv.ipv4,
+    vol.Required(CONF_SUBNET): cv.ipv4,
+})
+
+STA_MANUAL_IP_SCHEMA = AP_MANUAL_IP_SCHEMA.extend({
+    vol.Inclusive(CONF_DNS1, 'dns'): cv.ipv4,
+    vol.Inclusive(CONF_DNS2, 'dns'): cv.ipv4,
+})
+
+CONFIG_SCHEMA = vol.Schema({
+    cv.GenerateID('wifi'): cv.register_variable_id,
+    vol.Optional(CONF_SSID): cv.ssid,
+    vol.Optional(CONF_PASSWORD): validate_password,
+    vol.Optional(CONF_MANUAL_IP): STA_MANUAL_IP_SCHEMA,
+    vol.Optional(CONF_AP): vol.Schema({
+        vol.Required(CONF_SSID): cv.ssid,
+        vol.Optional(CONF_PASSWORD): validate_password,
+        vol.Optional(CONF_CHANNEL): vol.All(cv.positive_int, vol.Range(min=1, max=14)),
+        vol.Optional(CONF_MANUAL_IP): AP_MANUAL_IP_SCHEMA,
     }),
     vol.Optional(CONF_HOSTNAME): cv.hostname,
 })
 
-
 # pylint: disable=invalid-name
 IPAddress = MockObj('IPAddress')
 
@@ -30,19 +52,38 @@ def safe_ip(ip):
     return IPAddress(*ip.args)
 
 
+def manual_ip(config):
+    return StructInitializer(
+        'ManualIP',
+        ('static_ip', safe_ip(config[CONF_STATIC_IP])),
+        ('gateway', safe_ip(config[CONF_GATEWAY])),
+        ('subnet', safe_ip(config[CONF_SUBNET])),
+        ('dns1', safe_ip(config.get(CONF_DNS1))),
+        ('dns2', safe_ip(config.get(CONF_DNS2))),
+    )
+
+
 def to_code(config):
-    rhs = App.init_wifi(config[CONF_SSID], config.get(CONF_PASSWORD))
+    sta = CONF_SSID in config
+    ap = CONF_AP in config
+    if sta:
+        rhs = App.init_wifi(config[CONF_SSID], config.get(CONF_PASSWORD))
+    else:
+        rhs = App.init_wifi()
     wifi = Pvariable('WiFiComponent', config[CONF_ID], rhs)
-    if CONF_MANUAL_IP in config:
-        manual_ip = config[CONF_MANUAL_IP]
-        exp = StructInitializer(
-            'ManualIP',
-            ('static_ip', safe_ip(manual_ip[CONF_STATIC_IP])),
-            ('gateway', safe_ip(manual_ip[CONF_GATEWAY])),
-            ('subnet', safe_ip(manual_ip[CONF_SUBNET])),
-            ('dns1', safe_ip(manual_ip.get(CONF_DNS1))),
-            ('dns2', safe_ip(manual_ip.get(CONF_DNS2))),
-        )
-        add(wifi.set_manual_ip(exp))
+
+    if sta and CONF_MANUAL_IP in config:
+        add(wifi.set_sta_manual_ip(manual_ip(config[CONF_MANUAL_IP])))
+
+    if ap:
+        conf = config[CONF_AP]
+        password = config.get(CONF_PASSWORD)
+        if password is None and CONF_CHANNEL in conf:
+            password = u""
+        add(wifi.set_ap(conf[CONF_SSID], password, conf.get(CONF_CHANNEL)))
+
+        if CONF_MANUAL_IP in conf:
+            add(wifi.set_ap_manual_ip(manual_ip(conf[CONF_MANUAL_IP])))
+
     if CONF_HOSTNAME in config:
         add(wifi.set_hostname(config[CONF_HOSTNAME]))