mcvsoftware/twblue
1
0
Fork 0
mirror of https://github.com/MCV-Software/TWBlue.git synced 2024-11-26 20:53:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Attempt to fix merge conflict.

Browse Source
This commit is contained in:
Bill Dengler 2015-05-13 12:53:14 -04:00
commit 74f0e8ba50
3 changed files with 6 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/app-configuration.defaults
View File

@ -12,7 +12,6 @@ use_invisible_keyboard_shorcuts = boolean(default=True)
play_ready_sound = boolean(default=True) play_ready_sound = boolean(default=True)
speak_ready_msg = boolean(default=True) speak_ready_msg = boolean(default=True)
log_level = string(default="error") log_level = string(default="error")
use_modern_audio_algo = boolean(default=True)
[keymap] [keymap]
up = string(default="control+win+up") up = string(default="control+win+up")

15
src/sessionmanager/session.py
View File

@ -114,7 +114,6 @@ class Session(object):
self.settings = config_utils.load_config(paths.config_path(file_), paths.app_path("Conf.defaults")) self.settings = config_utils.load_config(paths.config_path(file_), paths.app_path("Conf.defaults"))
self.init_sound() self.init_sound()
self.deshelve() self.deshelve()
self.fix_audio_tags()
# except: # except:
# log.exception("The session configuration has failed.") # log.exception("The session configuration has failed.")
# self.settings = None # self.settings = None
@ -410,17 +409,3 @@ class Session(object):
log.exception("Exception while deshelving" + shelfname) log.exception("Exception while deshelving" + shelfname)
os.remove(shelfname) os.remove(shelfname)
def fix_audio_tags(self,force=False):
"Repair audio tags."
for key,value in self.db.items():
if type(value) == list:
for t in value:
utils.is_audio(t,force=force)
def clean_is_audio_memmos(self):
"Clean out memmos for is_audio"
for key,value in self.db.items():
if type(value) == list:
for i in value:
if 'is_audio' in i:
del i['is_audio']

6
src/twitter/utils.py
View File

@ -45,6 +45,7 @@ def find_next_reply(id, listItem):
return None return None
def is_audio(tweet,force=False): def is_audio(tweet,force=False):
<<<<<<< HEAD
start=time.time() start=time.time()
if force == False and 'is_audio' in tweet: if force == False and 'is_audio' in tweet:
return tweet['is_audio'] return tweet['is_audio']
@ -73,6 +74,10 @@ def is_audio(tweet,force=False):
end=time.time() end=time.time()
print "Codeofdusk algo took",end-start,"seconds." print "Codeofdusk algo took",end-start,"seconds."
tweet['is_audio']=False tweet['is_audio']=False
if len(tweet["entities"]["hashtags"]) > 0:
for i in tweet["entities"]["hashtags"]:
if i["text"] == "audio":
return True
return False return False
def is_geocoded(tweet): def is_geocoded(tweet):
@ -138,6 +143,7 @@ def is_allowed(tweet, clients):
allowed = False allowed = False
log.exception("Tuit not allowed: %s" % (tweet["text"],)) log.exception("Tuit not allowed: %s" % (tweet["text"],))
return allowed return allowed
<<<<<<< HEAD
def url_is_audio(u): def url_is_audio(u):
sound.URLPlayer.is_playable(u) sound.URLPlayer.is_playable(u)