#881 ✓ resolved
Joe Flowers

Popcorn's complete distribution has sequence code duplicated

Reported by Joe Flowers | December 30th, 2011 @ 12:12 PM | in 1.2 (closed)

Noticed this when I was working on trying to add some "go to video in sequence" functionality ... but the entire logic for sequences is duplicated in two places - I'm assuming this is an accident?

http://popcornjs.org/code/dist/popcorn-complete.js

Line 2235 is the first copy
Line 9799 is the second copy

Comments and changes to this ticket

  • David Humphrey

    David Humphrey December 30th, 2011 @ 12:15 PM

    • Assigned user set to “David Humphrey”
    • State changed from “new” to “assigned”
    • Milestone set to 1.2
    • Milestone order changed from “75” to “0”
  • Rick

    Rick December 30th, 2011 @ 12:40 PM

    This might be worthy of a 1.1.1 release

  • cadecairos

    cadecairos December 30th, 2011 @ 04:16 PM

    that'd be a 1.1.2 actually. I checked out the Makefile earlier but couldn't quite pinpoint where the extra sequence code came from. I wonder how long this has been happening, and if it affects any other plugins/players or parsers.

  • cadecairos

    cadecairos December 30th, 2011 @ 04:38 PM

    I can't seem to reproduce the duplicate sequence code in popcorn-complete.js when using both make complete and make all

  • David Humphrey

    David Humphrey December 30th, 2011 @ 04:43 PM

    For the min target, we seem to list sequence.js as both a module and player:

    java -jar ./build/google-compiler-20100917.jar  --js ./popcorn.js --js ./modules/sequence/popcorn.sequence.js ... --js ./players/sequence/popcorn.sequence.js ... --js_output_file  ./dist/popcorn-complete.min.js
    

    Is this an artifact of it being a player before it was a module, and whoever did |make| for this release still had that submodule under players too?

  • David Humphrey

    David Humphrey December 30th, 2011 @ 04:45 PM

    hospitality:popcorn-js dave$ find . -name sequence
    ./modules/sequence
    ./players/sequence
    

    And I assume that the latter is just in my working dir, since git doesn't know about it:

    hospitality:popcorn-js dave$ git status
    # On branch develop
    # Your branch is ahead of 'jbuck/develop' by 750 commits.
    #
    # Untracked files:
    #   (use "git add ..." to include in what will be committed)
    #
    #   players/sequence/
    
  • David Humphrey

    David Humphrey December 30th, 2011 @ 04:46 PM

    • Assigned user changed from “David Humphrey” to “cadecairos”

    As such, this isn't a code problem, but a process problem. Someone needs to redo 1.1.1 without players/sequence in their tree.

  • Rick

    Rick December 30th, 2011 @ 04:48 PM

    Humph, are you pulling from git://github.com/cadecairos/popcorn-js ?

  • David Humphrey

    David Humphrey December 30th, 2011 @ 04:53 PM

    Yep

    hospitality:popcorn-js dave$ git show
    commit d1053a9ea99b042b944fab8ab5129bbd6b4b17da
    Merge: 7d9c150 238ec57
    Author: Christopher De Cairos 
    Date:   Thu Dec 22 17:15:54 2011 -0500
    
        Stopped the Timeline plugin from pulling in an unnecessary css file [[#878](/projects/63272/tickets/878 "Ticket #878")]
    

    Note, in case it's unclear from what I wrote above...

    1) sequence does live in modules/ as per https://github.com/cadecairos/popcorn-js/tree/develop/modules

    2) sequence does not live in players/ (any more) as per https://github.com/cadecairos/popcorn-js/tree/develop/players

    I conclude that the fact that we have this file included twice to be the result of someone with an old players/sequence dir (e.g., submodule) still in their working dir (not tree), and calling make. That would explain what we're seeing. However, the Makefile and build system are fine.

    The fix is just to have someone with a proper tree re-run make and post those .js files. Make sense? That's the only way I can explain this issue.

  • Rick
  • cadecairos

    cadecairos December 30th, 2011 @ 07:02 PM

    • Assigned user changed from “cadecairos” to “David Humphrey”

    Yeah looks like the sequence/ folder is under players still on popcornjs.org:

    root@ve:/var/www/popcornjs.org/code# git status
    # Not currently on any branch.
    # Untracked files:
    #   (use "git add <file>..." to include in what will be committed)
    #
    #   effects/applyclass/readme.html
    #   modules/timeline-sources/readme.html
    #   players/sequence/
    nothing added to commit but untracked files present (use "git add" to track)
    
  • David Humphrey

    David Humphrey December 30th, 2011 @ 07:04 PM

    • Assigned user cleared.
    • State changed from “assigned” to “bugs”

    rm -fr players/sequence -lol -wtf

    Not sure who wants to own this, but it's not me. Who has the keys to that box?

  • Rick
  • Rick

    Rick December 30th, 2011 @ 08:16 PM

    • State changed from “bugs” to “resolved”

Please Sign in or create a free account to add a new ticket.

With your very own profile, you can contribute to projects, track your activity, watch tickets, receive and update tickets through your email and much more.

New-ticket Create new ticket

Create your profile

Help contribute to this project by taking a few moments to create your personal profile. Create your profile »

Popcorn.js is an HTML5 video framework that lets you bring elements of the web into your videos.

Popcorn.js is a project of Web Made Movies, Mozilla's Open Video Lab.

Shared Ticket Bins

Pages