From a88f8225a7f86a0aca03dccc826b0fbe2ab4c754 Mon Sep 17 00:00:00 2001
From: Bryan Schumaker <bjschuma@gmail.com>
Date: Fri, 19 Nov 2010 22:47:41 -0500
Subject: [PATCH] Web remote controls

I can play, pause, stop, and advance to the next song through the web
interface.
---
 html/album.py                |  10 ++---
 html/controls.html           |  71 +++++++++++++++++++++++++++++++++++
 html/controls.py             |  23 ++++++++++++
 html/index.html              |   1 +
 html/stock_media-next.png    | Bin 0 -> 2030 bytes
 html/stock_media-pause.png   | Bin 0 -> 875 bytes
 html/stock_media-play.png    | Bin 0 -> 1684 bytes
 html/stock_media-stop.png    | Bin 0 -> 837 bytes
 libsaria/sources/playlist.py |   2 +-
 plugins/web_server.py        |   4 +-
 10 files changed, 102 insertions(+), 9 deletions(-)
 create mode 100644 html/controls.html
 create mode 100644 html/controls.py
 create mode 100644 html/stock_media-next.png
 create mode 100644 html/stock_media-pause.png
 create mode 100644 html/stock_media-play.png
 create mode 100644 html/stock_media-stop.png
diff --git a/html/album.py b/html/album.py
index 079c6dbc..504000fa 100644
--- a/html/album.py
+++ b/html/album.py
@@ -30,7 +30,10 @@ def body(wfile, args):
 	img_ar = artist.replace("/", "%2F")
 	img_al = album.replace("/", "%2F")
 	wfile.write("<tr><td><table align=center width=100%><tr>")
-	wfile.write("<td align=center><img src=\"artwork/%s/%s.jpg\" height=192/></td>" % (img_ar, img_al))
+	wfile.write("<td align=center><table align=center width=100%>")
+	wfile.write("<tr><td align=center>")
+	wfile.write("<img src=\"artwork/%s/%s.jpg\" height=192/></td></tr>" % (img_ar, img_al))
+	wfile.write("<tr><td align=center id=\"audio\"></td></tr></table>")
 	wfile.write("<td align><table align=left>\n")
 
 	titles = []
@@ -46,11 +49,6 @@ def body(wfile, args):
 	wfile.write("</table></td>")
 	wfile.write("</tr></table></td></tr>")
 
-	wfile.write("<tr><td id=\"audio\">")
-	#wfile.write("<audio src=\"140401.ogg\" autoplay controls/>")
-	#wfile.write("Text when no audio")
-	wfile.write("</td></tr>")
-
 	wfile.write("</table>")
 
 
diff --git a/html/controls.html b/html/controls.html
new file mode 100644
index 00000000..e1cc9e45
--- /dev/null
+++ b/html/controls.html
@@ -0,0 +1,71 @@
+<html>
+<head>
+<script type="text/javascript">
+function do_request(action)
+{
+	var http = new XMLHttpRequest();
+	http.open('GET', "controls.py?a="+action, true);
+	http.send();
+	return http;
+}
+
+/*function get_response(http)
+{
+	while (http.readyState != 4)
+	{}
+
+	var resp = http.responseText;
+	return resp;
+}*/
+
+function control(action)
+{
+	var http = do_request(action);
+	/*var resp = get_response(http);*/
+}
+
+function play()
+{
+	control("play");
+	var button = document.getElementById("play_pause");
+	button.innerHTML = "<img src=\"stock_media-pause.png\" onclick=\"pause();\">";
+}
+
+function pause()
+{
+	control("pause");
+	var button = document.getElementById("play_pause");
+	button.innerHTML = "<img src=\"stock_media-play.png\" onclick=\"play();\">";
+}
+
+function stop()
+{
+	control("stop");
+	var button = document.getElementById("play_pause");
+	button.innerHTML = "<img src=\"stock_media-play.png\" onclick=\"play();\">";
+}
+
+function next()
+{
+	control("next");
+}
+
+</script>
+</head>
+
+<body>
+	<table>
+		<tr>
+			<td id="play_pause">
+				<img src="stock_media-play.png" onclick="play();"/>
+			</td><td>
+				<img src="stock_media-stop.png" onclick="stop();"/>
+			</td><td>
+				<img src="stock_media-next.png" onclick="next();"/>
+			</td>
+		</tr>
+	</table>
+
+</body>
+
+</html>
diff --git a/html/controls.py b/html/controls.py
new file mode 100644
index 00000000..dce4090d
--- /dev/null
+++ b/html/controls.py
@@ -0,0 +1,23 @@
+# Bryan Schumaker (11/18/2010)
+
+import libsaria.audio
+import libsaria.sources
+
+play  = libsaria.audio.play
+pause = libsaria.audio.pause
+stop  = libsaria.audio.stop
+next  = libsaria.sources.plist_next
+
+
+def to_html(wfile, args):
+	action = args["a"]
+	ret = False
+	if action == "play":
+		ret = play()
+	elif action == "pause":
+		ret = pause()
+	elif action == "stop":
+		ret = stop()
+	elif action == "next":
+		ret = next()
+	wfile.write(str(ret))
diff --git a/html/index.html b/html/index.html
index 5d8aa59e..b2313659 100644
--- a/html/index.html
+++ b/html/index.html
@@ -12,6 +12,7 @@ function message()
 <body>
 <!--<a id="bryan" onclick="message();">Text</a>-->
 <a href="library.py">Library Browser</a>
+<a href="controls.html">Remote Controls</a>
 </body>
 
 </html>
diff --git a/html/stock_media-next.png b/html/stock_media-next.png
new file mode 100644
index 0000000000000000000000000000000000000000..10081fdcec58825e7a0eba2e7967c8456d8025df
GIT binary patch
literal 2030
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
M07*qoM6N<$g1x!vE&u=k

literal 0
HcmV?d00001

diff --git a/html/stock_media-pause.png b/html/stock_media-pause.png
new file mode 100644
index 0000000000000000000000000000000000000000..36fe26b3aa6740f43e8e619b41b96a9b91bf63e7
GIT binary patch
literal 875
zcmV-x1C;!UP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x10YF6K~!jg?U>tc+eQ$Ezgc=$l+BZE$`?(F_M*>G6n%!G=&Kb)ZUYp(
zDT=&D-l0K|I_?2R(LhSfonDY!S*8SW1@Ml)AZS6&r=5Q|BnN_7vu4ejHEY(alO-oI
z?g*>E$L{k~W|Yoif;&B1tyXoKrU%*edfnXJ-Tejp-W__rTCJ{+Fb^H`CMKC^18JJt
zZ@&Hdby=1l55?Ty-@D&_ef8C5vjJeSSh!ebtfCE6Riyww{rJK)%>$~6$hI?*<c#ls
z_>QWo^!E04z&t#B3b8%6kD1KCa=8pW`u5$Mo#X+YfA$3cX_|(($Ln{uZwJ5m`Lizv
zabsm-f%Efo1yJ3;SAYES@-hVU>lkLNPB!4xA4taU#GT5FRkVSNi;K3Je*a#+JHF3A
z3^P{I2C^*c+QAR{zdhdOV2laL^y{|L<Cw9EzKF9d(?&m`3L*yK@smeGJM=~$uT{Yq
z1FA=vv5GzebzS${VvIqI!5D)PgNO;$yt=vyOutsNjT^yCW&pNTH1a4BBN$_Xu{_U1
zHS;{zo(ai!vEDa(nX!s)p`s}C{@;I4z$69~R6x2as)BQlvMfU~Wm)Q<f4@h8_4)&i
zZ)lpPZ6(#c%wz_fb84*xKrkpC-!wG7!TW|nO02b5YeO>D+Q2BZXDks^wY#<IfSJrd
zRaN@Odxrq)&4;dn+9jjC$uK_jjB_n>mLxljsDKWc$qXzO3w6!`?F`c<;_+S)^&y$3
zI?Tw<_mdmAzP?uHEFdH%=_)UXDBkzU*uf|f%S>iqxm>nqKp;tyP(|-OnD$oboEr>t
zvCL!!Zf<V6ein>L0FU<|MiIa5=en*#GId=?Gh-F~94Lw+^s9(;Z;<Y#w8>;y7MLu{
zqM6AI&~2t{?<70YwjKJR5846nDWgZ2$qZy!rq)^1xA*V1gSYbPvCa+*JY`@zL+xY6
zD*778^IV;CG~TmtX{ahnHyU`HbAwSLmYK{zS(fUY<L6&q9*l9$Q4~c;rYMSNW~`$B
z7gE)8ARQ695t08o<^ov6FtcXOnl)?ItXZ>;>wgEG+OoSzd`tiU002ovPDHLkV1jAI
BsRjT5

literal 0
HcmV?d00001

diff --git a/html/stock_media-play.png b/html/stock_media-play.png
new file mode 100644
index 0000000000000000000000000000000000000000..90e05922963066ed963beed9edfefc369779789e
GIT binary patch
literal 1684
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

literal 0
HcmV?d00001

diff --git a/html/stock_media-stop.png b/html/stock_media-stop.png
new file mode 100644
index 0000000000000000000000000000000000000000..fe0e77668e06c4902b31694612526a9d1a18fe04
GIT binary patch
literal 837
zcmV-L1G@Z)P)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm00006VoOIv0RI60
z0RN!9r;`8x0{TfrK~!jg?O083(?Ae?<BxILI(95laX<)8{0xNn4G8hq5aNoExFE#;
z;4g4N2t`$i;Lx<*eH?bzNt%?_OX~yjlchM5o!R$xX4V@6BSwrEF=E7s5z&x;@GEYU
zh{p;5`#5Bg6FoXUKAue`lUV;9oSmJui^bw6fUkZ0q6id4kw1I>^h;gW=P~~Kuv{+n
z)5p(GR;yJnzbFA!RS^K*ynd@~dvWb}k-t}Jnr3+U>IJH*;$pGr#U)C>WHRaM^!tx*
zF(J0_@WJDqxHm--GvRDDBLI-S=i7@AC&cZ8C;<lt2Lu318{@tM`ZytOA4CZ_JUnz6
zu(y)|>*IvDeGt_Hod8-~{V2IPmrz232{<}BB49xPNpeLJJ*oYS7%o55Zp7_}C;?5=
z;B<Kcl1{*$X(`UQl^>Tk5CVTWvlrVmO>Zty0?M-F^4BRqB9WwHverQeWJ?$UKnS>B
zTn1>-S_8r@L|K-@WT2`lE>0AHE1@u}BSv(Jf(8=SwrE=eYYnV1FxH?oEdT-U-G{1n
z56C+gkYyS3JO=@YB<oTDVXcKR28I^&L@lkadEXZ#Ac8E-f(3b=Bg?X31k`m+RfPaB
z<^sl8SXz)4>t`FgCKo2%caZKb2qFLis*1X<hY_HvRCOg}Nr;H+1tgvzHddTol>2m~
zH*E|tp{j%JLR8HG5u{0m&DC`uSFN^}#I-Q`F{(M5rWr;+Q50PXrD@uc-dW`!;*t=0
zn+QQlS3*Tm3?pDZpZgLLq)FP53PN0y2I2w;Awh(Pz-_i6d#Z~0d_IhTvMdpLK$5Um
zIx+!%qj5G07<N`agyIG{Goh*|%d$6@=);^7;G1!)A-6^NJA{FkmpJr<st$V=$~A{2
zyK~It#ti%8E~9OWc;8&};m$&3SyEMDje%--Ik7&SaecETVe=2r=Djf{l+Z8&rqd}^
z74JX1i*erzRmF5V?JXecy%5O~fX4V<gL4u2eFt$zj2JOu#E20i{!9D;SOKJ?)YSbU
P00000NkvXXu0mjf*VSoz

literal 0
HcmV?d00001

diff --git a/libsaria/sources/playlist.py b/libsaria/sources/playlist.py
index 15447c22..75699231 100644
--- a/libsaria/sources/playlist.py
+++ b/libsaria/sources/playlist.py
@@ -111,7 +111,7 @@ def rand_next():
 		return id
 
 def next():
-	if libsaria.prefs2.get_pref("libsaria.random") == True:
+	if libsaria.prefs.get_pref("libsaria.random") == True:
 		id = rand_next()
 	else:
 		id = seq_next()
diff --git a/plugins/web_server.py b/plugins/web_server.py
index ccaf39be..7b68a118 100644
--- a/plugins/web_server.py
+++ b/plugins/web_server.py
@@ -19,8 +19,8 @@ html   = join(path.cwd(), "html")
 server = None
 types  = {".html":"text/html", ".js":"text/javascript",
 		".ico":"image/vnd.microsoft.icon",
-		".py":"text/html", ".jpg":"image/jpeg",
-		".mp3":"audio/mpeg",
+		".png":"image/png", ".jpg":"image/jpeg",
+		".py":"text/html", ".mp3":"audio/mpeg",
 		".ogg":"audio/ogg"}
 
 
