From f1d7f8f8199b280cd32dff2dcc0e062f7f1179c6 Mon Sep 17 00:00:00 2001
From: Andreas Demmelbauer <git@notice.at>
Date: Sun, 22 Nov 2020 18:36:55 +0100
Subject: [PATCH] add userinteraction check for timeout

---
 discobert.py                         |   6 +++++-
 oe1journal.py                        |   7 +++++++
 remotes/.Sony-RM-V33E.lircd.conf.swp | Bin 0 -> 12288 bytes
 requirements.txt                     |   1 +
 4 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 oe1journal.py
 create mode 100644 remotes/.Sony-RM-V33E.lircd.conf.swp

diff --git a/discobert.py b/discobert.py
index 605b3ee..3d539d8 100644
--- a/discobert.py
+++ b/discobert.py
@@ -335,6 +335,7 @@ def closeService(sleepsecs=0):
         sleep(0.1)
     stopMusic()
     inUseBefore = False # Pfusch pfusch!
+    hadUserInteraction = False # reset variable
     setMode('off')
     sleep(sleepsecs)
 
@@ -419,6 +420,7 @@ timeout = 5 * 60 - 5    # timeout since last user interaction
 defaultvolume = 90      # Volume when user enters the toilet
 volume = 90             # Global for actual volume
 uservolume = 90         # Global for user volume (ignores mute state)
+hadUserInteraction = False #
 
 setSun('off')
 
@@ -447,7 +449,8 @@ while True:
         lastUsed = time.time()
         inUse = True
     else:
-        if(time.time() > lastUsed + timeout):
+        # Auto timeout
+        if(time.time() > lastUsed + timeout and not hadUserInteraction):
             inUse = False
 
 
@@ -457,6 +460,7 @@ while True:
 
     if remotesignal:
         lastUsed = time.time() # user is active!
+        hadUserInteraction = True
         inUse = True
         for code in remotesignal:
             print('received code:', code)
diff --git a/oe1journal.py b/oe1journal.py
new file mode 100644
index 0000000..7df4b1c
--- /dev/null
+++ b/oe1journal.py
@@ -0,0 +1,7 @@
+import requests
+from xml.etree import ElementTree as ET
+
+podcast = 'https://files.orf.at/podcast/oe1/oe1_journale.xml'
+podcast_string = requests.get(podcast).text
+tree = ET.fromstring(podcast_string)
+print(tree.find('.//enclosure').get('url'))
diff --git a/remotes/.Sony-RM-V33E.lircd.conf.swp b/remotes/.Sony-RM-V33E.lircd.conf.swp
new file mode 100644
index 0000000000000000000000000000000000000000..1c81835a0dbe9fa049a4ea2fd36c3d3fab0523f6
GIT binary patch
literal 12288
zcmeI2Piz}S6vn3&|7lAB2_(efK{zC;vtBz+8(WChSvyUYKep_R(@IsN_3qeSvfeej
z>(qf3E=VBYSh#XQz=31Aaf1T~BrY5{a6(+T!>t0oS+Bd!y0mA|tn{;YXTEvw%{OBw
zQKqf7E^X0@l4rP1Gxpt|Uti6A@#V4OS083Rw+4>k@=)~M=epkW+T4GTim|uv2F!Nt
zaB<*!uX8gDvX&i~QG~3|`(DU{Y}0cO7aLoPt)-=^;@G}vDW>Ok?o)&8k`71*9^}AD
zwv^AQLN)jDOZ4nBI}aKl`=tZY0qKBrKsq2DkPb)(qyy4{|B(aX;23)c^En>R>0<nT
zEcG5g$~WnNbU->F9gq%42c!ei0qKBrKsq2DkPb)({(}w}7GtL#VQlSD6p#P^PyYV@
z`zf3S03U+OU=>^dPlKONG4?sQ3El!5;57LCBx65<Ti_;G2QPrXPB8W@_yl|m-Usgi
zA6x_H!5Q#8cn;iolCfXG_uw}86np?eum`SzP4Ei1^8{l*fv>>3;3_D96X3VU8T$s@
z0uHEv7r`HoG4=!a4BP-Z$bg5yFYw_u_y|})2TiaJE&}0G7063EARUknNC%_?!U67D
zG(Nq?7)6(8F+Gb1@v~^$s9xFI+R>|#VERQJ<yTnJAat$T=FV2NQrq25+DRR0_tx#y
zr&I)8VMeDlj!2>h=n5=pj`C`ae9{u%siSl0cv@vfCGwWj@tS(AKBHAfxe80hi@e*_
z%X-oh->IXOw65N$wl39nnn$$iNS)DbmaiPqhzHC!t!q@ZS|dFdb+o3jWVEQSUfyX|
zlcw>VIx41hV!mk^^5)XIwQ^Hmt2K7Z)5)<9W^`$d2#$HAb*p7<;~sgdX<ehbdue-i
zzFJzhJQFO+n^#%VA$%z$kI5bOX<E0G^d@(hM_M<#`5?zWNb7P*l;jTkAg$BO^_gWu
zytTAWtXqA(wp~l2iM++x{akM7X(85kqHFW6?Z%&cM%3~78$<4zha&9KiW=1ydfl$W
z_u6*2*EfQFq!HD0je!u2uflTvY>^QSydd1OjL;Z2BhhrD2oVs8+;4K<8*9Yt*?bYN
z%h9LSb9vH{%P*;SdwSfkxF2`s3kBh+7{iDRK0x5fm5a(g(uCQFqC1Y!4X9Z!Yt_B#
zwsu3SZ8!D3&Fc0=eI4E7`X*tB#J7lR^ik0C8DGZ6u1&r{=cvLDY?IFi3vkj6ea~^Y
zMeRchdv*|i(Uzz@v}}*fMbYQ=R)$(yBQtKzP^DGLP}2yx<Jck3kY=<UyshhXEklZ;
zEKmtU^}_)tuR~UpZz@?F*1)%T+!utt?RIH?7;v)sJm`|=lM@Vs_JWAChNt$>wM3yi
z&DD5RP$CHE06z`TZ(A9{v1e;&hPaPYh<?j+u_4Y=iCi(EipM9joMi7A0U37_n8qL+
z`lw@EHdm;tWXQnKMs$RF(qX$DkA}V@3Ow4=$B!n5T)z}81jUD~AzSsuoMFj$G2%!W
zIM0RqaNy7zQqOZN!am2nPd$v7$`GyZJnBUdactY}Qpa}q!Z_9BTsNCTvJLLLDC2<p
zf$h2QHX6I=Lt9XC1*N#McyR6vgqqjyi@F>en;9!$m1uED%D<izpMyx$Dh`h?s!CBQ
znDZ9z7(*vqAY{^qoXP{Aa%U;GTw2PN)N_<qb48@m#TJ{Yo30D%hoRRuLfbSP=a9PG
z<vz9+mJkD86-h3%4Ig{0KMWL$zlK&(ZQt1EWQSxN7`7w!AB7%yaMBONW)83`M3GR0
zV%d9PI0#DFYyeYD-tqh{S8)73JIF@U7%xbWy>9Q@S*^#-ea8;MEC$vcZeUl2B3-mj
gHa=lU)v;YW=#4)#VhIQ{!EYp{Z?~~aZI`is0FTgf_y7O^

literal 0
HcmV?d00001

diff --git a/requirements.txt b/requirements.txt
index 793f8bd..d907ff6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -34,3 +34,4 @@ virtualenv==15.1.0
 Werkzeug==0.14.1
 wiringpi==2.46.0
 youtube-dl==2019.3.18
+twisted