From: Guillaume Pellerin <yomguy@parisson.com>
Date: Mon, 7 Dec 2009 01:12:35 +0000 (+0000)
Subject: fix null options
X-Git-Url: https://git.parisson.com/?a=commitdiff_plain;h=213d50a8acd160fa9ff8d253afcae146cd41abdb;p=deefuzzer.git

fix null options
---

diff --git a/deefuzzer.py b/deefuzzer.py
index 29ac8a9..3fad69d 100755
--- a/deefuzzer.py
+++ b/deefuzzer.py
@@ -270,7 +270,8 @@ class Station(Thread):
             os.makedirs(self.metadata_dir)
 
         # Twitter
-        if self.station['twitter']:
+        self.twitter_mode = '0'
+        if 'twitter' in self.station:
             self.twitter_mode = self.station['twitter']['mode']
             self.twitter_user = self.station['twitter']['user']
             self.twitter_pass = self.station['twitter']['pass']
@@ -279,7 +280,8 @@ class Station(Thread):
                 self.twitter_tags = self.station['twitter']['tags'].split(' ')
                 self.tinyurl = tinyurl.create_one(self.channel.url + '/m3u/' + self.m3u.split(os.sep)[-1])
 
-        if self.station['jingles']:
+        self.jingles_mode = '0'
+        if 'jingles' in self.station:
             self.jingles_mode =  self.station['jingles']['mode']
             self.jingles_shuffle = self.station['jingles']['shuffle']
             self.jingles_dir = self.station['jingles']['dir']