Permalink
Browse files

db name change and put input

  • Loading branch information...
1 parent 418980a commit 3474e9844d56a8d5180c71eb0e2f0edf67f1aaad @comotion committed Nov 19, 2012
Showing with 19 additions and 4 deletions.
  1. +3 −0 .gitmodules
  2. +8 −0 TODO
  3. +2 −0 web/config.lua
  4. +2 −2 web/hangover.lua
  5. +1 −1 web/lib/tokyo.lua
  6. +1 −0 web/lib/tokyotyrant
  7. +2 −1 web/lib/tracks.lua
View
3 .gitmodules
@@ -1,3 +1,6 @@
[submodule "web/lib/lamt"]
path = web/lib/lamt
url = git://github.com/comotion/lamt.git
+[submodule "web/lib/tokyotyrant"]
+ path = web/lib/tokyotyrant
+ url = https://github.com/daurnimator/lua-tokyotyrant.git
View
8 TODO
@@ -5,6 +5,14 @@ What to do and how:
+ empty searches?! ::
+ getracks 01.fuck yuo
+ empty upload fucks up
++ get nonexistant track fucks up
+
+wishlist:
+ - edit page
+ - error messages
+ - (add to .. ) playlist builder
+ - create program dialog (with sched picker)
+ - delete track/playlist track/playlist/
- get_next:
knows about silences, metadata, can queue songs
View
2 web/config.lua
@@ -10,3 +10,5 @@ tracks_path = "/tmp/mu"
-- must be on same device as tracks_path, or error: "invalid cross-device link"
temp_dir = "/tmp"
+-- database host, port
+--host,port = ('localhost',1978)
View
4 web/hangover.lua
@@ -144,8 +144,8 @@ function put_db(web,...)
local id = ...
local input = web.input.post_data
u.out(input)
- if input then
- input = json.decode(input)
+ if not input then
+ return json.encode{{result=nil, error="nothing to put"}}
end
return tracks:update(id, input)
end
View
2 web/lib/tokyo.lua
@@ -7,7 +7,7 @@ local u = require "lib/util"
module("tokyo", package.seeall)
function tokyo:init(name)
- local file = name .. ".tch"
+ local file = name .. ".tct"
-- fix this stupidity. if you spell the query type wrong,
-- you get no warnings, nothing.
1 web/lib/tokyotyrant
@@ -0,0 +1 @@
+Subproject commit 3841dd55246b9f459e1b6d38aaa1db785bb1cb01
View
3 web/lib/tracks.lua
@@ -207,6 +207,7 @@ function tracks.filter(result, fields, limit, skip)
end
return res
end
-u.out("fapfapfap", tracks:dump())
+u.out("fapfapfap")
+u.out(tracks:dump())
return tracks

0 comments on commit 3474e98

Please sign in to comment.