Merge branch 'master' of github.com:anrope/gifmusicvideo

8 files changed, 251 insertions, 13 deletions

diff --git a/50-cent.json b/50-cent.json
new file mode 100644
index 0000000..7f018f3
--- /dev/null
+++ b/50-cent.json
@@ -0,0 +1,43 @@
+[
+{"filename": "adriansito.gif"},
+{"filename": "tumblr_m267shhEva1qcc1i7o1_400.gif"},
+{"filename": "bale1.gif"},
+{"filename": "tumblr_m2dyk9BbGL1qg4n09o1_250.gif"},
+{"filename": "cassette-tape-animated-music.gif"},
+{"filename": "tumblr_m3mzyqk5xN1rnyfe7o1_500.gif"},
+{"filename": "kQM1z.gif"},
+{"filename": "tumblr_m3vih4C1PU1qbxh0uo1_500.gif"},
+{"filename": "kanye3.gif"},
+{"filename": "tumblr_m4hz6sbcGN1qjxj2fo1_500.gif"},
+{"filename": "tumblr_l3t79nk0jc1qzvlpuo1_500.gif"},
+{"filename": "tumblr_m4iynqGPlx1r7mpdko1_500.gif"},
+{"filename": "tumblr_lhtz49MA6O1qc5iyjo1_400.gif"},
+{"filename": "tumblr_m5bcyupqaE1r96tomo1_250.gif"},
+{"filename": "tumblr_lj5tfpFTRX1qc49m9o1_500.gif"},
+{"filename": "tumblr_m5lr8mdmzW1r7mpdko1_500.gif"},
+{"filename": "tumblr_ljhxqfJwB71qhisruo1_500.gif"},
+{"filename": "tumblr_m5w9jjWRbV1qbk0hso1_500.gif"},
+{"filename": "tumblr_ljz425tEXI1qg5pdoo1_500.gif"},
+{"filename": "tumblr_m60djiHpm11r7mpdko1_500.gif"},
+{"filename": "tumblr_lqwgotBd8n1qejgz3o1_500.gif"},
+{"filename": "tumblr_lr3vjnzAi11qejgz3o1_500.gif"},
+{"filename": "tumblr_m7n7iuBMfx1qgb5p1o1_500.gif"},
+{"filename": "tumblr_lrr1ku3P7X1qbi90oo1_500.gif"},
+{"filename": "tumblr_m9n66ejalM1r0ixdro1_500.gif"},
+{"filename": "tumblr_lssie9ImCV1qbmtjno1_500.gif"},
+{"filename": "tumblr_m9sn64pbHm1rf9zqeo1_500.gif"},
+{"filename": "tumblr_lt2btxDV2s1qejgz3o1_500.gif"},
+{"filename": "tumblr_m9uvwnOn9t1qb7gb1o1_r1_500.gif"},
+{"filename": "tumblr_ltckqjcvOB1r3544jo1_500.gif"},
+{"filename": "tumblr_ma7seiZSvd1qg39ewo1_500.gif"},
+{"filename": "tumblr_lufcvlVgd71qzozj1.gif"},
+{"filename": "tumblr_majeno2FcG1r9p5i4o1_500.gif"},
+{"filename": "tumblr_m0ohr48H8A1rn7mt4o1_500.gif"},
+{"filename": "tumblr_mb9cueUesj1r7mpdko1_250.gif"},
+{"filename": "tumblr_m1gwcgAWPT1rnimpto1_500.gif"},
+{"filename": "tumblr_mbjl77iCXF1qdjhrgo1_500.gif"},
+{"filename": "tumblr_m1h681i0Gm1qceuw4o1_500.gif"},
+{"filename": "tumblr_mc8nk5Ypwx1qg39ewo1_500.gif"},
+{"filename": "tumblr_mcff4c4Mpr1rd11tco1_500.gif"},
+{"filename": "tumblr_m1k83on7sT1qer569o1_1280.gif"}
+]
\ No newline at end of file
diff --git a/bad-girls.json b/bad-girls.json
new file mode 100644
index 0000000..0094769
--- /dev/null
+++ b/bad-girls.json
@@ -0,0 +1,66 @@
+[{"filename": "280sw007883.gif"},
+{"filename": "6523.gif"},
+{"filename": "88_10340031.gif"},
+{"filename": "Pill01.gif"},
+{"filename": "dfa1714ee0956f6569638856b81b06ab_full.jpg"},
+{"filename": "m5IRS.gif"},
+{"filename": "reverse-1278127094_gmail-missy-elliot.gif"},
+{"filename": "scp-01.gif"},
+{"filename": "tumblr_le2h4qOXEt1qccvzso1_500.gif"},
+{"filename": "tumblr_llxazc8xQM1qfgbojo1_500.gif"},
+{"filename": "tumblr_lonzhdbwA71qh14t2o1_500.gif"},
+{"filename": "tumblr_lqs9754VGH1qko769o11_r1_250.gif"},
+{"filename": "tumblr_lqs9754VGH1qko769o4_250.gif"},
+{"filename": "tumblr_ltl9ucrq2k1r49t5mo1_500.gif"},
+{"filename": "tumblr_lv5bf4xeXl1r6q35po1_1280.gif"},
+{"filename": "tumblr_lw5y68pZBW1r65wioo1_500.gif"},
+{"filename": "tumblr_lymv2psLdb1qdjhrgo1_500.gif"},
+{"filename": "tumblr_lyrxts3M3J1qeialgo1_1280.gif"},
+{"filename": "tumblr_lyubomG4kD1qejgz3o1_500.gif"},
+{"filename": "tumblr_lyw0i3VFwC1r31q91o1_500.gif"},
+{"filename": "tumblr_lz3s69MRso1r31q91o1_500.gif"},
+{"filename": "tumblr_lztox4W4cv1qk6yk3o1_500.gif"},
+{"filename": "tumblr_m115boi6hW1r7mpdko1_400.gif"},
+{"filename": "tumblr_m15m5ugwCy1qfanm5o1_500.gif"},
+{"filename": "tumblr_m1iuyqcHGg1qdezf9o1_500.gif"},
+{"filename": "tumblr_m1okwfelRt1qba4wlo1_500.gif"},
+{"filename": "tumblr_m1xdecdGmD1rn2idko1_500.gif"},
+{"filename": "tumblr_m2eia7ihMK1qzpy7ko1_r1_500.gif"},
+{"filename": "tumblr_m2yih7QNmM1qfl0m1o1_500.gif"},
+{"filename": "tumblr_m32zf05RTL1r7mpdko1_500.gif"},
+{"filename": "tumblr_m3ioftxgJN1rtbc9yo1_500.gif"},
+{"filename": "tumblr_m3omzyslOK1qd7m1so1_500.gif"},
+{"filename": "tumblr_m3xpqweUMx1qjofyjo1_500.gif"},
+{"filename": "tumblr_m42bz7TQFf1r7mpdko1_500.gif"},
+{"filename": "tumblr_m4arlfRvpK1qzpy7ko1_r1_500.gif"},
+{"filename": "tumblr_m4qlgsWZRK1qb644no1_500.gif"},
+{"filename": "tumblr_m4u79qvyHJ1r8m0qko1_500.gif"},
+{"filename": "tumblr_m4w713qMkA1qahy1wo1_1280.gif"},
+{"filename": "tumblr_m4x1v54wco1qd7m1so1_500.gif"},
+{"filename": "tumblr_m52ay7tZrF1rxysh5o1_500.gif"},
+{"filename": "tumblr_m59dh0GBdw1r4wj1ao1_400.gif"},
+{"filename": "tumblr_m66h1emxwN1qm4rgyo1_400.gif"},
+{"filename": "tumblr_m6er389qBj1qlq9poo1_500.gif"},
+{"filename": "tumblr_m6pmiwOR3L1qg39ewo1_500.gif"},
+{"filename": "tumblr_m75uyh7yqM1rwteaio1_500.gif"},
+{"filename": "tumblr_m7bp94ZaKK1qb7evco1_500.gif"},
+{"filename": "tumblr_m7f4i0y01p1qzw1qyo1_500.gif"},
+{"filename": "tumblr_m7ma26PamU1rxa3aso1_500.gif"},
+{"filename": "tumblr_m841xcKf6s1qaflmto1_r1_250.gif"},
+{"filename": "tumblr_m8cjudH6Ge1qjrlw4o1_500.gif"},
+{"filename": "tumblr_m8zxikZfv21r9ipqio1_500.gif"},
+{"filename": "tumblr_m9a0skcFZk1rbypgdo1_500.gif"},
+{"filename": "tumblr_m9sufj7eRT1rbypgdo1_500.gif"},
+{"filename": "tumblr_m9v5e69o711r05jkho1_400.gif"},
+{"filename": "tumblr_ma8kc8OcKs1r7mpdko1_500.gif"},
+{"filename": "tumblr_maeeunDWXL1rbypgdo1_500.gif"},
+{"filename": "tumblr_magt9jRtNu1r2cdnpo1_500.gif"},
+{"filename": "tumblr_mahpki3xLs1qj73e2o1_500.gif"},
+{"filename": "tumblr_max2cxVyPy1rbz6cro1_500.gif"},
+{"filename": "tumblr_mb00sj96IY1r4dy70o1_500.gif"},
+{"filename": "tumblr_mb9x20F16h1qzw1qyo1_500.gif"},
+{"filename": "tumblr_mbb7zfPFJr1qzpy7ko1_500.gif"},
+{"filename": "tumblr_mc1w8muoEs1rf089no1_500.gif"},
+{"filename": "tumblr_mcq218Sghi1qd7m1so1_500.gif"},
+{"filename": "tumblr_mcq567iPyz1qd7m1so1_500.gif"}
+]
\ No newline at end of file
diff --git a/dump.rdb b/dump.rdb
new file mode 100644
index 0000000..69cc4d6
--- /dev/null
+++ b/dump.rdb
diff --git a/paper-planes.json b/paper-planes.json
new file mode 100644
index 0000000..91e05f2
--- /dev/null
+++ b/paper-planes.json
@@ -0,0 +1,46 @@
+[{"filename": "001.gif"},
+{"filename": "tumblr_lsrsmmxivc1qc1vfso1_500.gif"},
+{"filename": "002.gif"},
+{"filename": "tumblr_ly7nnbPUcd1qi0i31o1_500.gif"},
+{"filename": "003.gif"},
+{"filename": "tumblr_ly7pnmAPQI1qdcyu0o1_1280.gif"},
+{"filename": "007.gif"},
+{"filename": "tumblr_lyydbnGULR1r2905to1_400.gif"},
+{"filename": "008.gif"},
+{"filename": "tumblr_m1lcy1XwuG1r7mpdko1_500.gif"},
+{"filename": "010.gif"},
+{"filename": "tumblr_m1tqjhXfjh1r77u7co1_500.gif"},
+{"filename": "012.gif"},
+{"filename": "tumblr_m25cgzLQdk1qaen8do1_500.gif"},
+{"filename": "015.gif"},
+{"filename": "tumblr_m34wosjN071rq6ysvo1_1280.gif"},
+{"filename": "027.gif"},
+{"filename": "tumblr_m3cg8tb4HU1ruzwdwo1_500.gif"},
+{"filename": "030.gif"},
+{"filename": "tumblr_m3zfl28TQE1qg39ewo1_500.gif"},
+{"filename": "035.gif"},
+{"filename": "tumblr_m46cpoFO8M1r7mpdko1_250.gif"},
+{"filename": "2xU96.gif"},
+{"filename": "tumblr_m46srpWYpV1qgwqw9o1_500.gif"},
+{"filename": "30075yu908.gif"},
+{"filename": "tumblr_m481rvg9Zw1r7mpdko1_1280.gif"},
+{"filename": "81805147.gif"},
+{"filename": "tumblr_m4rysn39oQ1r7mpdko1_500.gif"},
+{"filename": "Getting_into_car.gif"},
+{"filename": "tumblr_m4ys8eBPOM1qejgz3o1_500.gif"},
+{"filename": "eoP38.gif"},
+{"filename": "tumblr_m5jenb1CvQ1qc0cxpo1_500.gif"},
+{"filename": "l.gif"},
+{"filename": "tumblr_m5ns8qnY9X1r7mpdko1_500.gif"},
+{"filename": "mayadiplo.gif"},
+{"filename": "tumblr_m5uhckRPRF1qc0cxpo1_500.gif"},
+{"filename": "tumblr_l957fx0ILQ1qzulc2o1_500.gif"},
+{"filename": "tumblr_m6703qEia81r5o8k4o1_500.gif"},
+{"filename": "tumblr_lgvzmv7OAy1qb67mxo1_500.gif"},
+{"filename": "tumblr_m8ljmsGTiN1raw02so1_500.gif"},
+{"filename": "tumblr_liu75ahi4K1qgirhjo1_400.gif"},
+{"filename": "tumblr_mcqefwjF6c1qg39ewo1_500.gif"},
+{"filename": "tumblr_looyfepgHU1qkffoxo1_500.gif"},
+{"filename": "yE5h6.gif"},
+{"filename": "tumblr_lsrrjuUsVd1qc1vfso1_500.gif"}
+]
\ No newline at end of file
diff --git a/public/css/index.css b/public/css/index.css
index e69de29..410b7be 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -0,0 +1,26 @@
+#home {
+    background: #444;
+    height: 100%;
+    width: 100%;
+    position: absolute;
+    top: 0;
+    left: 0;
+}
+#home h1 a {
+    display: block;
+    position: absolute;
+    top: 50%;
+    left: 50%;
+    background-color: #00CD62;
+    padding: 10px;
+    width: 490px;
+    margin-left: -250px;
+    margin-top: -30px;
+    text-align: center;
+    text-decoration: none;
+    color: #000;
+    box-shadow: 0 1px 3px rgba(0,0,0,0.5);
+}
+#home h1 a:hover {
+    text-decoration: underline;
+}
\ No newline at end of file
diff --git a/public/js/controllers.js b/public/js/controllers.js
index 9a62742..d78a686 100644
--- a/public/js/controllers.js
+++ b/public/js/controllers.js
@@ -89,14 +89,9 @@ function PlayerCtrl($scope, $http) {
     });
 
     var nextImageInStrip = 0;
-    var lastRemoveCheck = 0;
     function triggerTime(ms) {
         renderNewImages(ms);
-        // Only remove images every second
-        if (ms - 1000 > lastRemoveCheck) {
-            lastRemoveCheck = ms;
-            removePastImages(ms);
-        }
+        removePastImages(ms);
     }
 
     var imageBuffer = [];
@@ -136,7 +131,7 @@ function PlayerCtrl($scope, $http) {
     function removePastImages(ms) {
         $('.gif_placed_box').each(function() {
             var $item = $(this);
-            var rightPosition = parseInt($item.css('left')) + parseInt($item.css('width'));
+            var rightPosition = parseInt($item.css('left')) - timestamp_to_position(ms) + parseInt($item.css('width'));
             if (rightPosition < 0) {
                 $item.remove();
             }
@@ -149,6 +144,9 @@ function PlayerCtrl($scope, $http) {
         setUpDrag();
         var inner_width = (currentSong.duration * .2);
         $('#gif_inner').width(inner_width);
+        setTimeout(function() {
+            $('#gif_block').trigger('click');
+        }, 1000);
     }
     
     var position_to_timestamp = function(position) {
diff --git a/views/index.ejs b/views/index.ejs
index 6d6b80c..4d6bc22 100644
--- a/views/index.ejs
+++ b/views/index.ejs
@@ -1,9 +1,7 @@
 <% angular_controller = "PlayerCtrl" %>
 
+<div id="home">
 
-<h1>GIF me baby one more time</h1>
-<ul>
-    <li ng-repeat="gif in suggest.gifs">
-        <img href="{{suggest.base_url}}{{gif.url}}" />
-    </li>
-</ul>
+    <h1><a href="song/diplo/m-i-a-paper-planes">GIF me baby one more time</a></h1>
+
+</div>
\ No newline at end of file
diff --git a/zedd.json b/zedd.json
new file mode 100644
index 0000000..d5d9dec
--- /dev/null
+++ b/zedd.json
@@ -0,0 +1,61 @@
+[
+{"filename": "1162345_o.gif"},
+{"filename": "sunny4.gif"},
+{"filename": "163563561.gif"},
+{"filename": "tumblr_kzpk3lWOuw1qbuztgo1_400.gif"},
+{"filename": "23ma42w.jpg.gif"},
+{"filename": "tumblr_l0p4mt0QAa1qa7q08o1_400.gif"},
+{"filename": "292yal3.gif"},
+{"filename": "tumblr_l51nsfJN331qzxf8vo1_400.gif"},
+{"filename": "300sw047yusw9.gif"},
+{"filename": "tumblr_l95zexMVU51qzdf0go1_500.gif"},
+{"filename": "81611836.gif"},
+{"filename": "tumblr_lcxbawv1OW1qbuztgo1_250.gif"},
+{"filename": "Ea9gW.gif"},
+{"filename": "tumblr_lcxbdgeLBR1qbuztgo1_250.gif"},
+{"filename": "KW3uF.gif"},
+{"filename": "tumblr_ld1e3tSu1R1qbuztgo1_250.gif"},
+{"filename": "XKOwb.gif"},
+{"filename": "tumblr_ld31v04TqN1qbuztgo1_250.gif"},
+{"filename": "bale2.gif"},
+{"filename": "tumblr_ldag31vonm1qbuztgo1_400.gif"},
+{"filename": "beyonce1.gif"},
+{"filename": "tumblr_ldao92lDwT1qfqhoro1_500.gif"},
+{"filename": "beyonce2.gif"},
+{"filename": "tumblr_ldv8jzmyhn1qc7j5lo1_500.gif"},
+{"filename": "bg0P9.gif"},
+{"filename": "tumblr_le3sotwNlU1qa48wxo1_500.gif"},
+{"filename": "bjorkandcatdancingp1.gif"},
+{"filename": "tumblr_le7qz72sjb1qbuztgo1_250.gif"},
+{"filename": "couch101510.gif"},
+{"filename": "tumblr_lfa5tmS93q1qdok1go1_500.gif"},
+{"filename": "creepin.gif"},
+{"filename": "tumblr_lgqwpt5PfZ1qfjmnk.gif"},
+{"filename": "danc.gif"},
+{"filename": "tumblr_lgqwsbEa891qfjmnk.gif"},
+{"filename": "freaks.gif"},
+{"filename": "tumblr_lh5sje0t9L1qbuztgo1_250.gif"},
+{"filename": "gary.gif"},
+{"filename": "tumblr_lhpckhQ2mO1qamwa1o1_400.gif"},
+{"filename": "giffed-hitler06.gif"},
+{"filename": "tumblr_lhrzztdSKy1qb7hapo1_500.gif"},
+{"filename": "jamie_lee_curtis.gif"},
+{"filename": "tumblr_lic7zaNNkQ1qabm5vo1_500.gif"},
+{"filename": "mbjD3.gif"},
+{"filename": "tumblr_lk54oh7tTt1qeot64.gif"},
+{"filename": "otter.gif"},
+{"filename": "tumblr_lkbxc4qncE1qd2avdo1_500.gif"},
+{"filename": "sambergmccartney.gif"},
+{"filename": "tumblr_lkp9c2y1SV1qh59n0o1_500.gif"},
+{"filename": "sbtb2.gif"},
+{"filename": "tumblr_lktb6qRYs81qa4k0co1_500.gif"},
+{"filename": "sbtb3.gif"},
+{"filename": "tumblr_llatanJkKU1qbnthu.gif"},
+{"filename": "smith2.gif"},
+{"filename": "tumblr_llax2rbRRS1qg87cc.gif"},
+{"filename": "smith4.gif"},
+{"filename": "tumblr_m482xzMqQ21r7mpdko1_500.gif"},
+{"filename": "sunny2.gif"},
+{"filename": "ytvWH.gif"},
+{"filename": "sunny2a.gif"}
+]
\ No newline at end of file