|
a/src/mediaserver/cdplugins/uprcl/uprcl-app.py |
|
b/src/mediaserver/cdplugins/uprcl/uprcl-app.py |
|
... |
|
... |
26 |
import uprcluntagged
|
26 |
import uprcluntagged
|
27 |
import uprclsearch
|
27 |
import uprclsearch
|
28 |
import uprclhttp
|
28 |
import uprclhttp
|
29 |
import uprclindex
|
29 |
import uprclindex
|
30 |
|
30 |
|
31 |
from uprclutils import uplog, g_myprefix, rcldirentry
|
31 |
from uprclutils import uplog, g_myprefix, rcldirentry, waitentry
|
32 |
import uprclinit
|
32 |
import uprclinit
|
33 |
|
33 |
|
34 |
#####
|
34 |
#####
|
35 |
# Initialize communication with our parent process: pipe and method
|
35 |
# Initialize communication with our parent process: pipe and method
|
36 |
# call dispatch
|
36 |
# call dispatch
|
|
... |
|
... |
112 |
if bflg == 'meta':
|
112 |
if bflg == 'meta':
|
113 |
raise Exception("uprcl-app: browse: can't browse meta for now")
|
113 |
raise Exception("uprcl-app: browse: can't browse meta for now")
|
114 |
else:
|
114 |
else:
|
115 |
try:
|
115 |
try:
|
116 |
if not uprclinit.ready():
|
116 |
if not uprclinit.ready():
|
117 |
entries = [rcldirentry(objid + 'notready', objid,
|
117 |
entries = [waitentry(objid + 'notready', objid,
|
118 |
'Initializing...'),]
|
118 |
uprclinit.g_httphp),]
|
119 |
nocache = "1"
|
119 |
nocache = "1"
|
120 |
elif not idpath:
|
120 |
elif not idpath:
|
121 |
entries = _rootentries()
|
121 |
entries = _rootentries()
|
122 |
else:
|
122 |
else:
|
123 |
entries = _browsedispatch(objid, bflg, uprclinit.g_httphp,
|
123 |
entries = _browsedispatch(objid, bflg, uprclinit.g_httphp,
|
|
... |
|
... |
140 |
upnps = a['origsearch']
|
140 |
upnps = a['origsearch']
|
141 |
nocache = "0"
|
141 |
nocache = "0"
|
142 |
|
142 |
|
143 |
try:
|
143 |
try:
|
144 |
if not uprclinit.ready():
|
144 |
if not uprclinit.ready():
|
145 |
entries = [rcldirentry(objid + 'notready', objid,
|
145 |
entries = [waitentry(objid + 'notready', objid,
|
146 |
'Initializing...'),]
|
146 |
uprclinit.g_httphp),]
|
147 |
nocache = "1"
|
147 |
nocache = "1"
|
148 |
else:
|
148 |
else:
|
149 |
entries = uprclsearch.search(uprclinit.g_rclconfdir, objid, upnps,
|
149 |
entries = uprclsearch.search(uprclinit.g_rclconfdir, objid, upnps,
|
150 |
g_myprefix, uprclinit.g_httphp,
|
150 |
g_myprefix, uprclinit.g_httphp,
|
151 |
uprclinit.g_pathprefix)
|
151 |
uprclinit.g_pathprefix)
|