Moved check to see if the user has random on or off
This commit is contained in:
parent
77cf9482a5
commit
4d419dea8b
|
@ -43,9 +43,6 @@ class Plugin(plugin.Plugin):
|
||||||
nxttrk += 1
|
nxttrk += 1
|
||||||
|
|
||||||
manager.run("next",[nxttrk])
|
manager.run("next",[nxttrk])
|
||||||
#sel = sql.Select("track","libtrack","library="+str(curlib))
|
|
||||||
#rows = sel.execute().fetchall()
|
|
||||||
#manager.run("next",[rows[nxttrk][0], nxttrk])
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -24,15 +24,20 @@ class Plugin(plugin.Plugin):
|
||||||
if settings.has("random") == False:
|
if settings.has("random") == False:
|
||||||
settings.set("random",False)
|
settings.set("random",False)
|
||||||
elif settings.get("random") == True:
|
elif settings.get("random") == True:
|
||||||
signal.register("next",self.randNext,90)
|
signal.register("next",self.randLib,90)
|
||||||
pass
|
pass
|
||||||
|
|
||||||
|
|
||||||
def close(self):
|
def close(self):
|
||||||
signal.remove("next",self.randNext)
|
signal.remove("next",self.randLib)
|
||||||
|
|
||||||
|
|
||||||
def randNext(self):
|
# Take a random song from the library
|
||||||
|
def randLib(self):
|
||||||
|
# Return if random is not enabled
|
||||||
|
if settings.get("random") == False:
|
||||||
|
return
|
||||||
|
|
||||||
count = db.countlib(str(settings.get("curlib")))
|
count = db.countlib(str(settings.get("curlib")))
|
||||||
curtrk = settings.get("curtrk")
|
curtrk = settings.get("curtrk")
|
||||||
id = curtrk
|
id = curtrk
|
||||||
|
@ -44,17 +49,12 @@ class Plugin(plugin.Plugin):
|
||||||
break
|
break
|
||||||
manager.run("next",[id])
|
manager.run("next",[id])
|
||||||
signal.stop("next")
|
signal.stop("next")
|
||||||
pass
|
|
||||||
|
|
||||||
|
|
||||||
def run(self, args=None):
|
def run(self, args=None):
|
||||||
if args==None or len(args)==0:
|
if args==None or len(args)==0:
|
||||||
rand = not settings.get("random")
|
rand = not settings.get("random")
|
||||||
settings.set("random",rand)
|
settings.set("random",rand)
|
||||||
if rand == True:
|
|
||||||
signal.register("next",self.randNext,90)
|
|
||||||
else:
|
|
||||||
signal.remove("next",self.randNext)
|
|
||||||
|
|
||||||
elif args[0] == "?":
|
elif args[0] == "?":
|
||||||
write(settings.get("random"))
|
write(settings.get("random"))
|
||||||
|
|
Loading…
Reference in New Issue