Compare commits
No commits in common. "master" and "3.1.0" have entirely different histories.
@ -1,3 +1,3 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
VERSION=3.2.0
|
VERSION=3.1.0
|
||||||
dpkg-deb --root-owner-group -b debian "foodoord_${VERSION}_all.deb"
|
dpkg-deb --root-owner-group -b debian "foodoord_${VERSION}_all.deb"
|
||||||
|
2
debian/DEBIAN/control
vendored
2
debian/DEBIAN/control
vendored
@ -1,5 +1,5 @@
|
|||||||
Package: foodoord
|
Package: foodoord
|
||||||
Version: 3.2.0
|
Version: 3.0.4
|
||||||
Maintainer: Bandie <bandie@chaospott.de>
|
Maintainer: Bandie <bandie@chaospott.de>
|
||||||
Architecture: all
|
Architecture: all
|
||||||
Description: Control the doors of the club, ja!
|
Description: Control the doors of the club, ja!
|
||||||
|
5
debian/etc/foodoord.conf_example
vendored
5
debian/etc/foodoord.conf_example
vendored
@ -2,8 +2,3 @@
|
|||||||
status_url =
|
status_url =
|
||||||
key =
|
key =
|
||||||
secret =
|
secret =
|
||||||
|
|
||||||
[doorstatusv2]
|
|
||||||
status_url =
|
|
||||||
key =
|
|
||||||
secret =
|
|
||||||
|
37
debian/usr/sbin/foodoord_oben
vendored
37
debian/usr/sbin/foodoord_oben
vendored
@ -10,7 +10,6 @@ import subprocess
|
|||||||
import sys
|
import sys
|
||||||
import time
|
import time
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
from dataclasses import dataclass
|
|
||||||
|
|
||||||
import pifacedigitalio
|
import pifacedigitalio
|
||||||
|
|
||||||
@ -33,46 +32,18 @@ ORANGE = 3
|
|||||||
parser = ConfigParser()
|
parser = ConfigParser()
|
||||||
parser.read('/etc/foodoord.conf')
|
parser.read('/etc/foodoord.conf')
|
||||||
|
|
||||||
|
DOORAPI = parser.get('doorstatus', 'status_url')
|
||||||
@dataclass
|
CONSUMERKEY = parser.get('doorstatus', 'key')
|
||||||
class API:
|
CONSUMERSECRET = parser.get('doorstatus', 'secret')
|
||||||
api_url: str
|
|
||||||
consumer_key: str
|
|
||||||
consumer_secret: str
|
|
||||||
|
|
||||||
|
|
||||||
APIv1 = API(
|
|
||||||
parser.get('doorstatus', 'status_url'),
|
|
||||||
parser.get('doorstatus', 'key'),
|
|
||||||
parser.get('doorstatus', 'secret'),
|
|
||||||
)
|
|
||||||
APIv2 = API(
|
|
||||||
parser.get('doorstatusv2', 'status_url'),
|
|
||||||
parser.get('doorstatusv2', 'key'),
|
|
||||||
parser.get('doorstatusv2', 'secret'),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def update_api(locked):
|
def update_api(locked):
|
||||||
try:
|
try:
|
||||||
# API v1
|
|
||||||
subprocess.check_call([
|
subprocess.check_call([
|
||||||
"/usr/bin/curl", "-XPOST",
|
"/usr/bin/curl", "-XPOST",
|
||||||
"--header", "Content-Type: application/json",
|
"--header", "Content-Type: application/json",
|
||||||
"--data",
|
"--data",
|
||||||
json.dumps({"consumer_key": APIv1.consumer_key, "consumer_secret": APIv1.consumer_secret, "aerie": locked}),
|
json.dumps({"consumer_key": CONSUMERKEY, "consumer_secret": CONSUMERSECRET, "aerie": locked})
|
||||||
APIv1.api_url
|
|
||||||
])
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
# API v2
|
|
||||||
subprocess.check_call([
|
|
||||||
"/usr/bin/curl", "-XPOST",
|
|
||||||
"--header", "Content-Type: application/json",
|
|
||||||
"--data",
|
|
||||||
json.dumps({"consumer_key": APIv2.consumer_key, "consumer_secret": APIv2.consumer_secret, "aerie": locked}),
|
|
||||||
APIv2.api_url
|
|
||||||
])
|
])
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
38
debian/usr/sbin/foodoord_unten
vendored
38
debian/usr/sbin/foodoord_unten
vendored
@ -8,7 +8,6 @@ import stat
|
|||||||
import subprocess
|
import subprocess
|
||||||
import time
|
import time
|
||||||
from configparser import ConfigParser
|
from configparser import ConfigParser
|
||||||
from dataclasses import dataclass
|
|
||||||
|
|
||||||
import RPi.GPIO as gpio
|
import RPi.GPIO as gpio
|
||||||
|
|
||||||
@ -32,24 +31,9 @@ ORANGE = 3
|
|||||||
parser = ConfigParser()
|
parser = ConfigParser()
|
||||||
parser.read('/etc/foodoord.conf')
|
parser.read('/etc/foodoord.conf')
|
||||||
|
|
||||||
|
DOORAPI = parser.get('doorstatus', 'status_url')
|
||||||
@dataclass
|
CONSUMERKEY = parser.get('doorstatus', 'key')
|
||||||
class API:
|
CONSUMERSECRET = parser.get('doorstatus', 'secret')
|
||||||
api_url: str
|
|
||||||
consumer_key: str
|
|
||||||
consumer_secret: str
|
|
||||||
|
|
||||||
|
|
||||||
APIv1 = API(
|
|
||||||
parser.get('doorstatus', 'status_url'),
|
|
||||||
parser.get('doorstatus', 'key'),
|
|
||||||
parser.get('doorstatus', 'secret'),
|
|
||||||
)
|
|
||||||
APIv2 = API(
|
|
||||||
parser.get('doorstatusv2', 'status_url'),
|
|
||||||
parser.get('doorstatusv2', 'key'),
|
|
||||||
parser.get('doorstatusv2', 'secret'),
|
|
||||||
)
|
|
||||||
|
|
||||||
|
|
||||||
def write_state(state):
|
def write_state(state):
|
||||||
@ -62,24 +46,12 @@ def write_state(state):
|
|||||||
|
|
||||||
def update_api(locked):
|
def update_api(locked):
|
||||||
try:
|
try:
|
||||||
# API v1
|
|
||||||
subprocess.check_call([
|
subprocess.check_call([
|
||||||
"/usr/bin/curl", "-XPOST",
|
"/usr/bin/curl", "-XPOST",
|
||||||
"--header", "Content-Type: application/json",
|
"--header", "Content-Type: application/json",
|
||||||
"--data",
|
"--data",
|
||||||
json.dumps({"consumer_key": APIv1.consumer_key, "consumer_secret": APIv1.consumer_secret, "cellar": locked}),
|
json.dumps({"consumer_key": CONSUMERKEY, "consumer_secret": CONSUMERSECRET, "cellar": locked}),
|
||||||
APIv1.api_url
|
DOORAPI
|
||||||
])
|
|
||||||
except:
|
|
||||||
pass
|
|
||||||
try:
|
|
||||||
# API v2
|
|
||||||
subprocess.check_call([
|
|
||||||
"/usr/bin/curl", "-XPOST",
|
|
||||||
"--header", "Content-Type: application/json",
|
|
||||||
"--data",
|
|
||||||
json.dumps({"consumer_key": APIv2.consumer_key, "consumer_secret": APIv2.consumer_secret, "cellar": locked}),
|
|
||||||
APIv2.api_url
|
|
||||||
])
|
])
|
||||||
except:
|
except:
|
||||||
pass
|
pass
|
||||||
|
Loading…
Reference in New Issue
Block a user