Skip to content

Commit

Permalink
Category fix and new db entries (#106)
Browse files Browse the repository at this point in the history 
* Fix broken categories
* Add new db entries.
* Update caching for data directory
  • Loading branch information
@sammacbeth @ecnmst
sammacbeth authored and ecnmst committed Jul 23, 2018
1 parent 81dd599 commit 2121149
Show file tree
Hide file tree
Showing 4 changed files with 54 additions and 60 deletions.
6 changes: 6 additions & 0 deletions deploy_to_s3.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@ def get_max_age(path, filename):
return 604800
# one week cache
return 604800
elif path.startswith('data/'):
# trackerdb: 1day cache
if 'trackerdb.' in path:
return 86400
# rest of data directory: 1 week cache
return 604800
# default 1day cache for html pages
return 86400

Expand Down
8 changes: 4 additions & 4 deletions templates/tracker-page.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,12 +67,12 @@
<div class="row tracker-category">
<div class="col-md-11">
<h4>TRACKER CATEGORY</h4>
{% if profile.cat %}
{% if profile.category %}
<span class="cat-item">
<i class="fa fa-circle" style="color: {{ TRACKER_CATEGORIES[profile.cat] }}" aria-hidden="true"></i>
{{profile.cat|prettify_label}}
<i class="fa fa-circle" style="color: {{ TRACKER_CATEGORIES[profile.category] }}" aria-hidden="true"></i>
{{profile.category|prettify_label}}
</span>
<p class="tracker-desc">{{CATEGORY_DESC[profile.cat]}}</p>
<p class="tracker-desc">{{CATEGORY_DESC[profile.category]}}</p>
{% else %}

<span class="cat-item">
Expand Down
49 changes: 41 additions & 8 deletions whotracksme/data/assets/trackerdb.sql
View file
Original file line number Diff line number Diff line change
Expand Up @@ -639,6 +639,10 @@ INSERT INTO "companies" VALUES('ziff_davis','Ziff Davis LLC',NULL,'http://www.zi
INSERT INTO "companies" VALUES('impact','Impact',NULL,'https://impact.com/privacy-policy/','https://impact.com/',NULL,NULL,NULL);
INSERT INTO "companies" VALUES('netzeffekt','netzeffekt',NULL,NULL,'https://www.netzeffekt.de/',NULL,NULL,NULL);
INSERT INTO "companies" VALUES('24metrics','24metrics',NULL,NULL,'https://24metrics.com/',NULL,NULL,NULL);
INSERT INTO "companies" VALUES('eulerian','Eulerian Technologies',NULL,'https://www.eulerian.com/en/privacy/','https://www.eulerian.com/',NULL,'fr',NULL);
INSERT INTO "companies" VALUES('steelhouse','Steel House, Inc.',NULL,'https://steelhouse.com/privacy-policy/','https://steelhouse.com/','751','us',NULL);
INSERT INTO "companies" VALUES('urban_airship','Urban Airship, Inc.',NULL,'https://www.urbanairship.com/legal/privacy-policy','https://urbanairship.com/','3072','us',NULL);
INSERT INTO "companies" VALUES('trueanthem','trueAnthem',NULL,'https://www.trueanthem.com/privacy/','https://www.trueanthem.com/','3030','us',NULL);
CREATE TABLE iab_vendors (id INTEGER PRIMARY KEY, tracker INTEGER REFERENCES trackers (id), company INTEGER REFERENCES companies (id));
INSERT INTO "iab_vendors" VALUES(1,NULL,'exponential_interactive');
INSERT INTO "iab_vendors" VALUES(3,'affilinet',NULL);
Expand Down Expand Up @@ -745,6 +749,7 @@ INSERT INTO "iab_vendors" VALUES(211,'adtheorent','adtheorant');
INSERT INTO "iab_vendors" VALUES(212,'usemax','usemax');
INSERT INTO "iab_vendors" VALUES(213,'emetriq','emetriq');
INSERT INTO "iab_vendors" VALUES(225,'ligatus',NULL);
INSERT INTO "iab_vendors" VALUES(230,'steelhouse','steelhouse');
INSERT INTO "iab_vendors" VALUES(231,'acuity_ads','acuity_ads');
INSERT INTO "iab_vendors" VALUES(234,'zebestof.com','zebestof');
INSERT INTO "iab_vendors" VALUES(237,'lkqd',NULL);
Expand Down Expand Up @@ -801,6 +806,7 @@ INSERT INTO "iab_vendors" VALUES(388,'1000mercis','1000mercis');
INSERT INTO "iab_vendors" VALUES(397,'demandbase',NULL);
INSERT INTO "iab_vendors" VALUES(402,'effiliation','effiliation');
INSERT INTO "iab_vendors" VALUES(412,'cxense','cxense');
INSERT INTO "iab_vendors" VALUES(413,'eulerian','eulerian');
INSERT INTO "iab_vendors" VALUES(418,'proxistore.com',NULL);
INSERT INTO "iab_vendors" VALUES(423,'travel_audience',NULL);
INSERT INTO "iab_vendors" VALUES(426,'tradetracker','tradetracker');
Expand Down Expand Up @@ -2466,7 +2472,7 @@ INSERT INTO "tracker_domains" VALUES('condenastdigital.com','condenast.com');
INSERT INTO "tracker_domains" VALUES('connatix.com','connatix.com');
INSERT INTO "tracker_domains" VALUES('contentexchange.me','contentexchange.me');
INSERT INTO "tracker_domains" VALUES('dailymail.co.uk','dailymail.co.uk');
INSERT INTO "tracker_domains" VALUES('sociaplus.com','useinsider.com');
INSERT INTO "tracker_domains" VALUES('sociaplus.com','sociaplus.com');
INSERT INTO "tracker_domains" VALUES('salesmanago.pl','salesmanago.com');
INSERT INTO "tracker_domains" VALUES('zebestof.com','zebestof.com');
INSERT INTO "tracker_domains" VALUES('wysistat.com','wysistat.net');
Expand Down Expand Up @@ -2723,6 +2729,21 @@ INSERT INTO "tracker_domains" VALUES('r_advertising','ads-digitalkeys.com');
INSERT INTO "tracker_domains" VALUES('tp-cdn.com','rialpay.com');
INSERT INTO "tracker_domains" VALUES('cdnetworks.net','cdnetworks.com');
INSERT INTO "tracker_domains" VALUES('algolia.net','algolia.com');
INSERT INTO "tracker_domains" VALUES('amazon_payments','amazonpay.com');
INSERT INTO "tracker_domains" VALUES('storify','storify.com');
INSERT INTO "tracker_domains" VALUES('optinmonster','optmnstr.com');
INSERT INTO "tracker_domains" VALUES('eulerian','ew3.io');
INSERT INTO "tracker_domains" VALUES('steelhouse','steelhousemedia.com');
INSERT INTO "tracker_domains" VALUES('wix.com','parastorage.com');
INSERT INTO "tracker_domains" VALUES('stalluva.pro','stalluva.pro');
INSERT INTO "tracker_domains" VALUES('ie8eamus.com','ie8eamus.com');
INSERT INTO "tracker_domains" VALUES('pageanalytics.space','pageanalytics.space');
INSERT INTO "tracker_domains" VALUES('zmctrack.net','zmctrack.net');
INSERT INTO "tracker_domains" VALUES('trueanthem','tru.am');
INSERT INTO "tracker_domains" VALUES('insider','useinsider.com');
INSERT INTO "tracker_domains" VALUES('joinhoney','joinhoney.com');
INSERT INTO "tracker_domains" VALUES('ionicframework.com','ionicframework.com');
INSERT INTO "tracker_domains" VALUES('urban_airship','urbanairship.com');
CREATE TABLE "trackers" (
`id` TEXT NOT NULL UNIQUE,
`name` TEXT NOT NULL,
Expand Down Expand Up @@ -3180,7 +3201,7 @@ INSERT INTO "trackers" VALUES('doofinder.com','doofinder',2,'https://www.doofind
INSERT INTO "trackers" VALUES('ixquick.com','ixquick',8,'https://www.ixquick.com/','startpage','',NULL);
INSERT INTO "trackers" VALUES('loadbee.com','Loadbee',4,'https://company.loadbee.com/de/loadbee-home',NULL,'',NULL);
INSERT INTO "trackers" VALUES('findizer.fr','Findizer',8,'http://www.findizer.fr/',NULL,'findizer.fr',NULL);
INSERT INTO "trackers" VALUES('wix.com','Wix',8,'https://www.wix.com/',NULL,'wix.com',NULL);
INSERT INTO "trackers" VALUES('wix.com','Wix',8,'https://www.wix.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('7tv.de','7tv.de',0,'https://www.7tv.de/',NULL,'7tv.de',NULL);
INSERT INTO "trackers" VALUES('opta.net','Opta',2,'http://www.optasports.de/',NULL,'',NULL);
INSERT INTO "trackers" VALUES('zedo','Zedo',4,'http://www.zedo.com/','zedo','102',NULL);
Expand Down Expand Up @@ -3547,7 +3568,7 @@ INSERT INTO "trackers" VALUES('openload','Openload',9,'https://openload.co/',NUL
INSERT INTO "trackers" VALUES('merkle_rkg','Merkle RKG',6,'https://www.merkleinc.com/what-we-do/digital-agency-services/rkg-now-fully-integrated-merkle','dentsu_aegis_network',NULL,NULL);
INSERT INTO "trackers" VALUES('bidtellect','Bidtellect',4,'https://www.bidtellect.com/','bidtellect','2994',NULL);
INSERT INTO "trackers" VALUES('optomaton','Optomaton',4,'http://www.optomaton.com/','ve',NULL,NULL);
INSERT INTO "trackers" VALUES('amazon_payments','Amazon Payments',2,NULL,'amazon_associates',NULL,NULL);
INSERT INTO "trackers" VALUES('amazon_payments','Amazon Payments',2,'https://pay.amazon.com/','amazon_associates',NULL,NULL);
INSERT INTO "trackers" VALUES('bootstrap','Bootstrap CDN',9,'http://getbootstrap.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('jquery','jQuery',9,'https://jquery.org/','js_foundation',NULL,NULL);
INSERT INTO "trackers" VALUES('createjs','CreateJS',9,'https://createjs.com/',NULL,NULL,NULL);
Expand Down Expand Up @@ -3613,7 +3634,7 @@ INSERT INTO "trackers" VALUES('ausgezeichnet_org','ausgezeichnet.org',2,'http://
INSERT INTO "trackers" VALUES('freegeoip_net','freegeoip.net',6,'http://freegeoip.net/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('adac_de','adac.de',8,'http://adac.de/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('stailamedia_com','stailamedia.com',4,'http://stailamedia.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('crimsonhexagon_com','crimsonhexagon.com',6,'http://crimsonhexagon.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('crimsonhexagon_com','Crimson Hexagon',6,'http://crimsonhexagon.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('ehi-siegel_de','ehi-siegel.de',2,'http://ehi-siegel.de/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('s24_com','Shopping24 internet group',4,'https://www.s24.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('redblue_de','redblue',6,'https://www.redblue.de/',NULL,NULL,NULL);
Expand Down Expand Up @@ -3816,7 +3837,7 @@ INSERT INTO "trackers" VALUES('condenastdigital.com','Condé Nast Digital',8,'ht
INSERT INTO "trackers" VALUES('connatix.com','Connatix',4,'https://connatix.com/','connatix',NULL,NULL);
INSERT INTO "trackers" VALUES('contentexchange.me','Content Exchange',6,'https://www.contentexchange.me/','i.r.v.','2628',NULL);
INSERT INTO "trackers" VALUES('dailymail.co.uk','Daily Mail',8,'http://www.dailymail.co.uk/home/index.html','dmg_media',NULL,NULL);
INSERT INTO "trackers" VALUES('sociaplus.com','Insider',6,'http://useinsider.com/','insider','2868',NULL);
INSERT INTO "trackers" VALUES('sociaplus.com','SociaPlus',6,'https://sociaplus.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('salesmanago.pl','SALESmanago',4,'https://www.salesmanago.com/','sales_manago','2403',NULL);
INSERT INTO "trackers" VALUES('zebestof.com','Zebestof',4,'http://www.zebestof.com/en/home/','zebestof',NULL,NULL);
INSERT INTO "trackers" VALUES('wysistat.com','Wysistat',6,'http://wysistat.net/','wysistat','902',NULL);
Expand Down Expand Up @@ -4004,6 +4025,18 @@ INSERT INTO "trackers" VALUES('beampulse.com','BeamPulse',4,'https://en.beampuls
INSERT INTO "trackers" VALUES('discord','Discord',2,'https://discordapp.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('medialead','Medialead',4,'https://www.medialead.de/','the_reach_group',NULL,NULL);
INSERT INTO "trackers" VALUES('r_advertising','R-Advertising',4,'http://www.r-advertising.com/',NULL,'1805',NULL);
INSERT INTO "trackers" VALUES('storify','Storify',4,'https://storify.com/',NULL,'2581',NULL);
INSERT INTO "trackers" VALUES('eulerian','Eulerian Technologies',6,'https://www.eulerian.com/','eulerian',NULL,NULL);
INSERT INTO "trackers" VALUES('steelhouse','Steel House Media',4,'https://steelhouse.com/','steelhouse','476',NULL);
INSERT INTO "trackers" VALUES('stalluva.pro','stalluva.pro',11,NULL,NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('ie8eamus.com','ie8eamus.com',11,NULL,NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('pageanalytics.space','pageanalytics.space',11,NULL,NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('zmctrack.net','zmctrack.net',11,NULL,NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('urban_airship','Urban Airship',2,'https://www.urbanairship.com/','urban_airship','2501',NULL);
INSERT INTO "trackers" VALUES('trueanthem','True Anthem',4,'https://www.trueanthem.com/','trueanthem','1924',NULL);
INSERT INTO "trackers" VALUES('insider','Insider',6,'http://useinsider.com/','insider','2868',NULL);
INSERT INTO "trackers" VALUES('joinhoney','Honey',8,'https://www.joinhoney.com/',NULL,NULL,NULL);
INSERT INTO "trackers" VALUES('ionicframework.com','Ionic',8,'https://ionicframework.com/',NULL,NULL,NULL);
CREATE TABLE truste_companies (id INTEGER PRIMARY KEY, name VARCHAR NOT NULL, type VARCHAR, description VARCHAR, privacy_url VARCHAR, tracker TEXT REFERENCES trackers (id), company TEXT REFERENCES companies (id));
INSERT INTO "truste_companies" VALUES(1,'01Net','Publisher Related','News on IT products and more.','http://www.01net.com/info/mentions-legales/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(2,'1&1','Publisher Related','1&1 Internet Inc. provides Web hosting solutions for private users, as well as high-end products for small-and medium-sized businesses.','https://www.1and1.com/terms-gtc/fileadmin/Terms/PDF_US/2018_01_US_Privacy_Policy_DWE.pdf','1und1',NULL);
Expand Down Expand Up @@ -4428,7 +4461,7 @@ INSERT INTO "truste_companies" VALUES(420,'Erate','Ad Server','ERate company spe
INSERT INTO "truste_companies" VALUES(421,'Ethic','Ad Agency','Ethic Inc. is a full service Atlanta advertising agency, specializing in branding and web development since 2003. Ethic has been developing brands from local startups to some of the world’s most recognizable brands. ','https://www.ethicinc.com/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(422,'Ethnio','Market research / Consumer survey','Lets you recruit the best possible participants for user research from your app, site, or around the internet.','https://ethn.io/privacy',NULL,NULL);
INSERT INTO "truste_companies" VALUES(423,'eTracker','Attribution / Analytics','Web analytics and website optimisation solutions for every business model. ','https://www.etracker.com/datenschutz/','etracker',NULL);
INSERT INTO "truste_companies" VALUES(424,'Eulerian Technologies','Attribution / Analytics','Eulerian Technologies develops solutions for real-time analysis, automation and optimization of e-marketing operations. ','https://www.eulerian.com/en/privacy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(424,'Eulerian Technologies','Attribution / Analytics','Eulerian Technologies develops solutions for real-time analysis, automation and optimization of e-marketing operations. ','https://www.eulerian.com/en/privacy/','eulerian','eulerian');
INSERT INTO "truste_companies" VALUES(425,'EventsTag','Social / Sharing Tools','Company aims to become the best possible solution for event organisers to collect, display and share the social media content their guests are taking. ','https://eventstag.com/privacy',NULL,NULL);
INSERT INTO "truste_companies" VALUES(426,'Evernote','Service Provider','Evrernote design products that fuel inspiration for projects from start to finish.','https://evernote.com/privacy',NULL,NULL);
INSERT INTO "truste_companies" VALUES(427,'EverString','Attribution / Analytics','EverString allows you to build pipeline and increase customer conversion rates with the only account-based, full-funnel predictive analytics solution for sales & marketing.','https://www.everstring.com/privacy-policy/',NULL,NULL);
Expand Down Expand Up @@ -5057,7 +5090,7 @@ INSERT INTO "truste_companies" VALUES(1049,'Stack Exchange','Publisher Related',
INSERT INTO "truste_companies" VALUES(1050,'StackAdapt','Ad Platform','StackAdapt is an omnichannel advertising platform that helps brands accelerate customer acquisition by reaching relevant audiences through native, display, and video advertising.','https://www.stackadapt.com/privacy','stackadapt','stackadapt');
INSERT INTO "truste_companies" VALUES(1051,'Stackla','Social / Sharing Tools','Social Media Aggregator','https://stackla.com/privacy-policy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1052,'Stat24','Attribution / Analytics','Professional Website Statistics, Map Clicks and SEM Services ','http://stat24.com/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1053,'Steel House, Inc.','Retargeting / Optimization','SteelHouse (www.SteelHouse.com) provides digital marketing services to our clients as the pioneer in the emerging field of Behavioral Commerce. We enable retailers to provide the right offer to their shoppers at the right time when they are online. We never know personal information or store anything confidential. At the end of the day, we''re consumers just like you and respect your privacy.','https://steelhouse.com/privacy-policy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1053,'Steel House, Inc.','Retargeting / Optimization','SteelHouse (www.SteelHouse.com) provides digital marketing services to our clients as the pioneer in the emerging field of Behavioral Commerce. We enable retailers to provide the right offer to their shoppers at the right time when they are online. We never know personal information or store anything confidential. At the end of the day, we''re consumers just like you and respect your privacy.','https://steelhouse.com/privacy-policy/','steelhouse','steelhouse');
INSERT INTO "truste_companies" VALUES(1054,'Steel Media','Ad Network','Steel Media provides Display, Mobile, Video and Email ad inventory to both brands and ad agencies. Orchestrate highly-targeted, integrated digital campaigns. ','http://steelmediainc.com/about/privacy-policy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1055,'Sternzeit Media','Ad Network','Privately owned company with more than 15 years of experience in buying and selling online advertising space','http://www.sternzeit.de/de/imprint/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1056,'Stirista','Retargeting / Optimization','Stirista helps acquire and retain customers via high-impact digital, social and email campaigns. ','http://www.stirista.com/privacy-policy',NULL,NULL);
Expand Down Expand Up @@ -5134,7 +5167,7 @@ INSERT INTO "truste_companies" VALUES(1126,'Triblio','Service Provider','Triblio
INSERT INTO "truste_companies" VALUES(1127,'TripleLift, Inc.','Ad Platform','TripleLift is the native programmatic platform with RTB capabilities for buying and selling native advertising','https://triplelift.com/privacy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1128,'Triton Digital Canada Inc.','Ad Network','We are dedicated to connecting audio, audience, and advertising into the next multi-billion dollar marketplace.','https://www.tritondigital.com/privacy-policies',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1129,'Tru Optik','Ad Platform','Tru Optik empowers brands, media companies and agencies with the ability to target and monetize millennials across all digital channels. ','http://truoptik.com/privacy-policy','truoptik',NULL);
INSERT INTO "truste_companies" VALUES(1130,'trueAnthem','Social / Sharing Tools','The easiest way to publish your best content at the right time to your social audience. ','http://www.trueanthem.com/privacy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1130,'trueAnthem','Social / Sharing Tools','The easiest way to publish your best content at the right time to your social audience. ','http://www.trueanthem.com/privacy/','trueanthem','trueanthem');
INSERT INTO "truste_companies" VALUES(1131,'TruEffect, Inc.','Ad Platform','Trueffect is a Data and Analytics Company focused on Media Precision that offers brands the only independent performance measurement solution that syncs media insights with customer intelligence for full funnel media optimization. ','https://trueffect.com/privacy-policy/',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1132,'TrueX','Ad Platform','The Leading Engagement Advertising Platformtr ','http://www.truex.com/privacy.html',NULL,NULL);
INSERT INTO "truste_companies" VALUES(1133,'Trugaze','Ad Platform','Trugaze is a marketing assurance platform for digital advertising. ','http://trugaze.io/',NULL,NULL);
Expand Down
Loading

0 comments on commit 2121149

Please sign in to comment.