Merge lp:~unity-team/unity-lens-video/split-online-results into lp:unity-lens-video

[Michal Hruby]

Add the split parameter to the queries

Update to match latest designs - the scope now adds the 'split' parameter to the query to distinguish "online" and "suggestion" results.

[lp:~unity-team/unity-lens-video/split-online-results]

59. By Michal Hruby on 2012-09-14

A few more tweaks

Unmerged revisions

59. By Michal Hruby on 2012-09-14

A few more tweaks

58. By Michal Hruby on 2012-09-14

Update to match latest designs

57. By Jim Hodapp on 2012-08-30

Added details to the Amazon video preview. Fixes: . Approved by Pawel Stolowski.

56. By Ken VanDine on 2012-08-22

0.3.7

55. By Paweł Stołowski on 2012-08-17

Implementation of previews. Fixes: . Approved by Michal Hruby.

54. By David Callé on 2012-06-29

New project architecture

53. By David Callé on 2012-06-28

Add missing changelog entry

52. By David Callé on 2012-06-27

Update changelog

51. By David Callé on 2012-06-27

Depends on gvfs-bin

50. By David Callé on 2012-06-21

Exit on dbus unavailability, Unity will take care of restarting the scope, eventually disabling for the session if it fails more than a few times

=== added file 'COPYING'
--- COPYING	1970-01-01 00:00:00 +0000
+++ COPYING	2012-09-14 09:38:18 +0000
@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

=== renamed file 'COPYING' => 'COPYING.moved'
=== added file 'MANIFEST.in'
--- MANIFEST.in	1970-01-01 00:00:00 +0000
+++ MANIFEST.in	2012-09-14 09:38:18 +0000
@@ -0,0 +1,4 @@
+include unity-scope-video-remote.service
+include video-remote.scope
+include src/unity-scope-video-remote
+include COPYING

=== renamed file 'MANIFEST.in' => 'MANIFEST.in.moved'
=== added file 'setup.py'
--- setup.py	1970-01-01 00:00:00 +0000
+++ setup.py	2012-09-14 09:38:18 +0000
@@ -0,0 +1,16 @@
+#!/usr/bin/env python
+#
+from distutils.core import setup
+from DistUtilsExtra.command import *
+
+setup(name="unity-scope-video-remote",
+      version="0.3.7",
+      author="David Calle",
+      author_email="[e-mail]",
+      url="http://launchpad.net/onehundredscopes",
+      license="GNU General Public License (GPL)",
+      data_files=[
+    ('lib/unity-scope-video-remote', ['src/unity-scope-video-remote']),
+    ('share/dbus-1/services', ['unity-scope-video-remote.service']),
+    ('share/unity/lenses/video', ['video-remote.scope']),
+    ], cmdclass={"build":  build_extra.build_extra, })

=== renamed file 'setup.py' => 'setup.py.moved'
=== added directory 'src'
=== renamed directory 'src' => 'src.moved'
=== added file 'src/unity-scope-video-remote'
--- src/unity-scope-video-remote	1970-01-01 00:00:00 +0000
+++ src/unity-scope-video-remote	2012-09-14 09:38:18 +0000
@@ -0,0 +1,453 @@
+#! /usr/bin/python
+# -*- coding: utf-8 -*-
+
+#    Copyright (c) 2011 David Calle <[e-mail]>
+
+#    This program is free software: you can redistribute it and/or modify
+#    it under the terms of the GNU General Public License as published by
+#    the Free Software Foundation, either version 3 of the License, or
+#    (at your option) any later version.
+
+#    This program is distributed in the hope that it will be useful,
+#    but WITHOUT ANY WARRANTY; without even the implied warranty of
+#    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#    GNU General Public License for more details.
+
+#    You should have received a copy of the GNU General Public License
+#    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+"""The unity remote videos scope."""
+
+import json
+import sys
+from urllib import urlencode
+import time
+from datetime import datetime
+import gettext
+
+#pylint: disable=E0611
+from zeitgeist.client import ZeitgeistClient
+from zeitgeist.datamodel import (
+    Event, 
+    Subject, 
+    Interpretation, 
+    Manifestation,
+)
+
+from gi.repository import (
+    GLib,
+    GObject,
+    Gio,
+    Unity,
+    Soup,
+    SoupGNOME,
+)
+#pylint: enable=E0611
+
+APP_NAME = "unity-lens-video"
+LOCAL_PATH = "/usr/share/locale/"
+
+gettext.bindtextdomain(APP_NAME, LOCAL_PATH)
+gettext.textdomain(APP_NAME)
+_ = gettext.gettext
+n_ = gettext.ngettext
+
+CAT_INDEX_ONLINE = 1
+CAT_INDEX_MORE = 2
+
+BUS_NAME = "net.launchpad.scope.RemoteVideos"
+SERVER = "http://videosearch.ubuntu.com/v0"
+
+REFRESH_INTERVAL = 3600         # fetch sources & recommendations once an hour
+RETRY_INTERVAL = 60             # retry sources/recommendations after a minute
+
+# Be cautious with Zeitgeist, don't assume it's ready
+try:
+    ZGCLIENT = ZeitgeistClient()
+    # Creation of the Zg data source
+    ZGCLIENT.register_data_source("98898", "Unity Videos lens",
+        "",[Event.new_for_values(actor="lens://unity-lens-video")])
+except:
+    print "Unable to connect to Zeitgeist, won't send events."
+    ZGCLIENT = None
+
+class Daemon:
+
+    """Create the scope and listen to Unity signals"""
+
+    def __init__(self):
+        self._pending = None
+        self.sources_list = []
+        self.recommendations = []
+        self.scope = Unity.Scope.new("/net/launchpad/scope/remotevideos")
+        self.scope.search_in_global = False
+        self.scope.connect("search-changed", self.on_search_changed)
+        self.scope.connect("notify::active", self.on_lens_active)
+        self.scope.connect("filters-changed", self.on_filtering_changed)
+        self.scope.props.sources.connect("notify::filtering",
+            self.on_filtering_changed)
+        self.scope.connect ("activate-uri", self.on_activate_uri)
+        self.scope.connect('preview-uri', self.on_preview_uri)
+        self.session = Soup.SessionAsync()
+        self.session.props.user_agent = "Unity Video Lens Remote Scope v0.4"
+        self.session.add_feature_by_type(SoupGNOME.ProxyResolverGNOME)
+        self.query_list_of_sources()
+        self.update_recommendations()
+        self.scope.export()
+
+    def update_recommendations(self):
+        """Query the server for 'recommendations'.
+
+        In v0 extended, that means simply do an empty search with Amazon
+        as the source since it's the only paid provider at the moment.
+        """
+        msg = Soup.Message.new("GET", SERVER + "/search?q=&sources=Amazon&geo_store=US")
+        self.session.queue_message(msg, self._recs_cb, None)
+
+    def _recs_cb(self, session, msg, user_data):
+        recs = self._handle_search_msg(msg)
+        print "Got %d recommendations from the server" % len(recs)
+        if recs:
+            self.recommendations = recs
+            dt = REFRESH_INTERVAL
+        else:
+            dt = RETRY_INTERVAL
+        GLib.timeout_add_seconds(dt, self.update_recommendations)
+
+    def query_list_of_sources(self):
+        """Query the server for a list of sources that will be used
+        to build sources filter options and search queries."""
+        msg = Soup.Message.new("GET", SERVER + "/sources")
+        self.session.queue_message(msg, self._sources_cb, None)
+
+    def _sources_cb(self, session, msg, user_data):
+        if msg.status_code != 200:
+            print "Error: Unable to query the server for a list of sources"
+            print "       %d: %s" % (msg.status_code, msg.reason_phrase)
+        else:
+            try:
+                sources_list = json.loads(msg.response_body.data)
+            except ValueError:
+                print "Error: got garbage json from the server"
+            else:
+                if isinstance(sources_list, dict):
+                    sources_list = sources_list.get('results', [])
+                if sources_list and sources_list != self.sources_list:
+                    self.sources_list = sources_list
+                    sources = self.scope.props.sources
+                    for opt in sources.options[:]:
+                        sources.remove_option(opt.props.id)
+                    for source in self.sources_list:
+                        sources.add_option(source, source, None)
+        if self.sources_list:
+            # refresh later
+            dt = REFRESH_INTERVAL
+        else:
+            # retry soon
+            dt = RETRY_INTERVAL
+        GLib.timeout_add_seconds(dt, self.query_list_of_sources)
+
+    def on_filtering_changed(self, *_):
+        """Run another search when a filter change is notified."""
+        self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+
+    def on_lens_active(self, *_):
+        """ Run a search when the lens is opened """
+        if self.scope.props.active:
+            self.scope.queue_search_changed(Unity.SearchType.DEFAULT)
+
+    def source_activated(self, source):
+        """Return the state of a sources filter option."""
+        active = self.scope.props.sources.get_option(source).props.active
+        filtering = self.scope.props.sources.props.filtering
+        if (active and filtering) or (not active and not filtering):
+            return True
+        else:
+            return False
+            
+    def at_least_one_source_is_on(self, sources):
+        """Return a general activation state of all sources of this scope.
+        This is needed, because we don't want to show recommends if an option
+        from another scope is the only one activated"""
+        filtering = self.scope.props.sources.props.filtering
+        if filtering and len(sources) > 0 or not filtering:
+            return True
+        else:
+            return False
+
+    def on_search_changed(self, scope, search, search_type, _):
+        """Get the search string, prepare a list of activated sources for 
+        the server, update the model and notify the lens when we are done."""
+        search_string = search.props.search_string.strip()
+        # note search_string is a utf-8 encoded string, now:
+        print "Remote scope search changed to %r" % search_string
+        model = search.props.results_model
+        model.clear()
+        # Clear results details map
+        # Create a list of activated sources
+        sources = [source for source in self.sources_list
+                   if self.source_activated(source)]
+        # If all the sources are activated, don't bother
+        # passing them as arguments
+        if len(sources) == len(self.sources_list):
+            sources = ''
+        else:
+            sources = ','.join(sources)
+        working = False
+        # Ensure that we are not in Global search
+        if search_type is Unity.SearchType.DEFAULT: 
+            if self.at_least_one_source_is_on(sources):
+                self.get_results(search_string, search, model, sources)
+                working = True
+        if search and not working:
+            search.finished()
+
+    def update_results_model(self, search, model, results, is_treat_yourself=False):
+        """Run the search method and check if a list of sources is present.
+        This is useful when coming out of a network issue."""
+        if isinstance(results, dict):
+            self.process_result_array(results['other'], model, CAT_INDEX_ONLINE)
+            self.process_result_array(results['treats'], model, CAT_INDEX_MORE)
+        else:
+            category = CAT_INDEX_MORE if is_treat_yourself else CAT_INDEX_ONLINE
+            self.process_result_array(results, model, category)
+
+        if search:
+            search.finished()
+        if self.sources_list == []:
+            self.query_list_of_sources()
+
+    def process_result_array(self, results, model, category):
+        """Run the search method and check if a list of sources is present.
+        This is useful when coming out of a network issue."""
+        for i in results:
+            try:
+                uri = i['url'].encode('utf-8')
+                title = i['title'].encode('utf-8')
+                icon = i['img'].encode('utf-8')
+                comment = i['source'].encode('utf-8')
+                details_url = ""
+                if "details" in i:
+                    details_url = i['details'].encode('utf-8')
+
+                if uri.startswith('http'):
+                    # Instead of an uri, we pass a string of uri + metadata
+                    fake_uri = "%slens-meta://%slens-meta://%slens-meta://%s"
+                    fake_uri = fake_uri % (uri, title, icon, details_url)
+                    model.append(fake_uri,
+                        icon, category, "text/html",
+                        str(title), str(comment), str(uri))
+            except (KeyError, TypeError, AttributeError):
+                print "Malformed result, skipping."
+
+    def get_results(self, search_string, search, model, sources):
+        """Query the server with the search string and the list of sources."""
+        if not search_string and not sources and self.recommendations:
+            self.update_results_model(search, model, self.recommendations, True)
+            return
+        if self._pending is not None:
+            self.session.cancel_message(self._pending,
+                                        Soup.KnownStatusCode.CANCELLED)
+        query = dict(q=search_string)
+        query['split'] = 'true'
+        if sources:
+            query['sources'] = sources.encode("utf-8")
+        query = urlencode(query)
+        url = "%s/search?%s" % (SERVER, query)
+        print "Querying the server:", url
+        self._pending = Soup.Message.new("GET", url)
+        self.session.queue_message(self._pending,
+                                   self._search_cb,
+                                   (search, model))
+
+    def _search_cb(self, session, msg, (search, model)):
+        if msg is not self._pending:
+            # nothing to do here
+            print "WAT? _search_cb snuck in on a non-pending msg"
+            return
+        self._pending = None
+        results = self._handle_search_msg(msg)
+        self.update_results_model(search, model, results)
+
+    def _handle_search_msg(self, msg):
+        results = []
+        if msg.status_code != 200:
+            print "Error: Unable to get results from the server"
+            print "       %d: %s" % (msg.status_code, msg.reason_phrase)
+        else:
+            try:
+                results = json.loads(msg.response_body.data)
+            except ValueError:
+                print "Error: got garbage json from the server"
+        if isinstance(results, dict) and 'results' in results:
+            results = results.get('results', [])
+        return results
+
+
+    def on_activate_uri (self, scope, rawuri):
+        """On item clicked, parse the custom uri items"""
+        # Parse the metadata before passing the whole to Zg
+        uri = rawuri.split('lens-meta://')[0]
+        title = rawuri.split('lens-meta://')[1]
+        icon = rawuri.split('lens-meta://')[2]
+        if ZGCLIENT:
+            self.zeitgeist_insert_event(uri, title, icon)
+        # Use direct glib activation instead of Unity's own method
+        # to workaround an ActivationResponse bug.
+        GLib.spawn_async(["/usr/bin/gvfs-open", uri])
+        # Then close the Dash
+        return Unity.ActivationResponse(goto_uri='', handled=2 )
+
+    def on_preview_uri (self, scope, rawuri):
+        """Preview request handler"""
+        details_url = rawuri.split('lens-meta://')[3]
+        details = self.get_details(details_url)
+
+        title = rawuri.split('lens-meta://')[1]
+        thumbnail_uri = rawuri.split('lens-meta://')[2]
+        subtitle = ''
+        desc = ''
+        source = ''
+        if isinstance(details, dict):
+            title = details['title']
+            thumbnail_uri = details['image']
+            desc = details['description']
+            source = details['source']
+
+        try:
+            thumbnail_file = Gio.File.new_for_uri (thumbnail_uri)
+            thumbnail_icon = Gio.FileIcon.new(thumbnail_file)
+        except:
+            thumbnail_icon = None
+        
+        release_date = None
+        duration = 0
+            
+        if "release_date" in details:
+            try:
+                # v1 spec states release_date will be YYYY-MM-DD
+                release_date = datetime.strptime(details["release_date"], "%Y-%m-%d")
+            except ValueError:
+                print "Failed to parse release_date since it was not in format: YYYY-MM-DD"
+
+        if "duration" in details:
+            # Given in seconds, convert to minutes
+            duration = int(details["duration"]) / 60
+        
+        if release_date != None:
+            subtitle = release_date.strftime("%Y")
+        if duration > 0:
+            d = n_("%d min", "%d mins", duration) % duration
+            if len(subtitle) > 0:
+                subtitle += ", " + d
+            else:
+                subtitle = d
+            
+        preview = Unity.MoviePreview.new(title, subtitle, desc, thumbnail_icon)
+        play_video = Unity.PreviewAction.new("play", _("Play"), None)
+        play_video.connect('activated', self.play_video)
+        preview.add_action(play_video)
+        # For now, rating == -1 and num_ratings == 0 hides the rating widget from the preview
+        preview.set_rating(-1, 0)
+
+        # TODO: For details of future source types, factor out common detail key/value pairs
+        if source == "Amazon":
+            if "directors" in details:
+                directors = details["directors"]
+                preview.add_info(Unity.InfoHint.new("directors",
+                    n_("Director", "Directors", len(directors)), None, ', '.join(directors)))
+            if "starring" in details:
+                cast = details["starring"]
+                if cast:
+                    preview.add_info(Unity.InfoHint.new("cast",
+                        n_("Cast", "Cast", len(cast)), None, ', '.join(cast)))
+            if "genres" in details:
+                genres = details["genres"] 
+                if genres:
+                    preview.add_info(Unity.InfoHint.new("genres",
+                        n_("Genre", "Genres", len(genres)), None, ', '.join(genres)))
+        # TODO: Add Vimeo & YouTube details for v1 of JSON API
+        else:
+            if "uploaded_by" in details:
+                preview.add_info(Unity.InfoHint.new("uploaded-by", _("Uploaded by"),
+                    None, details["uploaded_by"]))
+            if "date_uploaded" in details:
+                preview.add_info(Unity.InfoHint.new("uploaded-on", _("Uploaded on"),
+                    None, details["date_uploaded"]))
+
+        return preview
+
+    def get_details(self, details_url):
+        """Get online video details for preview"""
+        details = []
+        if len(details_url) == 0:
+            print "Cannot get preview details, no details_url specified."
+            return details
+
+        if self._pending is not None:
+            self.session.cancel_message(self._pending,
+                                        Soup.KnownStatusCode.CANCELLED)
+
+        self._pending = Soup.Message.new("GET", details_url)
+        # Send a synchronous GET request for video metadata details
+        self.session.send_message(self._pending)
+        try:
+            details = json.loads(self._pending.response_body.data)
+        except ValueError:
+            print "Error: got garbage json from the server"
+        except TypeError:
+            print "Error: failed to connect to videosearch server to retrieve details."
+
+        return details
+
+    def play_video (self, action, uri):
+        """Preview request - Play action handler"""
+        return self.on_activate_uri (action, uri)
+
+    def zeitgeist_insert_event(self, uri, title, icon):
+        """Insert item uri as a new Zeitgeist event"""
+        # "storage" is an optional zg string 
+        # we use is to host the icon link. 
+        # Storing it another way and referring to it lens side
+        # would be more elegant but much more expensive.
+        subject = Subject.new_for_values(
+            uri = uri,
+            interpretation=unicode(Interpretation.VIDEO),
+            manifestation=unicode(Manifestation.FILE_DATA_OBJECT.REMOTE_DATA_OBJECT),
+            origin=uri,
+            storage=icon,
+            text = title)
+        event = Event.new_for_values(
+            timestamp=int(time.time()*1000),
+            interpretation=unicode(Interpretation.ACCESS_EVENT),
+            manifestation=unicode(Manifestation.USER_ACTIVITY),
+            actor="lens://unity-lens-video",
+            subjects=[subject,])
+        ZGCLIENT.insert_event(event)
+
+def main():
+    """Connect to the session bus, exit if there is a running instance."""
+    try:
+        session_bus_connection = Gio.bus_get_sync(Gio.BusType.SESSION, None)
+        session_bus = Gio.DBusProxy.new_sync(session_bus_connection, 0, None,
+                                                'org.freedesktop.DBus',
+                                                '/org/freedesktop/DBus',
+                                                'org.freedesktop.DBus', None)
+        result = session_bus.call_sync('RequestName',
+                                        GLib.Variant("(su)", (BUS_NAME, 0x4)),
+                                        0, -1, None)
+
+        # Unpack variant response with signature "(u)". 1 means we got it.
+        result = result.unpack()[0]
+
+        if result != 1:
+            print >> sys.stderr, "Failed to own name %s. Bailing out." % BUS_NAME
+            raise SystemExit(1)
+    except:
+        raise SystemExit(1)
+
+    Daemon()
+    GObject.MainLoop().run()
+
+if __name__ == "__main__":
+    main()

=== added file 'unity-scope-video-remote.service'
--- unity-scope-video-remote.service	1970-01-01 00:00:00 +0000
+++ unity-scope-video-remote.service	2012-09-14 09:38:18 +0000
@@ -0,0 +1,3 @@
+[D-BUS Service]
+Name=net.launchpad.scope.RemoteVideos
+Exec=/usr/lib/unity-scope-video-remote/unity-scope-video-remote

=== added file 'video-remote.scope'
--- video-remote.scope	1970-01-01 00:00:00 +0000
+++ video-remote.scope	2012-09-14 09:38:18 +0000
@@ -0,0 +1,3 @@
+[Scope]
+DBusName=net.launchpad.scope.RemoteVideos
+DBusPath=/net/launchpad/scope/remotevideos