# HG changeset patch
# User Yves-Marie Haussonne <1218002+ymph@users.noreply.github.com>
# Date 1309392621 -7200
# Node ID 8124cde38141d1b239e74c55f3d8ac95a2747bbc
# Parent 2bf0fd3432bfa606df027d2ffbdd7697476064f2
- add white list on user to filter tweets
- improve on polemical timeline to display more than one content
- release mashup videos
diff -r 2bf0fd3432bf -r 8124cde38141 script/lib/iri_tweet/export_twitter_alchemy.py
--- a/script/lib/iri_tweet/export_twitter_alchemy.py Tue Jun 28 22:23:56 2011 +0200
+++ b/script/lib/iri_tweet/export_twitter_alchemy.py Thu Jun 30 02:10:21 2011 +0200
@@ -85,6 +85,8 @@
help="list of file to process", metavar="LIST_CONF", default=None)
parser.add_option("-E", "--extended", dest="extended_mode", action="store_true",
help="Trigger polemic extended mode", metavar="EXTENDED", default=False)
+ parser.add_option("--user-whitelist", dest="user_whitelist", action="store",
+ help="A list of user screen name", metavar="USER_WHITELIST",default=None)
set_logging_options(parser)
@@ -123,7 +125,9 @@
tei = tweet_exclude_table.insert()
for line in f:
conn.execute(tei.values(id=long(line.strip())))
-
+ user_whitelist_file = options.user_whitelist
+ user_whitelist = None
+
if options.listconf:
parameters = []
@@ -162,7 +166,10 @@
duration = params.get("duration", None)
content_file = params.get("content_file", None)
hashtags = params.get('hashtags', [])
-
+
+ if user_whitelist_file:
+ with open(user_whitelist_file, 'r+') as f:
+ user_whitelist = list(set([s.strip() for s in f]))
start_date = parse_date(start_date_str)
ts = time.mktime(start_date.timetuple())
@@ -174,7 +181,7 @@
te = ts + duration
end_date = start_date + datetime.timedelta(seconds=duration)
- query = get_filter_query(session, start_date, end_date, hashtags, tweet_exclude_table)
+ query = get_filter_query(session, start_date, end_date, hashtags, tweet_exclude_table, user_whitelist)
query_res = query.all()
diff -r 2bf0fd3432bf -r 8124cde38141 script/lib/iri_tweet/utils.py
--- a/script/lib/iri_tweet/utils.py Tue Jun 28 22:23:56 2011 +0200
+++ b/script/lib/iri_tweet/utils.py Thu Jun 30 02:10:21 2011 +0200
@@ -326,13 +326,17 @@
help="quiet", metavar="QUIET", default=0)
-def get_filter_query(session, start_date, end_date, hashtags, tweet_exclude_table):
+def get_filter_query(session, start_date, end_date, hashtags, tweet_exclude_table, user_whitelist):
query = session.query(Tweet).join(EntityHashtag).join(Hashtag)
if tweet_exclude_table is not None:
query = query.filter(~Tweet.id.in_(select([tweet_exclude_table.c.id]))) #@UndefinedVariable
query = query.filter(Tweet.created_at >= start_date).filter(Tweet.created_at <= end_date)
+
+ if user_whitelist:
+ query = query.join(User).filter(User.screen_name.in_(user_whitelist))
+
if hashtags :
def merge_hash(l,h):
@@ -341,6 +345,7 @@
htags = reduce(merge_hash, hashtags, [])
query = query.filter(or_(*map(lambda h: Hashtag.text.contains(h), htags))) #@UndefinedVariable
+
return query
diff -r 2bf0fd3432bf -r 8124cde38141 web/mashup/config.php
--- a/web/mashup/config.php Tue Jun 28 22:23:56 2011 +0200
+++ b/web/mashup/config.php Thu Jun 30 02:10:21 2011 +0200
@@ -13,7 +13,6 @@
'date' => '25.06.2011',
'heure' => '15h00',
'place' => 'Forum des images',
- 'duration' => '',
'title' => "Mashup, remix, détournements : nouveaux usages des images sur les réseaux sociaux",
'description'=> "
@@ -36,7 +35,7 @@
'link' => 'http://www.forumdesimages.fr/fdi/Festivals-et-evenements/MashUp-Film-Festival/Mashup-remix-detournements-nouveaux-usages-des-images-sur-les-reseaux-sociaux',
'keywords' => 'mashup, film, festival, forum des images ',
- 'rep' => 'rsln-mercedes-bunz',
+ 'rep' => 'mashup',
'partenaires'=> "
|
| ",
@@ -44,9 +43,9 @@
// After the event
'metadata' => array(
'conference'=>
- array('url'=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/b2754186-a0c9-11e0-b8bd-00145ea49a02", 'display'=>'Conférence'),
+ array('url'=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/b2754186-a0c9-11e0-b8bd-00145ea49a02", 'display'=>'Conférence', 'duration'=>4605808),
'tableronde'=>
- array('url'=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/3f877114-a0cc-11e0-bc41-00145ea49a02", 'display'=>'Table Ronde')
+ array('url'=>"http://www.iri.centrepompidou.fr/dev/ldt/ldtplatform/ldt/cljson/id/3f877114-a0cc-11e0-bc41-00145ea49a02", 'display'=>'Table Ronde', 'duration'=>5271088)
),
'player' => "res/metadataplayer/src/js/LdtPlayer.js",
'duration' => "4606"
diff -r 2bf0fd3432bf -r 8124cde38141 web/mashup/polemicaltimeline.php
--- a/web/mashup/polemicaltimeline.php Tue Jun 28 22:23:56 2011 +0200
+++ b/web/mashup/polemicaltimeline.php Thu Jun 30 02:10:21 2011 +0200
@@ -98,7 +98,7 @@
metadata_key = "";
}
- var metadatas = { metadata: {url: ""} };
+ var metadatas = { metadata: {url: "", duration: } };
var metadata_key = "metadata";
@@ -109,7 +109,7 @@
width:,
height:,
heightmax:,
- duration:,
+ duration:metadatas[metadata_key].duration,
metadata:metadatas[metadata_key].url
};
@@ -132,18 +132,7 @@
jQuery("#mdselect_"+metadata_key).attr("selected","selected");
jQuery("#mdselect").change(function() {
var metadata_key = this.options[this.selectedIndex].value;
- var hashpart = window.location.hash;
- var window_location = window.location.href;
- if(hashpart.length === 0) {
- hashpart = "#metadata="+metadata_key;
- }
- else if (hashpart.indexOf("metadata=")>=0) {
- hashpart = hashpart.replace(/metadata=[\w\d]*/, "metadata="+metadata_key)
- }
- else {
- hashpart += "&metadata="+metadata_key;
- }
- window.location.hash = hashpart;
+ window.location.hash = "#metadata="+metadata_key;
window.location.href = window.location.href;
window.location.reload(true);
});
@@ -181,6 +170,7 @@