Merge branch 'release/0.12.1'

-

.gitignore

@@ -23,8 +23,13 @@ dropin.cache
 _trial_temp
 *.komodoproject
 docs/_build*
-apiserver/metadata/imdbhandler.py
-apiserver/metadata/malhandler.py
-apiserver/services/search.py
-apiserver/services/control.py
-apiserver/services/files.py
+.env*
+EGG-INFO
+
+# for bundling
+thomas
+six.py
+rarfile.py
+rfc6266.py
+lepl
+pytz

LICENSE

@@ -0,0 +1,634 @@
+Deluge-Streaming is licensed under the GNU General Public License version
+3 with the addition of the following special exception:
+
+In addition, as a special exception, the copyright holders give
+permission to link the code of portions of this program with the OpenSSL
+library.
+You must obey the GNU General Public License in all respects for all of
+the code used other than OpenSSL. If you modify file(s) with this
+exception, you may extend this exception to your version of the file(s),
+but you are not obligated to do so. If you do not wish to do so, delete
+this exception statement from your version. If you delete this exception
+statement from all source files in the program, then also delete it here.
+
+                    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

README.md

@@ -1,7 +1,7 @@
 # Streaming Plugin
 https://github.com/JohnDoee/deluge-streaming
 
-(c)2015 by Anders Jensen <johndoee@tidalstream.org>
+(c)2020 by Anders Jensen <johndoee@tridentstream.org>
 
 ## Description
 
@@ -11,6 +11,11 @@ the user to stream a file using HTTP.
 Technically, it tries to download the part of a file the user requests and
 downloads ahead, this enables seeking in video files.
 
+## Where to download
+
+You can download this release on Github. Look for the "releases" tab on the repository page.
+Under that tab, eggs for Python 2.6 and 2.7 should exist.
+
 ## How to use
 
 * Install plugin
@@ -18,26 +23,166 @@ downloads ahead, this enables seeking in video files.
 * Select _files_ tab
 * Right-click a file.
 * Click _Stream this file_
-* **WAIT**, it will try to buffer the first pieces of the file before generating a link (no feedback yet).
 * Select the link, open it in a media player, e.g. VLC or MPC
 
 If you want to stream from a non-local computer, e.g. your seedbox, you will need to change the IP in option to the external server ip.
 
+## Open directly in your video player
+
+By using a small tool it is possible to it's possible to open streams directly in VLC or another media player.
+
+* Download and install [StreamProtocol](http://streamprotocol.tidalstream.org/)
+* Go into Deluge Streaming options and enable "Use stream protocol urls"
+* Optional, if you want to skip the popup and open streams directly when ready, enable "Auto-open stream protocol urls"
+
 ## Motivation
 
 The plugin is not meant to be used as a right-click to stream thing. The idea is to
-make Deluge an abstraction layer for the [TidalStream](http://www.tidalstream.org/) project, i.e. torrents to http on demand.
+make Deluge an abstraction layer for the [Tidalstream](http://www.tidalstream.org/) project, i.e. torrents to http on demand.
 
 The _allow remote_ option is to allow remote add and stream of torrents.
 
-## ToDo
+## Todo
 
-* Add support for the WebUI
-* There are a few situations where an uncaught exception is thrown.
-* Add feedback when preparing stream.
+* [ ] Better feedback in interface about streams
+* [ ] Better feedback when using API
+* [ ] Fix problems when removing torrent from Deluge (sea of errors)
+
+# Important Deluge 2 information
+
+While developing the Deluge 2 version of this plugin I hit a few problems that might be visible for you too.
+
+* When shutting down Deluge an exception / error happens every time, this bug is reported.
+* Sometimes the Web UI does not load plugins correctly, try restarting Deluge and refresh your browser if this happens.
+
+# HTTP API Usage
+
+## Prerequisite
+
+Install and enable the plugin. Afterwards, head into Streaming settings and enable "Allow remote control".
+The URL found in the "Remote control url" field is where the API can be reached. The auth used is Basic Auth.
+
+## Usage
+
+There is only one end-point and that is where a torrent stream can be requested.
+
+Both return the same responses and all responses are JSON encoded.
+All successfully authenticated responses have status code 200.
+
+## POST /streaming/stream
+
+POST body must be the raw torrent you want to stream. No form formatting or anything can be used.
+
+List of URL GET Arguments
+
+* **path**: Path inside the torrent file to either a folder or a file you want to stream. The plugin will try to guess the best one. **Optional**. **Default**: '' (i.e. find the best file in the whole torrent)
+* **infohash**: Infohash of the torrent you want to stream, can make it a bit faster as it can avoid reading POST body. **Optional**.
+* **label**: If label plugin is enabled and the torrent is actually added then give the torrent this label. **Optional**. **Default**: ''
+* **wait_for_end_pieces**: Wait for the first and last piece in the streamed file to be fully downloaded. Can be necessary for some video players. It also enforces that the torrent can be actually downloaded. If the key exist with any (even empty) value, the feature is enabled. **Optional**. **Default**: false
+
+## GET /streaming/stream
+
+* **infohash**: Does the same as when POSTed. **Mandatory**.
+* **path**: Does the same as when POSTed. **Optional**.
+* **wait_for_end_pieces**: Does the same as when POSTed. **Optional**.
+
+## Success Response
+
+```json
+{
+    "status": "success", # Always equals this
+    "filename" "horse.mkv", # Filename of the streamed torrent
+    "url": "http://example.com/" # URL where the file can be reached by e.g. a media player
+}
+```
+
+## Error Response
+
+```json
+{
+    "status": "error", # Always equals this
+    "message" "Torrent failed" # description for why it failed
+}
+```
 
 # Version Info
 
+## Version 0.12.0
+
+* Fixed small breaking bug
+
+## Version 0.12.0
+
+* Moved to reading pieces through Deluge to avoid unflushed data
+* Fixed Deluge 2 / libtorrent related bug
+
+## Version 0.11.0
+* Initial support for Deluge 2 / Python 3
+* Added support for aggressive piece prioritization when it should not be necessary.
+* Fixed bug related to paused torrent with no data downloaded.
+
+## Version 0.10.5
+* Added support for serving files inline
+
+## Version 0.10.4
+* Trying to set max priority less as it destroys performance
+
+## Version 0.10.3
+* Added label support
+* Reverse proxy config / replace URL config
+* Ensure internal Deluge state is updated before trying to use it
+
+## Version 0.10.2
+* Busting cache when waiting for piece
+* Math error in calculating size of readable bytes
+
+## Version 0.10.1
+* Small bugfixes related to priorities, should actually make sequential download work.
+
+## Version 0.10.0
+* Rewrote large parts of the code
+* Now using [thomas](https://github.com/JohnDoee/thomas) as file-reading core - this adds support for multi-rar streaming.
+* Faster streaming by reading directly from disk
+* Reverse proxy mode
+
+## Version 0.9.0
+* Few bugfixes
+* Added support for Deluge 2
+
+## Version 0.8.1
+* Fixed some small problems and bugs
+* better URL execution with GTKUI
+
+## Version 0.8.0
+* Improved remote control of streaming to make it work as originally intended.
+
+## Version 0.7.1
+* Trying to fix bug where piece buffer went empty
+* Added support for SSL.
+
+## Version 0.7.0
+* Shrinked code by redoing queue algorithm. This should prevent more stalled downloads and allow it to act bittorrenty if necessary.
+* Added support for waiting for end pieces to satisfy some video players (KODI)
+
+## Version 0.6.1
+* Should not have been in changelog: Fixed "resume on complete" broken-ness (i hope)
+
+## Version 0.6.0
+* Fixed URL encoding error
+* Fixed "resume on complete" broken-ness (i hope)
+* Changed default to not use stream urls
+
+## Version 0.5.0
+* Restructured the whole plugin
+* Added support for StreamProtocol
+
+## Version 0.4.1
+* Fixed bug with old Deluge versions
+
+## Version 0.4.0
+* Added WebUI support
+* Improved scheduling algorithm
+
 ## Version 0.3
 * Fixed bug when streaming multiple files.
 * Changed to try to prioritize end pieces more aggressively to not leave them hanging.
@@ -48,4 +193,4 @@ The _allow remote_ option is to allow remote add and stream of torrents.
 * Improved buffering algorithm, not using only deadline anymore.
 
 ## Version 0.1
-* Initial working release
+* Initial working release

create-egg2.sh

@@ -0,0 +1,9 @@
+virtualenv .env-egg2
+.env-egg2/bin/pip install -U thomas
+ln -s .env-egg2/lib/python*/site-packages/thomas .
+ln -s .env-egg2/lib/python*/site-packages/rarfile.py .
+ln -s .env-egg2/lib/python*/site-packages/six.py .
+ln -s .env-egg2/lib/python*/site-packages/rfc6266.py .
+ln -s .env-egg2/lib/python*/site-packages/lepl .
+ln -s .env-egg2/lib/python*/site-packages/pytz .
+.env-egg2/bin/python setup.py bdist_egg

create-egg3.sh

@@ -0,0 +1,9 @@
+python3 -m venv .env-egg3
+.env-egg3/bin/pip install -U thomas
+ln -s .env-egg3/lib/python*/site-packages/thomas .
+ln -s .env-egg3/lib/python*/site-packages/rarfile.py .
+ln -s .env-egg3/lib/python*/site-packages/six.py .
+ln -s .env-egg3/lib/python*/site-packages/rfc6266.py .
+ln -s .env-egg3/lib/python*/site-packages/lepl .
+ln -s .env-egg3/lib/python*/site-packages/pytz .
+.env-egg3/bin/python setup.py bdist_egg

examples/cli-stream/README.md

@@ -0,0 +1,23 @@
+# Commandline Tool to stream
+
+Stream from the commandline.
+
+## Requirements
+
+* Python
+* deluge_client python package
+
+## Installation example
+
+```bash
+virtualenv cli-example
+cli-example/bin/pip install deluge_client
+```
+
+## Usage
+
+Open a torrent directly in VLC on Linux or OSX.
+
+```bash
+vlc `cli-example/bin/python stream-cli.py username password my_video.torrent`
+```

examples/cli-stream/stream-cli.py

@@ -0,0 +1,28 @@
+import argparse
+import urllib
+
+from deluge_client import DelugeRPCClient
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description='Stream something.')
+    parser.add_argument('username', type=str, help='Deluge username')
+    parser.add_argument('password', type=str, help='Deluge password')
+    parser.add_argument('path_or_url', type=str, help='Path or URL to torrent')
+
+    parser.add_argument('--hostname', '-o', type=str, default='localhost', help='Deluge daemon hostname or ip')
+    parser.add_argument('--port', '-p', type=int, default=58846, help='Deluge daemon port')
+
+    args = parser.parse_args()
+
+    if args.path_or_url.startswith('http'):
+        filedata = urllib.urlopen(args.path_or_url).read()
+    else:
+        with open(args.path_or_url, 'rb') as f:
+            filedata = f.read()
+
+    client = DelugeRPCClient(args.hostname, args.port, args.username, args.password)
+    client.connect()
+
+    result = client.streaming.stream_torrent(None, None, filedata, None, None, True)
+    print(result['url'])

examples/http-api/README.md

@@ -0,0 +1,33 @@
+# HTTP API
+
+Stream using the HTTP API built into Deluge Streaming.
+
+## Requirements
+
+* Python
+* requests package
+
+## Config
+
+You need to enable HTTP API in Deluge Streaming config.
+
+## Example
+
+```python
+from streamtorrent import stream_torrent
+
+if __name__ == '__main__':
+    with open('TPB.AFK.2013.1080p.h264-SimonKlose', 'rb') as f:
+        torrent_data = f.read()
+
+    # Stream 1080p TPB AFK using infohash to avoid posting the torrent
+    # if it already exist.
+    url = stream_torrent(
+        'http://stream:password@127.0.0.1:46123/streaming/stream',
+        infohash='411a7a164505636ab1a8276395b375a3a30bff32',
+        torrent_body=torrent_data,
+        label='tpbafk'
+    )
+    print('we can stream %s' % (url, ))
+```
+

examples/http-api/streamtorrent.py

@@ -0,0 +1,96 @@
+import argparse
+
+import requests
+
+class FailedToStreamException(Exception):
+    pass
+
+
+def stream_torrent(remote_control_url, infohash=None, path=None, wait_for_end_pieces=True, label=None, torrent_body=None):
+    """
+    Add a torrent to deluge, stream it and return a URL to where it can be watched.
+
+    All optional parameters are optional but you will need to at least provide an infohash (if the torrent is already added)
+    or a torrent_body (if you want the torrent added).
+
+    remote_control_url - The URL found in Deluge Streaming config
+    infohash - Torrent infohash, makes it faster if the torrent is already added
+    path - path inside the torrent you want to stream
+    wait_for_end_pieces - make sure the first and last piece are downloaded before returning url.
+                          This might be necessary for some players
+    label - Label to set in deluge
+    torrent_body - The content of the .torrent file you want to stream
+    """
+    first_part, second_part = remote_control_url.split('@')
+    username, password = first_part.split('/')[2].split(':')
+    url = '/'.join(first_part.split('/')[:2]) + '/' + second_part
+
+    params = {}
+    if infohash:
+        params['infohash'] = infohash
+
+    if wait_for_end_pieces:
+        params['wait_for_end_pieces'] = wait_for_end_pieces
+
+    if path:
+        params['path'] = path
+
+    if label:
+        params['label'] = label
+
+    if infohash: # try to stream it without posting torrent body first
+        r = requests.get(url, auth=(username, password), params=params)
+        if r.status_code != 200:
+            raise FailedToStreamException('Got non-200 error code from Deluge')
+
+        data = r.json()
+        if data['status'] == 'success':
+            return data['url']
+        else:
+            raise FailedToStreamException('Request failed: %r' % (data, ))
+
+    if torrent_body:
+        r = requests.post(url, auth=(username, password), params=params, data=torrent_body)
+        if r.status_code != 200:
+            raise FailedToStreamException('Got non-200 error code from Deluge')
+
+        data = r.json()
+        if data['status'] == 'success':
+            return data['url']
+        else:
+            raise FailedToStreamException('Request failed: %r' % (data, ))
+
+    raise FailedToStreamException('Streaming was never successful')
+
+
+if __name__ == '__main__':
+    parser = argparse.ArgumentParser(description="Stream some torrents")
+    parser.add_argument('url', help="Full API Url including auth info")
+    parser.add_argument('--infohash', nargs='?', help="Infohash of torrent to stream")
+    parser.add_argument('--path', nargs='?', help="Path to file within the torrent to stream")
+    parser.add_argument('--label', nargs='?', help="Label to add the torrent with")
+    parser.add_argument('--torrent', nargs='?', help="Path to the torrent to stream", type=argparse.FileType(mode='rb'))
+    parser.add_argument('--skip_wait_for_end_pieces', help="Wait until client downloaded the first and last piece of the torrent", action='store_false')
+
+
+    args = parser.parse_args()
+
+    kwargs = {
+        'remote_control_url': args.url,
+        'wait_for_end_pieces': args.skip_wait_for_end_pieces
+    }
+
+    if args.infohash:
+        kwargs['infohash'] = args.infohash
+
+    if args.path:
+        kwargs['path'] = args.path
+
+    if args.label:
+        kwargs['label'] = args.label
+
+    if args.torrent:
+        kwargs['torrent_body'] = args.torrent.read()
+
+    result = stream_torrent(**kwargs)
+    print('URL %s' % (result, ))

setup.py

@@ -37,12 +37,12 @@
 #    statement from all source files in the program, then also delete it here.
 #
 
-from setuptools import setup
+from setuptools import setup, find_packages
 
 __plugin_name__ = "Streaming"
-__author__ = "John Doee"
-__author_email__ = "johndoee@tidalstream.org"
-__version__ = "0.3.1"
+__author__ = "Anders Jensen"
+__author_email__ = "johndoee@tridentstream.org"
+__version__ = "0.12.1"
 __url__ = "https://github.com/JohnDoee/deluge-streaming"
 __license__ = "GPLv3"
 __description__ = "Enables streaming of files while downloading them."
@@ -59,12 +59,22 @@ downloads ahead, this enables seeking in video files.
 * Select _files_ tab
 * Right-click a file.
 * Click _Stream this file_
-* **WAIT**, it will try to buffer the first pieces of the file before generating a link (no feedback yet).
 * Select the link, open it in a media player, e.g. VLC or MPC
 
 If you want to stream from a non-local computer, e.g. your seedbox, you will need to change the IP in option to the external server ip."""
 __pkg_data__ = {__plugin_name__.lower(): ["template/*", "data/*"]}
 
+REQUIREMENTS_PACKAGES = [
+    'thomas',
+    'lepl',
+    'pytz',
+]
+
+REQUIREMENTS_MODULES = [
+    'rarfile',
+    'rfc6266',
+]
+
 setup(
     name=__plugin_name__,
     version=__version__,
@@ -74,8 +84,10 @@ setup(
     url=__url__,
     license=__license__,
     long_description=__long_description__ if __long_description__ else __description__,
+    # install_requires=REQUIREMENTS_PACKAGES,
 
-    packages=[__plugin_name__.lower()],
+    packages=[__plugin_name__.lower()] + ['%s.%s' % (x, y) for x in REQUIREMENTS_PACKAGES for y in find_packages(x)] + REQUIREMENTS_PACKAGES,
+    py_modules=REQUIREMENTS_MODULES,
     package_data = __pkg_data__,
 
     entry_points="""
@@ -83,7 +95,9 @@ setup(
     %s = %s:CorePlugin
     [deluge.plugin.gtkui]
     %s = %s:GtkUIPlugin
+    [deluge.plugin.gtk3ui]
+    %s = %s:Gtk3UIPlugin
     [deluge.plugin.web]
     %s = %s:WebUIPlugin
-    """ % ((__plugin_name__, __plugin_name__.lower())*3)
+    """ % ((__plugin_name__, __plugin_name__.lower())*4)
 )

streaming/__init__.py

@@ -39,20 +39,30 @@
 
 from deluge.plugins.init import PluginInitBase
 
+
 class CorePlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from core import Core as _plugin_cls
+        from .core import Core as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(CorePlugin, self).__init__(plugin_name)
 
+
 class GtkUIPlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from gtkui import GtkUI as _plugin_cls
+        from .gtkui import GtkUI as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(GtkUIPlugin, self).__init__(plugin_name)
 
+
+class Gtk3UIPlugin(PluginInitBase):
+    def __init__(self, plugin_name):
+        from .gtk3ui import Gtk3UI as PluginClass
+        self._plugin_cls = PluginClass
+        super(Gtk3UIPlugin, self).__init__(plugin_name)
+
+
 class WebUIPlugin(PluginInitBase):
     def __init__(self, plugin_name):
-        from webui import WebUI as _plugin_cls
+        from .webui import WebUI as _plugin_cls
         self._plugin_cls = _plugin_cls
         super(WebUIPlugin, self).__init__(plugin_name)

streaming/data/config.glade

@@ -1,158 +1,705 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!DOCTYPE glade-interface SYSTEM "glade-2.0.dtd">
-<!--Generated with glade3 3.4.5 on Fri Aug  8 23:34:44 2008 -->
+<?xml version="1.0" encoding="UTF-8"?>
 <glade-interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
   <widget class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
     <child>
-      <widget class="GtkHBox" id="prefs_box">
+      <widget class="GtkVBox" id="prefs_box">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <child>
-          <widget class="GtkVBox" id="label_box">
+          <widget class="GtkFrame" id="settings_frame">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-          
-          <child>
-          <widget class="GtkLabel" id="label_ip">
-            <property name="visible">True</property>
-            <property name="xalign">0</property>
-            <property name="label" translatable="yes">IP:</property>
-          </widget>
-            <packing>
-            <property name="position">0</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkLabel" id="label_port">
-              <property name="visible">True</property>
-              <property name="xalign">0</property>
-              <property name="label" translatable="yes">Port:</property>
-            </widget>
-            <packing>
-              <property name="position">1</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkLabel" id="label_reset_complete">
-              <property name="visible">True</property>
-              <property name="xalign">0</property>
-              <property name="label" translatable="yes">Reset "do not download" when streamed file is complete:</property>
-            </widget>
-            <packing>
-              <property name="position">2</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkLabel" id="label_allow_remote">
-              <property name="visible">True</property>
-              <property name="xalign">0</property>
-              <property name="label" translatable="yes">Allow remote control:</property>
-            </widget>
-            <packing>
-              <property name="position">3</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkLabel" id="label_remote_username">
-              <property name="visible">True</property>
-              <property name="xalign">0</property>
-              <property name="label" translatable="yes">Remote username:</property>
-            </widget>
-            <packing>
-              <property name="position">4</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkLabel" id="label_remote_password">
-              <property name="visible">True</property>
-              <property name="xalign">0</property>
-              <property name="label" translatable="yes">Remote password:</property>
-            </widget>
-            <packing>
-              <property name="position">5</property>
-            </packing>
-          </child>
-          
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <widget class="GtkAlignment" id="settings_alignment">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">10</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkVBox" id="settings_vbox">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkVBox" id="settings_vbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="input_download_only_streamed">
+                            <property name="label" translatable="yes">Download only streamed files, skip the other files</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </widget>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="settings_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
           </widget>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">0</property>
           </packing>
         </child>
         <child>
-          <widget class="GtkVBox" id="input_box">
+          <widget class="GtkFrame" id="serving_frame">
             <property name="visible">True</property>
-            <property name="orientation">vertical</property>
-          
-          <child>
-            <widget class="GtkEntry" id="input_ip">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-            </widget>
-            <packing>
-              <property name="position">0</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkEntry" id="input_port">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-            </widget>
-            <packing>
-              <property name="position">1</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkCheckButton" id="input_reset_complete">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-            </widget>
-            <packing>
-              <property name="position">2</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkCheckButton" id="input_allow_remote">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-            </widget>
-            <packing>
-              <property name="position">3</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkEntry" id="input_remote_username">
-              <property name="visible">True</property>
-              <property name="can_focus">True</property>
-            </widget>
-            <packing>
-              <property name="position">4</property>
-            </packing>
-          </child>
-          
-          <child>
-            <widget class="GtkEntry" id="input_remote_password">
-              <property name="visible">True</property>
-              <property name="visibility">False</property>
-              <property name="can_focus">True</property>
-            </widget>
-            <packing>
-              <property name="position">5</property>
-            </packing>
-          </child>
-          
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <widget class="GtkAlignment" id="settings_alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">10</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkVBox" id="settings_vbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <widget class="GtkLabel" id="remote_username_label2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Hostname: </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="input_ip">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <widget class="GtkLabel" id="remote_username_label3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Port: </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="input_port">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">•</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox54">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="input_reverse_proxy_enabled">
+                          <property name="label" translatable="yes">Enable Reverse Proxy</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkHBox" id="hbox55">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <widget class="GtkLabel" id="reverse_proxy_base_url_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Reverse Proxy Base Url: </property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkEntry" id="input_reverse_proxy_base_url">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <!-- <child>
+                      <widget class="GtkRadioButton" id="input_serve_webui">
+                        <property name="label" translatable="yes">Serve files via WebUI</property>
+                        <property name="visible">False</property>
+                        <property name="sensitive">False</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="active">True</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child> -->
+                    <child>
+                      <widget class="GtkVBox" id="settings_vbox3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <!-- <child>
+                          <widget class="GtkRadioButton" id="input_serve_standalone">
+                            <property name="label" translatable="yes">Serve files via standalone</property>
+                            <property name="visible">False</property>
+                            <property name="sensitive">False</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="active">True</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">input_serve_webui</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child> -->
+                        <child>
+                          <widget class="GtkAlignment" id="remote_alignment1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <!-- <property name="left_padding">20</property> -->
+                            <child>
+                              <widget class="GtkVBox" id="remote_vbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <widget class="GtkCheckButton" id="input_use_ssl">
+                                    <property name="label" translatable="yes">Use SSL</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkAlignment" id="alignment1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="left_padding">20</property>
+                                    <child>
+                                      <widget class="GtkVBox" id="vbox1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <child>
+                                          <widget class="GtkRadioButton" id="input_ssl_cert_daemon">
+                                            <property name="label" translatable="yes">Use Daemon/WebUI Certificate</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkRadioButton" id="input_ssl_cert_custom">
+                                            <property name="label" translatable="yes">Custom Certificate</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">input_ssl_cert_daemon</property>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <widget class="GtkAlignment" id="alignment2">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="left_padding">20</property>
+                                            <child>
+                                              <widget class="GtkVBox" id="vbox2">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <child>
+                                                  <widget class="GtkLabel" id="label1">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Private key file path</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkEntry" id="input_ssl_priv_key_path">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">•</property>
+                                                    <property name="primary_icon_activatable">False</property>
+                                                    <property name="secondary_icon_activatable">False</property>
+                                                    <property name="primary_icon_sensitive">True</property>
+                                                    <property name="secondary_icon_sensitive">True</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkLabel" id="label2">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Certificate and chains file path</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">2</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <widget class="GtkEntry" id="input_ssl_cert_path">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">•</property>
+                                                    <property name="primary_icon_activatable">False</property>
+                                                    <property name="secondary_icon_activatable">False</property>
+                                                    <property name="primary_icon_sensitive">True</property>
+                                                    <property name="secondary_icon_sensitive">True</property>
+                                                  </widget>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">3</property>
+                                                  </packing>
+                                                </child>
+                                              </widget>
+                                            </child>
+                                          </widget>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                      </widget>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="serving_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;File Serving Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
           </widget>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
+        <child>
+          <widget class="GtkFrame" id="settings_frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <widget class="GtkAlignment" id="settings_alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">10</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <widget class="GtkVBox" id="settings_vbox4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <widget class="GtkVBox" id="settings_vbox5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <widget class="GtkCheckButton" id="input_allow_remote">
+                            <property name="label" translatable="yes">Allow remote control</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <widget class="GtkAlignment" id="remote_alignment2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">32</property>
+                            <child>
+                              <widget class="GtkVBox" id="remote_vbox2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <!-- <child>
+                                  <widget class="GtkHBox" id="remote_username_hbox1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="remote_username_label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Remote control username:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="input_remote_username">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child> -->
+                                <child>
+                                  <widget class="GtkHBox" id="remote_password_hbox1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="remote_password_label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Remote control password:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="input_remote_password">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <widget class="GtkHBox" id="remote_url_hbox1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="remote_url_label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Remote control url:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="output_remote_url">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="editable">False</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </widget>
+                            </child>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="input_use_stream_urls">
+                        <property name="label" translatable="yes">Use stream protocol urls</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <widget class="GtkCheckButton" id="input_auto_open_stream_urls">
+                        <property name="label" translatable="yes">Auto-open stream protocol urls</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </widget>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                  </widget>
+                </child>
+              </widget>
+            </child>
+            <child>
+              <widget class="GtkLabel" id="settings_label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Advanced Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </widget>
+              <packing>
+                <property name="type">label_item</property>
+              </packing>
+            </child>
+          </widget>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
       </widget>
     </child>
   </widget>

streaming/data/config.ui

@@ -0,0 +1,708 @@
+<?xml version="1.0"?>
+<interface>
+  <!-- interface-requires gtk+ 2.16 -->
+  <!-- interface-naming-policy toplevel-contextual -->
+  <object class="GtkWindow" id="window1">
+    <property name="can_focus">False</property>
+    <child>
+      <object class="GtkVBox" id="prefs_box">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <child>
+          <object class="GtkFrame" id="settings_frame">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="settings_alignment">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">10</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkVBox" id="settings_vbox1">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkVBox" id="settings_vbox">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkCheckButton" id="input_download_only_streamed">
+                            <property name="label" translatable="yes">Download only streamed files, skip the other files</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="settings_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="serving_frame">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="settings_alignment1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">10</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkVBox" id="settings_vbox2">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkHBox" id="hbox1">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="remote_username_label2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Hostname: </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="input_ip">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">&#x2022;</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox2">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="remote_username_label3">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Port: </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="input_port">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="invisible_char">&#x2022;</property>
+                            <property name="invisible_char_set">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox54">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkCheckButton" id="input_reverse_proxy_enabled">
+                            <property name="label" translatable="yes">Enable Reverse Proxy</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkHBox" id="hbox55">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <child>
+                          <object class="GtkLabel" id="reverse_proxy_base_url_label">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes">Reverse Proxy Base Url: </property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkEntry" id="input_reverse_proxy_base_url">
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="primary_icon_activatable">False</property>
+                            <property name="secondary_icon_activatable">False</property>
+                            <property name="primary_icon_sensitive">True</property>
+                            <property name="secondary_icon_sensitive">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                    <!-- <child>
+                      <object class="GtkRadioButton" id="input_serve_webui">
+                        <property name="label" translatable="yes">Serve files via WebUI</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">True</property>
+                        <property name="fill">True</property>
+                        <property name="position">4</property>
+                      </packing>
+                    </child> -->
+                    <child>
+                      <object class="GtkVBox" id="settings_vbox3">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <!-- <child>
+                          <object class="GtkRadioButton" id="input_serve_standalone">
+                            <property name="label" translatable="yes">Serve files via standalone</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                            <property name="group">input_serve_webui</property>
+                          </object>
+                          <packing>
+                            <property name="expand">True</property>
+                            <property name="fill">True</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child> -->
+                        <child>
+                          <object class="GtkAlignment" id="remote_alignment1">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <!-- <property name="left_padding">20</property> -->
+                            <child>
+                              <object class="GtkVBox" id="remote_vbox1">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <child>
+                                  <object class="GtkCheckButton" id="input_use_ssl">
+                                    <property name="label" translatable="yes">Use SSL</property>
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">True</property>
+                                    <property name="receives_default">False</property>
+                                    <property name="use_action_appearance">False</property>
+                                    <property name="draw_indicator">True</property>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkAlignment" id="alignment1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="left_padding">20</property>
+                                    <child>
+                                      <object class="GtkVBox" id="vbox1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <child>
+                                          <object class="GtkRadioButton" id="input_ssl_cert_daemon">
+                                            <property name="label" translatable="yes">Use Daemon/WebUI Certificate</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">0</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkRadioButton" id="input_ssl_cert_custom">
+                                            <property name="label" translatable="yes">Custom Certificate</property>
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">True</property>
+                                            <property name="receives_default">False</property>
+                                            <property name="use_action_appearance">False</property>
+                                            <property name="active">True</property>
+                                            <property name="draw_indicator">True</property>
+                                            <property name="group">input_ssl_cert_daemon</property>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">1</property>
+                                          </packing>
+                                        </child>
+                                        <child>
+                                          <object class="GtkAlignment" id="alignment2">
+                                            <property name="visible">True</property>
+                                            <property name="can_focus">False</property>
+                                            <property name="left_padding">20</property>
+                                            <child>
+                                              <object class="GtkVBox" id="vbox2">
+                                                <property name="visible">True</property>
+                                                <property name="can_focus">False</property>
+                                                <child>
+                                                  <object class="GtkLabel" id="label1">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Private key file path</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">0</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="input_ssl_priv_key_path">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">&#x2022;</property>
+                                                    <property name="primary_icon_activatable">False</property>
+                                                    <property name="secondary_icon_activatable">False</property>
+                                                    <property name="primary_icon_sensitive">True</property>
+                                                    <property name="secondary_icon_sensitive">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">1</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkLabel" id="label2">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">False</property>
+                                                    <property name="xalign">0</property>
+                                                    <property name="label" translatable="yes">Certificate and chains file path</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">2</property>
+                                                  </packing>
+                                                </child>
+                                                <child>
+                                                  <object class="GtkEntry" id="input_ssl_cert_path">
+                                                    <property name="visible">True</property>
+                                                    <property name="can_focus">True</property>
+                                                    <property name="invisible_char">&#x2022;</property>
+                                                    <property name="primary_icon_activatable">False</property>
+                                                    <property name="secondary_icon_activatable">False</property>
+                                                    <property name="primary_icon_sensitive">True</property>
+                                                    <property name="secondary_icon_sensitive">True</property>
+                                                  </object>
+                                                  <packing>
+                                                    <property name="expand">True</property>
+                                                    <property name="fill">True</property>
+                                                    <property name="position">3</property>
+                                                  </packing>
+                                                </child>
+                                              </object>
+                                            </child>
+                                          </object>
+                                          <packing>
+                                            <property name="expand">True</property>
+                                            <property name="fill">True</property>
+                                            <property name="position">2</property>
+                                          </packing>
+                                        </child>
+                                      </object>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">True</property>
+                                    <property name="fill">True</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">5</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="serving_label">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;File Serving Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkFrame" id="settings_frame1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="label_xalign">0</property>
+            <property name="shadow_type">none</property>
+            <child>
+              <object class="GtkAlignment" id="settings_alignment2">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="top_padding">10</property>
+                <property name="left_padding">12</property>
+                <child>
+                  <object class="GtkVBox" id="settings_vbox4">
+                    <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="spacing">5</property>
+                    <child>
+                      <object class="GtkVBox" id="settings_vbox5">
+                        <property name="visible">True</property>
+                        <property name="can_focus">False</property>
+                        <property name="spacing">5</property>
+                        <child>
+                          <object class="GtkCheckButton" id="input_allow_remote">
+                            <property name="label" translatable="yes">Allow remote control</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_action_appearance">False</property>
+                            <property name="draw_indicator">True</property>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
+                        <child>
+                          <object class="GtkAlignment" id="remote_alignment2">
+                            <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="left_padding">32</property>
+                            <child>
+                              <object class="GtkVBox" id="remote_vbox2">
+                                <property name="visible">True</property>
+                                <property name="can_focus">False</property>
+                                <property name="spacing">5</property>
+                                <!-- <child>
+                                  <widget class="GtkHBox" id="remote_username_hbox1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <widget class="GtkLabel" id="remote_username_label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Remote control username:</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <widget class="GtkEntry" id="input_remote_username">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">•</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </widget>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </widget>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">0</property>
+                                  </packing>
+                                </child> -->
+                                <child>
+                                  <object class="GtkHBox" id="remote_password_hbox1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" id="remote_password_label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Remote control password:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="input_remote_password">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="visibility">True</property>
+                                        <property name="invisible_char">&#x2022;</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">1</property>
+                                  </packing>
+                                </child>
+                                <child>
+                                  <object class="GtkHBox" id="remote_url_hbox1">
+                                    <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
+                                    <property name="spacing">5</property>
+                                    <child>
+                                      <object class="GtkLabel" id="remote_url_label1">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">False</property>
+                                        <property name="label" translatable="yes">Remote control url:</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">False</property>
+                                        <property name="fill">False</property>
+                                        <property name="position">0</property>
+                                      </packing>
+                                    </child>
+                                    <child>
+                                      <object class="GtkEntry" id="output_remote_url">
+                                        <property name="visible">True</property>
+                                        <property name="can_focus">True</property>
+                                        <property name="invisible_char">&#x2022;</property>
+                                        <property name="invisible_char_set">True</property>
+                                        <property name="primary_icon_activatable">False</property>
+                                        <property name="secondary_icon_activatable">False</property>
+                                        <property name="primary_icon_sensitive">True</property>
+                                        <property name="secondary_icon_sensitive">True</property>
+                                        <property name="editable">False</property>
+                                      </object>
+                                      <packing>
+                                        <property name="expand">True</property>
+                                        <property name="fill">True</property>
+                                        <property name="position">1</property>
+                                      </packing>
+                                    </child>
+                                  </object>
+                                  <packing>
+                                    <property name="expand">False</property>
+                                    <property name="fill">False</property>
+                                    <property name="position">2</property>
+                                  </packing>
+                                </child>
+                              </object>
+                            </child>
+                          </object>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">1</property>
+                          </packing>
+                        </child>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">0</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="input_use_stream_urls">
+                        <property name="label" translatable="yes">Use stream protocol urls</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">1</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="input_auto_open_stream_urls">
+                        <property name="label" translatable="yes">Auto-open stream protocol urls</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">2</property>
+                      </packing>
+                    </child>
+                    <child>
+                      <object class="GtkCheckButton" id="input_aggressive_prioritizing">
+                        <property name="label" translatable="yes">Aggressive prioritizing</property>
+                        <property name="visible">True</property>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
+                        <property name="use_action_appearance">False</property>
+                        <property name="draw_indicator">True</property>
+                      </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">False</property>
+                        <property name="position">3</property>
+                      </packing>
+                    </child>
+                  </object>
+                </child>
+              </object>
+            </child>
+            <child type="label">
+              <object class="GtkLabel" id="settings_label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="label" translatable="yes">&lt;b&gt;Advanced Settings&lt;/b&gt;</property>
+                <property name="use_markup">True</property>
+              </object>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">2</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

streaming/data/streaming.js

@@ -31,20 +31,418 @@ Copyright:
     statement from all source files in the program, then also delete it here.
 */
 
+PreferencePage = Ext.extend(Ext.Panel, {
+    title: 'Streaming',
+    border: false,
+    layout: 'form',
+    header: false,
+    autoScroll: true,
+    autoHeight: true,
+    width: 320,
+    _fields: {},
+
+    initComponent: function() {
+        PreferencePage.superclass.initComponent.call(this);
+
+        var om = this.optionsManager = new Deluge.OptionsManager();
+        this.on('show', this.onPageShow, this);
+
+        var fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: 'Settings',
+            style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelAlign: 'top',
+            labelWidth: 150,
+            width: 300,
+            defaultType: 'textfield',
+            defaults: {
+                width: 280,
+            }
+        });
+
+        om.bind('download_only_streamed', fieldset.add({
+            xtype: 'checkbox',
+            name: 'download_only_streamed',
+            boxLabel: 'Download only streamed files, skip the other files',
+        }));
+
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: 'File Serving Settings',
+            style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelAlign: 'top',
+            labelWidth: 150,
+            width: 280,
+            defaultType: 'textfield',
+            defaults: {
+                width: 260,
+            }
+        });
+
+        om.bind('ip', fieldset.add({
+            name: 'ip',
+            fieldLabel: 'Hostname',
+        }));
+
+        om.bind('port', fieldset.add({
+            name: 'port',
+            fieldLabel: _('Port'),
+            decimalPrecision: 0,
+            minValue: -1,
+            maxValue: 99999,
+        }));
+
+        var field = fieldset.add({
+            xtype: 'togglefield',
+            name: 'reverse_proxy_base_url',
+            fieldLabel: 'Reverse Proxy Config',
+        });
+
+        om.bind('reverse_proxy_enabled', field.toggle);
+        om.bind('reverse_proxy_base_url', field.input);
+
+        fieldset = this.add({
+			xtype: 'fieldset',
+			border: false,
+			autoHeight: true,
+			defaultType: 'radio',
+			style: 'margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;',
+			width: 280,
+            labelWidth: 1
+		});
+
+        this._fields['serve_method_webui'] = fieldset.add({
+            name: 'serve_method',
+            boxLabel: 'Serve files via WebUI',
+            inputValue: 'webui',
+            disabled: true
+        });
+
+        om.bind('serve_method', this._fields['serve_method_webui']);
+
+        this._fields['serve_method_standalone'] = fieldset.add({
+            name: 'serve_method',
+            boxLabel: 'Serve files via standalone',
+            inputValue: 'standalone',
+            disabled: true
+        });
+        om.bind('serve_method', this._fields['serve_method_standalone']);
+
+
+        om.bind('use_ssl', fieldset.add({
+            xtype: 'checkbox',
+            name: 'use_ssl',
+            boxLabel: 'Use SSL',
+            style: 'margin-left: 12px;'
+        }));
+
+        fieldset = this.add({
+			xtype: 'fieldset',
+			border: false,
+			autoHeight: true,
+			defaultType: 'radio',
+			style: 'margin-left: 24px; margin-bottom: 5px; margin-top: 0; padding-bottom: 5px; padding-top: 0;',
+			width: 280,
+            labelWidth: 1
+		});
+
+        this._fields['ssl_source_daemon'] = fieldset.add({
+            name: 'ssl_source',
+            boxLabel: 'Use Daemon/WebUI Certificate',
+            inputValue: 'daemon',
+            value: 'daemon'
+        })
+        om.bind('ssl_source', this._fields['ssl_source_daemon']);
+
+        this._fields['ssl_source_custom'] = fieldset.add({
+            name: 'ssl_source',
+            boxLabel: 'Custom Certificate',
+            inputValue: 'custom',
+            value: 'custom'
+        });
+        om.bind('ssl_source', this._fields['ssl_source_custom']);
+
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            style: 'margin-left: 24px; margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelWidth: 110,
+            defaultType: 'textfield',
+            defaults: {
+                width: 130,
+            }
+        });
+
+        om.bind('ssl_priv_key_path', fieldset.add({
+            name: 'ssl_priv_key_path',
+            fieldLabel: 'Private key file path',
+        }));
+
+        om.bind('ssl_cert_path', fieldset.add({
+            name: 'ssl_cert_path',
+            fieldLabel: 'Certificate and chains file path',
+        }));
+
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            title: 'Advanced settings',
+            style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelAlign: 'top',
+            labelWidth: 150,
+            width: 280,
+            defaultType: 'textfield',
+            defaults: {
+                width: 260,
+            }
+        });
+
+        om.bind('allow_remote', fieldset.add({
+            xtype: 'checkbox',
+            name: 'allow_remote',
+            boxLabel: 'Allow remote control',
+            style: 'margin-left: 12px;',
+            width: 150
+        }));
+
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelAlign: 'top',
+            labelWidth: 150,
+            width: 260,
+            defaultType: 'textfield',
+            defaults: {
+                width: 240,
+            }
+        });
+
+        // om.bind('remote_username', fieldset.add({
+        //     xtype: 'textfield',
+        //     name: 'remote_username',
+        //     fieldLabel: 'Remote control username'
+        // }));
+
+        om.bind('remote_password', fieldset.add({
+            xtype: 'textfield',
+            name: 'remote_password',
+            fieldLabel: 'Remote control password'
+        }));
+
+        fieldset.add({
+            xtype: 'textfield',
+            id: 'remote_url',
+            name: 'remote_url',
+            readOnly: true,
+            fieldLabel: 'Remote control url'
+        });
+
+        fieldset = this.add({
+            xtype: 'fieldset',
+            border: false,
+            style: 'margin-bottom: 0px; padding-bottom: 0px; padding-top: 5px',
+            autoHeight: true,
+            labelWidth: 1,
+            defaultType: 'textfield',
+            defaults: {
+                width: 200,
+            }
+        });
+
+        om.bind('use_stream_urls', fieldset.add({
+            xtype: 'checkbox',
+            name: 'use_stream_urls',
+            boxLabel: 'Use stream protocol urls',
+            style: 'margin-left: 12px;'
+        }));
+
+        om.bind('auto_open_stream_urls', fieldset.add({
+            xtype: 'checkbox',
+            name: 'auto_open_stream_urls',
+            boxLabel: 'Auto-open stream protocol urls',
+            style: 'margin-left: 12px;'
+        }));
+
+        om.bind('aggressive_prioritizing', fieldset.add({
+            xtype: 'checkbox',
+            name: 'aggressive_prioritizing',
+            boxLabel: 'Aggressive prioritizing',
+            style: 'margin-left: 12px;'
+        }));
+    },
+
+    onApply: function() {
+
+        var changed = this.optionsManager.getDirty();
+        for (var key in this._fields) {
+            if (this._fields.hasOwnProperty(key)) {
+                var v = this._fields[key];
+                if (v.checked) {
+                    changed[v.name] = v.inputValue;
+                }
+            }
+        }
+        if (!Ext.isObjectEmpty(changed)) {
+            deluge.client.streaming.set_config(changed, {
+                success: this.onSetConfig,
+                scope: this
+            });
+
+            for (var key in deluge.config) {
+                deluge.config[key] = this.optionsManager.get(key);
+            }
+        }
+    },
+
+    onSetConfig: function(result) {
+        this.optionsManager.commit();
+        if (result) {
+            var message_type = result[0];
+            var message_class = result[1];
+            var message = result[2];
+            if (message_type == 'error') {
+                var topic = 'Unknown error type'
+                if (message_class == 'ssl') {
+                    topic = 'SSL Failed'
+                }
+                Ext.Msg.alert(topic, message);
+            }
+        }
+        this.updateRemoteUrl(this.optionsManager);
+    },
+
+    onGotConfig: function(config) {
+        this.optionsManager.set(config);
+        this.updateRemoteUrl(this.optionsManager);
+    },
+
+    onPageShow: function() {
+        deluge.client.streaming.get_config({
+            success: this.onGotConfig,
+            scope: this
+        })
+    },
+
+    updateRemoteUrl: function(optionsManager) {
+        var apiUrl = 'http';
+        if (optionsManager.get('use_ssl'))
+            apiUrl += 's';
+        apiUrl += '://' + optionsManager.get('remote_username') + ':' + optionsManager.get('remote_password') + '@' + optionsManager.get('ip') + ':' + optionsManager.get('port') + '/streaming/stream';
+        Ext.getCmp('remote_url').setValue(apiUrl);
+    }
+});
+
 StreamingPlugin = Ext.extend(Deluge.Plugin, {
-	constructor: function(config) {
-		config = Ext.apply({
-			name: "Streaming"
-		}, config);
-		StreamingPlugin.superclass.constructor.call(this, config);
-	},
+    'name': 'Streaming',
 
 	onDisable: function() {
+        deluge.menus.filePriorities.remove('streamthis');
 
+        deluge.preferences.selectPage(_('Plugins'));
+        deluge.preferences.removePage(this.prefsPage);
+        this.prefsPage.destroy();
 	},
 
-	onEnable: function() {
+    onEnable: function() {
+        this.prefsPage = new PreferencePage();
+        deluge.preferences.addPage(this.prefsPage);
 
+        console.log('Streaming plugin loaded');
+        var doStream = function (tid, fileIndex, asInline) {
+            deluge.client.streaming.stream_torrent(tid, null, null, fileIndex, true, false, null, asInline, {
+                success: function (result) {
+                    if (result.status == 'success') {
+                        if (asInline) {
+                            window.open(result.url, '_blank');
+                        } else {
+                            var url = result.url;
+                            if (result.use_stream_urls) {
+                                url = 'stream+' + url;
+                                if (result.auto_open_stream_urls) {
+                                    window.location.assign(url);
+                                    return;
+                                }
+                            }
+                            Ext.Msg.alert('Stream ready', 'URL for stream: <a target="_blank" href="' + url + '">' + url + '</a>');
+                        }
+                    } else {
+                        Ext.Msg.alert('Stream failed', 'Error message: ' + result.message);
+                    }
+                }
+            })
+        }
+
+        var triggerStreamFile = function (asInline) {
+            var files = deluge.details.items.items[2];
+            var nodes = files.getSelectionModel().getSelectedNodes();
+            if (nodes) {
+                var fileIndex = nodes[0].attributes.fileIndex;
+                var tid = files.torrentId;
+                if (fileIndex >= 0) {
+                    doStream(tid, fileIndex, asInline);
+                }
+            }
+        }
+
+        deluge.menus.filePriorities.addMenuItem({
+            id: 'playthis',
+            text: 'Play in browser',
+            iconCls: 'icon-resume',
+            handler: function (item, event) {
+                deluge.menus.filePriorities.hide();
+                triggerStreamFile(true);
+                return false;
+            }
+        });
+
+        deluge.menus.filePriorities.addMenuItem({
+            id: 'streamthis',
+            text: 'Stream this file',
+            iconCls: 'icon-down',
+            handler: function (item, event) {
+                deluge.menus.filePriorities.hide();
+                triggerStreamFile(false);
+                return false;
+            }
+        });
+
+
+        var triggerStreamTorrent = function (asInline) {
+            var ids = deluge.torrents.getSelectedIds();
+            if (ids) {
+                doStream(ids[0], null, asInline);
+            }
+        }
+
+        deluge.menus.torrent.addMenuItem({
+            id: 'playthistorrent',
+            text: 'Play in browser',
+            iconCls: 'icon-resume',
+            handler: function (item, event) {
+                deluge.menus.torrent.hide();
+                triggerStreamTorrent(true);
+                return false;
+            }
+        });
+
+        deluge.menus.torrent.addMenuItem({
+            id: 'streamthistorrent',
+            text: 'Stream this torrent',
+            iconCls: 'icon-down',
+            handler: function (item, event) {
+                deluge.menus.torrent.hide();
+                triggerStreamTorrent(false);
+                return false;
+            }
+        });
 	}
 });
-new StreamingPlugin();
+Deluge.registerPlugin('Streaming', StreamingPlugin);

streaming/filelike.py

@@ -2,17 +2,18 @@ from twisted.internet import defer
 from twisted.python import log
 from twisted.web import http, resource, server, static
 
-#  NOTICE!
-# All these producers are taken directly from the Twisted Project.
-# This is because i needed to make them accept defers.
-# /NOTICE!
 
 class NoRangeStaticProducer(static.NoRangeStaticProducer):
     @defer.inlineCallbacks
     def resumeProducing(self):
         if not self.request:
             return
+
         data = yield defer.maybeDeferred(self.fileObject.read, self.bufferSize)
+
+        if not self.request:
+            return
+
         if data:
             # this .write will spin the reactor, calling .doWrite and then
             # .resumeProducing again, so be prepared for a re-entrant call
@@ -22,28 +23,36 @@ class NoRangeStaticProducer(static.NoRangeStaticProducer):
             self.request.finish()
             self.stopProducing()
 
+
 class SingleRangeStaticProducer(static.SingleRangeStaticProducer):
     @defer.inlineCallbacks
     def resumeProducing(self):
         if not self.request:
             return
-        data = yield defer.maybeDeferred(self.fileObject.read,
-            min(self.bufferSize, self.size - self.bytesWritten))
+
+        data = yield defer.maybeDeferred(self.fileObject.read, min(self.bufferSize, self.size - self.bytesWritten))
+
+        if not self.request:
+            return
+
         if data:
             self.bytesWritten += len(data)
             # this .write will spin the reactor, calling .doWrite and then
             # .resumeProducing again, so be prepared for a re-entrant call
             self.request.write(data)
+
         if self.request and self.bytesWritten == self.size:
             self.request.unregisterProducer()
             self.request.finish()
             self.stopProducing()
 
+
 class MultipleRangeStaticProducer(static.MultipleRangeStaticProducer):
     @defer.inlineCallbacks
     def resumeProducing(self):
         if not self.request:
             return
+
         data = []
         dataLength = 0
         done = False
@@ -52,9 +61,7 @@ class MultipleRangeStaticProducer(static.MultipleRangeStaticProducer):
                 dataLength += len(self.partBoundary)
                 data.append(self.partBoundary)
                 self.partBoundary = None
-            p = yield defer.maybeDeferred(self.fileObject.read,
-                min(self.bufferSize - dataLength,
-                    self._partSize - self._partBytesWritten))
+            p = yield defer.maybeDeferred(self.fileObject.read, min(self.bufferSize - dataLength, self._partSize - self._partBytesWritten))
             self._partBytesWritten += len(p)
             dataLength += len(p)
             data.append(p)
@@ -64,12 +71,19 @@ class MultipleRangeStaticProducer(static.MultipleRangeStaticProducer):
                 except StopIteration:
                     done = True
                     break
+
+        if not self.request:
+            return
+
         self.request.write(''.join(data))
+
         if done:
             self.request.unregisterProducer()
             self.request.finish()
+            self.stopProducing()
             self.request = None
 
+
 class FilelikeObjectResource(static.File):
     isLeaf = True
     contentType = None
@@ -141,6 +155,7 @@ class FilelikeObjectResource(static.File):
         producer = self.makeProducer(request, self.fileObject)
 
         if request.method == 'HEAD':
+            self.fileObject.close()
             return ''
 
         producer.start()

streaming/gtk3ui.py

@@ -0,0 +1,234 @@
+#
+# gtkui.py
+#
+# Copyright (C) 2009 John Doee <johndoee@tidalstream.org>
+#
+# Basic plugin template created by:
+# Copyright (C) 2008 Martijn Voncken <mvoncken@gmail.com>
+# Copyright (C) 2007-2009 Andrew Resch <andrewresch@gmail.com>
+# Copyright (C) 2009 Damien Churchill <damoxc@gmail.com>
+#
+# Deluge is free software.
+#
+# You may 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.
+#
+# deluge 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 deluge.    If not, write to:
+# 	The Free Software Foundation, Inc.,
+# 	51 Franklin Street, Fifth Floor
+# 	Boston, MA  02110-1301, USA.
+#
+#    In addition, as a special exception, the copyright holders give
+#    permission to link the code of portions of this program with the OpenSSL
+#    library.
+#    You must obey the GNU General Public License in all respects for all of
+#    the code used other than OpenSSL. If you modify file(s) with this
+#    exception, you may extend this exception to your version of the file(s),
+#    but you are not obligated to do so. If you do not wish to do so, delete
+#    this exception statement from your version. If you delete this exception
+#    statement from all source files in the program, then also delete it here.
+#
+
+import logging
+import os
+import sys
+import subprocess
+
+from gi.repository import Gtk
+from gi.repository.Gtk import MenuItem, SeparatorMenuItem
+
+import deluge.component as component
+from deluge.plugins.pluginbase import Gtk3PluginBase
+from deluge.ui.client import client
+from deluge.ui.gtk3 import dialogs
+from twisted.internet import defer, threads
+
+from .common import get_resource
+
+log = logging.getLogger(__name__)
+
+
+def execute_url(url):
+    if sys.platform == 'win32':
+        os.startfile(url)
+    elif sys.platform == 'darwin':
+        subprocess.Popen(['open', url])
+    else:
+        try:
+            subprocess.Popen(['xdg-open', url])
+        except OSError:
+            print('Unable to open URL %s' % (url, ))
+
+
+class Gtk3UI(Gtk3PluginBase):
+    def enable(self):
+        self.builder = Gtk.Builder()
+        self.builder.add_from_file(get_resource('config.ui'))
+
+        component.get('Preferences').add_page('Streaming', self.builder.get_object('prefs_box'))
+        component.get('PluginManager').register_hook('on_apply_prefs', self.on_apply_prefs)
+        component.get('PluginManager').register_hook('on_show_prefs', self.on_show_prefs)
+
+        file_menu = self.get_widget('menu_file_tab')
+
+        self.sep = SeparatorMenuItem()
+        self.item = MenuItem(_("Stream this file"))
+        self.item.connect("activate", self.on_menuitem_stream)
+
+        file_menu.append(self.sep)
+        file_menu.append(self.item)
+
+        self.sep.show()
+        self.item.show()
+
+        torrentmenu = component.get("MenuBar").torrentmenu
+
+        self.sep_torrentmenu = SeparatorMenuItem()
+        self.item_torrentmenu = MenuItem(_("Stream this torrent"))
+        self.item_torrentmenu.connect("activate", self.on_torrentmenu_menuitem_stream)
+
+        torrentmenu.append(self.sep_torrentmenu)
+        torrentmenu.append(self.item_torrentmenu)
+
+        self.sep_torrentmenu.show()
+        self.item_torrentmenu.show()
+
+    def disable(self):
+        component.get('Preferences').remove_page('Streaming')
+        component.get('PluginManager').deregister_hook('on_apply_prefs', self.on_apply_prefs)
+        component.get('PluginManager').deregister_hook('on_show_prefs', self.on_show_prefs)
+
+        file_menu = self.get_widget('menu_file_tab')
+
+        file_menu.remove(self.item)
+        file_menu.remove(self.sep)
+
+        torrentmenu = component.get("MenuBar").torrentmenu
+
+        torrentmenu.remove(self.item_torrentmenu)
+        torrentmenu.remove(self.sep_torrentmenu)
+
+    def get_widget(self, widget_name):
+        main_builder = component.get('MainWindow').get_builder()
+        return main_builder.get_object(widget_name)
+
+    @defer.inlineCallbacks
+    def on_apply_prefs(self):
+        log.debug("applying prefs for Streaming")
+
+        serve_method = 'standalone'
+        # if self.builder.get_object("input_serve_standalone").get_active():
+        #     serve_method = 'standalone'
+        # elif self.builder.get_object("input_serve_webui").get_active():
+        #     serve_method = 'webui'
+
+        if self.builder.get_object("input_ssl_cert_daemon").get_active():
+            ssl_source = 'daemon'
+        elif self.builder.get_object("input_ssl_cert_custom").get_active():
+            ssl_source = 'custom'
+
+        config = {
+            "ip": self.builder.get_object("input_ip").get_text(),
+            "port": int(self.builder.get_object("input_port").get_text()),
+            "use_stream_urls": self.builder.get_object("input_use_stream_urls").get_active(),
+            "auto_open_stream_urls": self.builder.get_object("input_auto_open_stream_urls").get_active(),
+            "aggressive_prioritizing": self.builder.get_object("input_aggressive_prioritizing").get_active(),
+            "allow_remote": self.builder.get_object("input_allow_remote").get_active(),
+            "download_only_streamed": self.builder.get_object("input_download_only_streamed").get_active(),
+            "reverse_proxy_enabled": self.builder.get_object("input_reverse_proxy_enabled").get_active(),
+            # "download_in_order": self.builder.get_object("input_download_in_order").get_active(),
+            "use_ssl": self.builder.get_object("input_use_ssl").get_active(),
+            # "remote_username": self.builder.get_object("input_remote_username").get_text(),
+            "reverse_proxy_base_url": self.builder.get_object("input_reverse_proxy_base_url").get_text(),
+            "remote_password": self.builder.get_object("input_remote_password").get_text(),
+            "ssl_priv_key_path": self.builder.get_object("input_ssl_priv_key_path").get_text(),
+            "ssl_cert_path": self.builder.get_object("input_ssl_cert_path").get_text(),
+            "serve_method": serve_method,
+            "ssl_source": ssl_source,
+        }
+
+        result = yield client.streaming.set_config(config)
+
+        if result:
+            message_type, message_class, message = result
+            if message_type == 'error':
+                topic = 'Unknown error type'
+                if message_class == 'ssl':
+                    topic = 'SSL Failed'
+
+                dialogs.ErrorDialog(topic, message).run()
+
+    def on_show_prefs(self):
+        client.streaming.get_config().addCallback(self.cb_get_config)
+
+    def cb_get_config(self, config):
+        """callback for on show_prefs"""
+        self.builder.get_object("input_ip").set_text(config["ip"])
+        self.builder.get_object("input_port").set_text(str(config["port"]))
+        self.builder.get_object("input_use_stream_urls").set_active(config["use_stream_urls"])
+        self.builder.get_object("input_auto_open_stream_urls").set_active(config["auto_open_stream_urls"])
+        self.builder.get_object("input_aggressive_prioritizing").set_active(config["aggressive_prioritizing"])
+        self.builder.get_object("input_allow_remote").set_active(config["allow_remote"])
+        self.builder.get_object("input_use_ssl").set_active(config["use_ssl"])
+        self.builder.get_object("input_download_only_streamed").set_active(config["download_only_streamed"])
+        self.builder.get_object("input_reverse_proxy_enabled").set_active(config["reverse_proxy_enabled"])
+        # self.builder.get_object("input_download_in_order").set_active(config["download_in_order"])
+        # self.builder.get_object("input_download_everything").set_active(not config["download_in_order"] and not config["download_only_streamed"])
+        # self.builder.get_object("input_remote_username").set_text(config["remote_username"])
+        self.builder.get_object("input_reverse_proxy_base_url").set_text(config["reverse_proxy_base_url"])
+        self.builder.get_object("input_remote_password").set_text(config["remote_password"])
+        self.builder.get_object("input_ssl_priv_key_path").set_text(config["ssl_priv_key_path"])
+        self.builder.get_object("input_ssl_cert_path").set_text(config["ssl_cert_path"])
+
+        # self.builder.get_object("input_serve_standalone").set_active(config["serve_method"] == "standalone")
+        # self.builder.get_object("input_serve_webui").set_active(config["serve_method"] == "webui")
+
+        self.builder.get_object("input_ssl_cert_daemon").set_active(config["ssl_source"] == "daemon")
+        self.builder.get_object("input_ssl_cert_custom").set_active(config["ssl_source"] == "custom")
+
+        api_url = 'http%s://%s:%s@%s:%s/streaming/stream' % (('s' if config["use_ssl"] else ''), config["remote_username"], config["remote_password"], config["ip"], config["port"])
+        self.builder.get_object("output_remote_url").set_text(api_url)
+
+    def on_torrentmenu_menuitem_stream(self, data=None):
+        torrent_id = component.get("TorrentView").get_selected_torrents()[0]
+        client.streaming.stream_torrent(infohash=torrent_id).addCallback(self.stream_ready)
+
+    def on_menuitem_stream(self, data=None):
+        torrent_id = component.get("TorrentView").get_selected_torrents()[0]
+
+        ft = component.get("TorrentDetails").tabs['Files']
+        paths = ft.listview.get_selection().get_selected_rows()[1]
+
+        selected = []
+        for path in paths:
+            selected.append(ft.treestore.get_iter(path))
+
+        for select in selected:
+            path = ft.get_file_path(select)
+            client.streaming.stream_torrent(infohash=torrent_id, filepath_or_index=path, includes_name=True).addCallback(self.stream_ready)
+            break
+
+    def stream_ready(self, result):
+        if result['status'] == 'success':
+            if result.get('use_stream_urls', False):
+                url = "stream+%s" % result['url']
+                if result.get('auto_open_stream_urls', False):
+                    threads.deferToThread(execute_url, url)
+                else:
+                    def on_dialog_callback(response):
+                        if response == Gtk.ResponseType.YES:
+                            threads.deferToThread(execute_url, url)
+
+                    dialogs.YesNoDialog('Stream ready', 'Do you want to play the video?').run().addCallback(on_dialog_callback)
+            else:
+                dialogs.ErrorDialog('Stream ready', 'Copy the link into a media player', details=result['url']).run()
+        else:
+            dialogs.ErrorDialog('Stream failed', 'Was unable to prepare the stream', details=result).run()

streaming/gtkui.py

@@ -38,6 +38,9 @@
 #
 
 import gtk
+import os
+import subprocess
+import sys
 
 from deluge.log import LOG as log
 from deluge.ui.client import client
@@ -46,50 +49,121 @@ from deluge.plugins.pluginbase import GtkPluginBase
 import deluge.component as component
 import deluge.common
 
+from twisted.internet import defer, threads
+
 from common import get_resource
 
+
+def execute_url(url):
+    if sys.platform == 'win32':
+        os.startfile(url)
+    elif sys.platform == 'darwin':
+        subprocess.Popen(['open', url])
+    else:
+        try:
+            subprocess.Popen(['xdg-open', url])
+        except OSError:
+            print('Unable to open URL %s' % (url, ))
+
+
 class GtkUI(GtkPluginBase):
+    def get_widget(self, widget_name):
+        main_window = component.get("MainWindow")
+        if hasattr(main_window, 'main_glade'):
+            return main_window.main_glade.get_widget(widget_name)
+        else:
+            return main_window.main_builder.get_object(widget_name)
+
     def enable(self):
         self.glade = gtk.glade.XML(get_resource("config.glade"))
 
         component.get("Preferences").add_page("Streaming", self.glade.get_widget("prefs_box"))
         component.get("PluginManager").register_hook("on_apply_prefs", self.on_apply_prefs)
         component.get("PluginManager").register_hook("on_show_prefs", self.on_show_prefs)
-        
-        file_menu = component.get("MainWindow").main_glade.get_widget('menu_file_tab')
-        
+
+        file_menu = self.get_widget('menu_file_tab')
+
         self.sep = gtk.SeparatorMenuItem()
         self.item = gtk.MenuItem(_("_Stream this file"))
         self.item.connect("activate", self.on_menuitem_stream)
-        
+
         file_menu.append(self.sep)
         file_menu.append(self.item)
 
         self.sep.show()
         self.item.show()
 
+        torrentmenu = component.get("MenuBar").torrentmenu
+
+        self.sep_torrentmenu = gtk.SeparatorMenuItem()
+        self.item_torrentmenu = gtk.MenuItem(_("_Stream this torrent"))
+        self.item_torrentmenu.connect("activate", self.on_torrentmenu_menuitem_stream)
+
+        torrentmenu.append(self.sep_torrentmenu)
+        torrentmenu.append(self.item_torrentmenu)
+
+        self.sep_torrentmenu.show()
+        self.item_torrentmenu.show()
+
     def disable(self):
         component.get("Preferences").remove_page("Streaming")
         component.get("PluginManager").deregister_hook("on_apply_prefs", self.on_apply_prefs)
         component.get("PluginManager").deregister_hook("on_show_prefs", self.on_show_prefs)
-        
-        file_menu = component.get("MainWindow").main_glade.get_widget('menu_file_tab')
+
+        file_menu = self.get_widget('menu_file_tab')
 
         file_menu.remove(self.item)
         file_menu.remove(self.sep)
 
+        torrentmenu = component.get("MenuBar").torrentmenu
+
+        torrentmenu.remove(self.item_torrentmenu)
+        torrentmenu.remove(self.sep_torrentmenu)
+
+    @defer.inlineCallbacks
     def on_apply_prefs(self):
         log.debug("applying prefs for Streaming")
+
+        serve_method = 'standalone'
+        # if self.glade.get_widget("input_serve_standalone").get_active():
+        #     serve_method = 'standalone'
+        # elif self.glade.get_widget("input_serve_webui").get_active():
+        #     serve_method = 'webui'
+
+        if self.glade.get_widget("input_ssl_cert_daemon").get_active():
+            ssl_source = 'daemon'
+        elif self.glade.get_widget("input_ssl_cert_custom").get_active():
+            ssl_source = 'custom'
+
         config = {
             "ip": self.glade.get_widget("input_ip").get_text(),
             "port": int(self.glade.get_widget("input_port").get_text()),
+            "use_stream_urls": self.glade.get_widget("input_use_stream_urls").get_active(),
+            "auto_open_stream_urls": self.glade.get_widget("input_auto_open_stream_urls").get_active(),
             "allow_remote": self.glade.get_widget("input_allow_remote").get_active(),
-            "reset_complete": self.glade.get_widget("input_reset_complete").get_active(),
-            "remote_username": self.glade.get_widget("input_remote_username").get_text(),
+            "download_only_streamed": self.glade.get_widget("input_download_only_streamed").get_active(),
+            "reverse_proxy_enabled": self.glade.get_widget("input_reverse_proxy_enabled").get_active(),
+            # "download_in_order": self.glade.get_widget("input_download_in_order").get_active(),
+            "use_ssl": self.glade.get_widget("input_use_ssl").get_active(),
+            # "remote_username": self.glade.get_widget("input_remote_username").get_text(),
+            "reverse_proxy_base_url": self.glade.get_widget("input_reverse_proxy_base_url").get_text(),
             "remote_password": self.glade.get_widget("input_remote_password").get_text(),
+            "ssl_priv_key_path": self.glade.get_widget("input_ssl_priv_key_path").get_text(),
+            "ssl_cert_path": self.glade.get_widget("input_ssl_cert_path").get_text(),
+            "serve_method": serve_method,
+            "ssl_source": ssl_source,
         }
-        
-        client.streaming.set_config(config)
+
+        result = yield client.streaming.set_config(config)
+
+        if result:
+            message_type, message_class, message = result
+            if message_type == 'error':
+                topic = 'Unknown error type'
+                if message_class == 'ssl':
+                    topic = 'SSL Failed'
+
+                dialogs.ErrorDialog(topic, message).run()
 
     def on_show_prefs(self):
         client.streaming.get_config().addCallback(self.cb_get_config)
@@ -98,28 +172,61 @@ class GtkUI(GtkPluginBase):
         "callback for on show_prefs"
         self.glade.get_widget("input_ip").set_text(config["ip"])
         self.glade.get_widget("input_port").set_text(str(config["port"]))
+        self.glade.get_widget("input_use_stream_urls").set_active(config["use_stream_urls"])
+        self.glade.get_widget("input_auto_open_stream_urls").set_active(config["auto_open_stream_urls"])
         self.glade.get_widget("input_allow_remote").set_active(config["allow_remote"])
-        self.glade.get_widget("input_reset_complete").set_active(config["reset_complete"])
-        self.glade.get_widget("input_remote_username").set_text(config["remote_username"])
+        self.glade.get_widget("input_use_ssl").set_active(config["use_ssl"])
+        self.glade.get_widget("input_download_only_streamed").set_active(config["download_only_streamed"])
+        self.glade.get_widget("input_reverse_proxy_enabled").set_active(config["reverse_proxy_enabled"])
+        # self.glade.get_widget("input_download_in_order").set_active(config["download_in_order"])
+        # self.glade.get_widget("input_download_everything").set_active(not config["download_in_order"] and not config["download_only_streamed"])
+        # self.glade.get_widget("input_remote_username").set_text(config["remote_username"])
+        self.glade.get_widget("input_reverse_proxy_base_url").set_text(config["reverse_proxy_base_url"])
         self.glade.get_widget("input_remote_password").set_text(config["remote_password"])
+        self.glade.get_widget("input_ssl_priv_key_path").set_text(config["ssl_priv_key_path"])
+        self.glade.get_widget("input_ssl_cert_path").set_text(config["ssl_cert_path"])
+
+        # self.glade.get_widget("input_serve_standalone").set_active(config["serve_method"] == "standalone")
+        # self.glade.get_widget("input_serve_webui").set_active(config["serve_method"] == "webui")
+
+        self.glade.get_widget("input_ssl_cert_daemon").set_active(config["ssl_source"] == "daemon")
+        self.glade.get_widget("input_ssl_cert_custom").set_active(config["ssl_source"] == "custom")
+
+        api_url = 'http%s://%s:%s@%s:%s/streaming/stream' % (('s' if config["use_ssl"] else ''), config["remote_username"], config["remote_password"], config["ip"], config["port"])
+        self.glade.get_widget("output_remote_url").set_text(api_url)
+
+    def stream_ready(self, result):
+        if result['status'] == 'success':
+            if result.get('use_stream_urls', False):
+                url = "stream+%s" % result['url']
+                if result.get('auto_open_stream_urls', False):
+                    threads.deferToThread(execute_url, url)
+                else:
+                    def on_dialog_callback(response):
+                        if response == gtk.RESPONSE_YES:
+                            threads.deferToThread(execute_url, url)
+
+                    dialogs.YesNoDialog('Stream ready', 'Do you want to play the video?').run().addCallback(on_dialog_callback)
+            else:
+                dialogs.ErrorDialog('Stream ready', 'Copy the link into a media player', details=result['url']).run()
+        else:
+            dialogs.ErrorDialog('Stream failed', 'Was unable to prepare the stream', details=result).run()
 
     def on_menuitem_stream(self, data=None):
         torrent_id = component.get("TorrentView").get_selected_torrents()[0]
-        
+
         ft = component.get("TorrentDetails").tabs['Files']
         paths = ft.listview.get_selection().get_selected_rows()[1]
-        
+
         selected = []
         for path in paths:
             selected.append(ft.treestore.get_iter(path))
-        
-        def stream_ready(result):
-            if result['status'] == 'success':
-                dialogs.ErrorDialog('Stream ready', 'Copy the link into a media player', details=result['url']).run()
-            else:
-                dialogs.ErrorDialog('Stream failed', 'Was unable to prepare the stream', details=result).run()
-        
+
         for select in selected:
             path = ft.get_file_path(select)
-            client.streaming.stream_torrent(torrent_id, path).addCallback(stream_ready)
-            break
+            client.streaming.stream_torrent(infohash=torrent_id, filepath_or_index=path, includes_name=True).addCallback(self.stream_ready)
+            break
+
+    def on_torrentmenu_menuitem_stream(self, data=None):
+        torrent_id = component.get("TorrentView").get_selected_torrents()[0]
+        client.streaming.stream_torrent(infohash=torrent_id).addCallback(self.stream_ready)

streaming/resource.py

@@ -1,41 +1,40 @@
+import base64
+
 from twisted.web.resource import Resource as TwistedResource, _computeAllowedMethods
-from twisted.web import server, error
+from twisted.web import server
 from twisted.internet import defer
 
 
 class Resource(TwistedResource):
     content_type = 'application/json'
-    
+
     def __init__(self, username=None, password=None, *args, **kwargs):
         self.username = username
         self.password = password
         TwistedResource.__init__(self, *args, **kwargs)
-    
-    def render(self, request): # Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
+
+    def render(self, request):  # Authorization: Basic QWxhZGRpbjpvcGVuIHNlc2FtZQ==
         """
         Adds support for deferred render methods
         """
         auth_header = request.getHeader('Authorization')
-        
+
         if self.username or self.password:
             authenticated = False
             if auth_header:
                 auth_header = auth_header.split(' ')
                 if len(auth_header) > 1 and auth_header[0] == 'Basic':
-                    userpass = auth_header[1].decode('base64').split(':')
+                    userpass = base64.b64decode(auth_header[1].encode('utf-8')).decode('utf-8').split(':')
                     if len(userpass) == 2:
                         username, password = userpass
                         if self.username == username and self.password == password:
                             authenticated = True
-                    
-            
+
             if not authenticated:
-                print auth_header
-                print self.username, self.password
                 request.setResponseCode(401)
-                return 'Unauthorized'
-        
-        m = getattr(self, 'render_' + request.method, None)
+                return b'Unauthorized'
+
+        m = getattr(self, 'render_' + request.method.decode('utf-8'), None)
         if not m:
             # This needs to be here until the deprecated subclasses of the
             # below three error resources in twisted.web.error are removed.
@@ -43,18 +42,18 @@ class Resource(TwistedResource):
             allowedMethods = (getattr(self, 'allowedMethods', 0) or
                               _computeAllowedMethods(self))
             raise UnsupportedMethod(allowedMethods)
-        
+
         result = defer.maybeDeferred(m, request)
-        
+
         def write_rest(defer_result, request):
             request.write(defer_result)
             request.finish()
-        
+
         def err_rest(defer_result=None):
             defer_result.printTraceback()
             request.finish()
-        
+
         result.addCallback(write_rest, request)
         result.addErrback(err_rest)
-        
-        return server.NOT_DONE_YET
+
+        return server.NOT_DONE_YET

streaming/torrentfile.py

@@ -0,0 +1,139 @@
+import logging
+import mimetypes
+import os
+import time
+import threading
+
+from io import BytesIO
+
+from thomas import InputBase
+
+logger = logging.getLogger(__name__)
+
+PIECE_REQUEST_HISTORY_TIME = 10
+MAX_PIECE_REQUEST_COUNT = 20
+
+class DelugeTorrentInput(InputBase):
+    plugin_name = 'torrent_file'
+    protocols = []
+
+    current_piece_data = None
+    can_read_to = None
+    last_available_piece = None
+    _pos = None
+    _closed = False
+
+    def __init__(self, item, torrent_handler, infohash, offset, path):
+        self.item = item
+        self.torrent_handler = torrent_handler
+        self.torrent = torrent_handler.get_torrent(infohash)
+        self.infohash = infohash
+        self.offset = offset
+        self.path = path
+        self.piece_buffer = {}
+        self.requested_pieces = {}
+        self.piece_consumption_time = []
+        self.size, self.filename, self.content_type = self.get_info()
+
+    def get_info(self):
+        logger.info('Getting info about %r' % (self.path, ))
+
+        content_type = mimetypes.guess_type(self.path)[0] or 'bytes'
+
+        return self.item['size'], os.path.basename(self.path), content_type
+
+    def ensure_exists(self):
+        if not os.path.exists(self.path):
+            self.torrent.can_read(self.offset)
+
+    def tell(self):
+        return self._pos
+
+    def seek(self, pos):
+        self.ensure_exists()
+        self._pos = pos
+        logger.debug('Seeking at %s torrentfile_id %r' % (self.tell(), id(self)))
+        self.torrent.add_reader(self, self.item.path, self.offset + self.tell(), self.offset + self.size)
+
+    def _read(self, num):
+        data = self.current_piece_data.read(num)
+        self._pos += len(data)
+        return data
+
+    def read(self, num):
+        if self.current_piece_data:
+            data = self._read(num)
+            if data:
+                return data
+
+        self.ensure_exists()
+
+        if self._pos is None:
+            self.seek(0)
+
+        logger.debug('Trying to read %s from %i torrentfile_id %r' % (self.path, self.tell(), id(self)))
+        tell = self.tell()
+        if self.can_read_to is None or self.can_read_to <= tell:
+            can_read_result = self.torrent.can_read(self.offset + tell)
+            self.last_available_piece = can_read_result[1]
+            self.can_read_to = can_read_result[0] + tell
+
+        current_piece, rest = self.current_piece
+        logger.debug('Calculated last available piece is %s offset %s can_read_to %s piece_length %s' % (self.last_available_piece, self.offset, self.can_read_to, self.torrent.piece_length))
+
+        while self.piece_consumption_time and self.piece_consumption_time[0] < time.time() - PIECE_REQUEST_HISTORY_TIME:
+            self.piece_consumption_time.pop(0)
+
+        max_piece_count = (self.last_available_piece - current_piece) + 1
+        pieces_to_request = min(min(max(2, len(self.piece_consumption_time)), max_piece_count), MAX_PIECE_REQUEST_COUNT)
+
+        logger.debug('New piece request status pieces_to_request: %s piece_consumption_time: %s max_piece_count: %s' % (pieces_to_request, len(self.piece_consumption_time), max_piece_count, ))
+        logger.debug('Requested pieces: %r' % (self.requested_pieces.items()))
+        logger.debug('Piece buffer: %r' % (self.piece_buffer.keys()))
+
+        for piece in range(current_piece, current_piece + pieces_to_request):
+            if piece in self.requested_pieces:
+                continue
+
+            logger.debug('Requesting piece %s' % (piece, ))
+            self.requested_pieces[piece] = threading.Event()
+            self.torrent.request_piece(piece)
+
+        for _ in range(1000):
+            if self.requested_pieces[current_piece].wait(1):
+                break
+            if self._closed:
+                return b''
+        else:
+            return b''
+
+        for delete_piece in [p for p in self.piece_buffer.keys() if p < current_piece]:
+            del self.piece_buffer[delete_piece]
+
+        for delete_piece in [p for p in self.requested_pieces.keys() if p < current_piece]:
+            del self.requested_pieces[delete_piece]
+
+        self.current_piece_data = self.piece_buffer[current_piece]
+        self.current_piece_data.seek(rest)
+        self.piece_consumption_time.append(time.time())
+        logger.debug('Returning %s bytes' % (num, ))
+        return self._read(num)
+
+    @property
+    def current_piece(self):
+        from_byte = self.offset + self.tell()
+        piece_length = self.torrent.piece_length
+        piece, rest = divmod(from_byte, piece_length)
+        return piece, rest
+
+    def new_piece_available(self, piece, data):
+        if piece not in self.requested_pieces or self.requested_pieces[piece].is_set():
+            return
+
+        logger.debug("Setting data for piece %s" % (piece, ))
+        self.piece_buffer[piece] = BytesIO(data)
+        self.requested_pieces[piece].set()
+
+    def close(self):
+        self.torrent.remove_reader(self)
+        self._closed = True

streaming/webui.py

@@ -36,16 +36,16 @@
 #    this exception statement from your version. If you delete this exception
 #    statement from all source files in the program, then also delete it here.
 #
+import logging
 
-from deluge.log import LOG as log
-from deluge.ui.client import client
-from deluge import component
 from deluge.plugins.pluginbase import WebPluginBase
 
-from common import get_resource
+from .common import get_resource
+
+log = logging.getLogger(__name__)
+
 
 class WebUI(WebPluginBase):
-
     scripts = [get_resource("streaming.js")]
 
     def enable(self):