alexvanin/fleast
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Reformatted main class

Browse source
This commit is contained in:
Alex Vanin 2018-08-13 22:10:52 +03:00
parent e10976d035
commit 4947d12281
2 changed files with 40 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

55
main.py
View file

@ -1,16 +1,13 @@
#!/usr/bin/env python3 #!/usr/bin/env python3
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
import cherrypy
import json
from cherrypy.process.plugins import Daemonizer
from twitch import TwitchClient from twitch import TwitchClient
import json ver = '1.04'
import cherrypy
from cherrypy.process.plugins import Daemonizer
ver = '1.03'
repl = {'"':'&quot;', '&':'&amp;', '<':'&lt;', '>':'&gt;' }
class FleastServer(object): class FleastServer(object):
def __init__(self): def __init__(self):
@ -31,6 +28,11 @@ class FleastServer(object):
exit(1) exit(1)
def set_templ_lang(self, lang): def set_templ_lang(self, lang):
"""
Set autoselected language in html
:param lang: string with the shortcut of language
:return: string with html list of languages and one is selected
"""
templ = '' templ = ''
end = False end = False
for l in self.templ_lang: for l in self.templ_lang:
@ -42,12 +44,16 @@ class FleastServer(object):
return templ.rstrip() return templ.rstrip()
def to_html(self, text): def to_html(self, text):
#return ''.join(repl.get(s,s) for s in text) """
Relace all non xml symbols with aliases
:param text: string with html source code
:return: filtered string with html source code
"""
repl = {'"': '&quot;', '&': '&amp;', '<': '&lt;', '>': '&gt;'}
for i in repl: for i in repl:
text = text.replace(i, repl[i]) text = text.replace(i, repl[i])
return text return text
@cherrypy.expose @cherrypy.expose
def index(self, game=None, lang=None): def index(self, game=None, lang=None):
return self.fleast(game, lang) return self.fleast(game, lang)
@ -55,18 +61,21 @@ class FleastServer(object):
@cherrypy.expose @cherrypy.expose
def fleast(self, game=None, lang=None): def fleast(self, game=None, lang=None):
if game is None or game == '': if game is None or game == '':
return self.index_page.format(_version_ = ver, _opt_langs_ = self.set_templ_lang('ru')) return self.index_page.format(_version_=ver,
_opt_langs_=self.set_templ_lang('ru'))
game = game.rstrip() game = game.rstrip()
cherrypy.log('Getting game:"%s" language:%s' % (game, lang)) cherrypy.log('Getting game:"{}" language:{}'.format(game, lang))
data = self.client.get_live_streams(game, lang) data = self.client.get_live_streams(game, lang)
if data is None: if data is None:
return 'Internal Error<br>Tell me more at <a href="https://twitter.com/alexvanin">https://twitter.com/alexvanin</a>' return 'Internal Error<br>Tell me more at ' \
'<a href="https://twitter.com/alexvanin">https://twitter.com/alexvanin</a>'
if data['_total'] == 0: if data['_total'] == 0:
return self.templ_main.format( _stream_num_ = data['_total'], _game_name_ = game, \ return self.templ_main.format(_stream_num_=data['_total'],
_opt_langs_ = self.set_templ_lang(lang), _stream_list_ = '', \ _game_name_=game,
_opt_langs_=self.set_templ_lang(lang),
_stream_list_='',
_version_=ver) _version_=ver)
cherrypy.log('Found %d streams' % data['_total']) cherrypy.log('Found %d streams' % data['_total'])
@ -74,20 +83,24 @@ class FleastServer(object):
streams = sorted(data['streams'], key=lambda k: k['viewers']) streams = sorted(data['streams'], key=lambda k: k['viewers'])
result_str = '' result_str = ''
for s in streams: for s in streams:
result_str += self.templ_stream.format(s['channel']['url'], s['preview']['medium'], self.to_html(s['channel']['status']), \ result_str += self.templ_stream.format(s['channel']['url'],
s['channel']['display_name'], s['viewers']) +'\n' s['preview']['medium'],
self.to_html(s['channel']['status']),
s['channel']['display_name'],
s['viewers']) + '\n'
return self.templ_main.format(_stream_num_ = data['_total'], _game_name_ = game, \ return self.templ_main.format(_stream_num_=data['_total'],
_opt_langs_ = self.set_templ_lang(lang), _stream_list_ = result_str,\ _game_name_=game,
_opt_langs_=self.set_templ_lang(lang),
_stream_list_=result_str,
_version_=ver) _version_=ver)
def main(): def main():
server = FleastServer() server = FleastServer()
d = Daemonizer(cherrypy.engine).subscribe() # d = Daemonizer(cherrypy.engine).subscribe()
cherrypy.quickstart(server, '/', './server.conf') cherrypy.quickstart(server, '/', './server.conf')
if __name__ == '__main__': if __name__ == '__main__':
main() main()

2
twitch.py
View file

@ -125,7 +125,7 @@ class TwitchClient:
while total > streams: while total > streams:
r = self.do_q(q_template.format(base, name, lang, 100, streams), header) r = self.do_q(q_template.format(base, name, lang, 100, streams), header)
if r is None: if r is None:
return [] return None
data['streams'].extend(r['streams']) data['streams'].extend(r['streams'])
total = r['_total'] total = r['_total']
streams = len(data['streams']) streams = len(data['streams'])