debian/0000755000000000000000000000000012157557001007171 5ustar debian/changelog0000644000000000000000000000023212157557001011040 0ustar encuentro (1.0-1) unstable; urgency=low * Initial release. (Closes: #712539) -- Maximiliano Curia Mon, 17 Jun 2013 01:04:08 +0200 debian/source/0000755000000000000000000000000012157557001010471 5ustar debian/source/format0000644000000000000000000000001412157557001011677 0ustar 3.0 (quilt) debian/gbp.conf0000644000000000000000000000005612157557001010611 0ustar [DEFAULT] overlay = True upstream-tree = TAG debian/patches/0000755000000000000000000000000012157557001010620 5ustar debian/patches/series0000644000000000000000000000015112157557001012032 0ustar upstream_fix_upstream_bugs_1184005_and_897735.diff upstream_manpage.diff debian_avoid_extra_license.diff debian/patches/upstream_manpage.diff0000644000000000000000000000570412157557001015010 0ustar commit 330291156d1ce7fcd6c0fdbf648cacf4646c16b5 Author: Facundo Batista Date: Sat Jun 1 17:21:20 2013 -0300 Have a man page. Index: encuentro/man/encuentro.1 =================================================================== --- /dev/null 1970-01-01 00:00:00.000000000 +0000 +++ encuentro/man/encuentro.1 2013-06-17 09:23:57.841710867 +0200 @@ -0,0 +1,29 @@ +.TH ENCUENTRO 1 +.SH NAME +encuentro \- busque, descargue, y vea el maravilloso contenido ofrecido +por el Canal Encuentro, Paka Paka, BACUA, Educ.ar y otros. + +Note: This program is strongly oriented to Spanish speaking people, as +the content of Canal Encuentro and the other channels is only in Spanish. + + +.SH SYNOPSYS +.B encuentro [-v] + +.SH DESCRIPTION + +Este es un simple programa que permite buscar, descargar y ver contenido de Encuentro y otros canales. Notar que este programa no distribuye contenido directamente, sino que permite un mejor uso personal de esos contenidos. + +Por favor, referirse a los sitios web correspondientes para saber qué se puede y qué no se puede hacer con los contenidos de tales sitios. + +Si se ejecuta con +.B -v +mostrará las lineas de log en stdout. + +.SH AUTHOR +Facundo Batista + +.SH SEE ALSO +La página del proyecto es http://encuentro.taniquetil.com.ar/ + +El desarrollo está centralizado en https://launchpad.net/encuentro Index: encuentro/setup.py =================================================================== --- encuentro.orig/setup.py 2013-06-17 09:20:48.582084613 +0200 +++ encuentro/setup.py 2013-06-17 09:20:48.578084790 +0200 @@ -75,6 +75,11 @@ os.makedirs(self._custom_apport_dir) shutil.copy("source_encuentro.py", self._custom_apport_dir) + # man directory + if not os.path.exists(self._custom_man_dir): + os.makedirs(self._custom_man_dir) + shutil.copy("man/encuentro.1", self._custom_man_dir) + # version file shutil.copy("version.txt", self.install_lib) @@ -88,6 +93,7 @@ apps_dir = os.path.join(self.prefix, "share", "applications") apport_dir = os.path.join(self.prefix, "share", "apport", "package-hooks") + man_dir = os.path.join(self.prefix, "share", "man", "man1") # if we have 'root', put the building path also under it (used normally # by pbuilder) @@ -97,6 +103,7 @@ build_dir = os.path.join(self.root, data_dir[1:]) apps_dir = os.path.join(self.root, apps_dir[1:]) apport_dir = os.path.join(self.root, apport_dir[1:]) + man_dir = os.path.join(self.root, man_dir[1:]) # change the lib install directory so all package files go inside here self.install_lib = build_dir @@ -105,6 +112,7 @@ self._custom_data_dir = data_dir self._custom_apps_dir = apps_dir self._custom_apport_dir = apport_dir + self._custom_man_dir = man_dir setup( debian/patches/debian_avoid_extra_license.diff0000644000000000000000000000122512157557001016763 0ustar commit eee946f4bb37c5a31245140f582d5a9109d276ab Author: Maximiliano Curia Date: Mon Jun 17 09:38:30 2013 +0200 DEBIAN: no need to install an extra license diff --git a/setup.py b/setup.py index 24e2e75..8a7bc72 100755 --- a/setup.py +++ b/setup.py @@ -122,7 +122,7 @@ setup( package_data={ "encuentro": ["ui/media/*", "logos/icon-*.png"], "": ["encuentro.desktop", "source_encuentro.py", "version.txt"], - "qtreactor": ["qt4reactor.py", "README", "LICENSE", + "qtreactor": ["qt4reactor.py", "README", "twisted/plugins/qt4.py"], }, scripts=["bin/encuentro"], debian/patches/upstream_fix_upstream_bugs_1184005_and_897735.diff0000644000000000000000000001115212157557001021512 0ustar commit 82cd1771ccc3065f82c8829ecd5893cc6026f100 Author: Facundo Batista Date: Tue Jun 4 18:47:54 2013 -0300 Fixes 1184005 and 897735, thanks to juancarlospaco. diff --git a/encuentro/ui/preferences.py b/encuentro/ui/preferences.py index 68a9272..c188347 100644 --- a/encuentro/ui/preferences.py +++ b/encuentro/ui/preferences.py @@ -24,16 +24,20 @@ import logging from PyQt4.QtGui import ( QCheckBox, + QCompleter, QDialog, QDialogButtonBox, + QDirModel, + QFileDialog, QGridLayout, QLabel, QLineEdit, + QPushButton, QTabWidget, QVBoxLayout, QWidget, ) -from PyQt4.QtCore import Qt +from PyQt4.QtCore import Qt, QDir from encuentro.config import config @@ -52,6 +56,14 @@ class GeneralPreferences(QWidget): grid.setSpacing(20) grid.setColumnStretch(1, 10) + # directory auto completer + completer = QCompleter(self) + dirs = QDirModel(self) + dirs.setFilter(QDir.AllDirs | QDir.NoDotAndDotDot) + completer.setModel(dirs) + completer.setCaseSensitivity(Qt.CaseInsensitive) + completer.setCompletionMode(QCompleter.PopupCompletion) + l = QLabel( u"Ingresá el directorio donde descargar los videos...") l.setTextFormat(Qt.RichText) @@ -60,19 +72,32 @@ class GeneralPreferences(QWidget): grid.addWidget(QLabel(u"Descargar en:"), 1, 0, 2, 1) prv = config.get('downloaddir', '') self.downloaddir_entry = QLineEdit(prv) + self.downloaddir_entry.setCompleter(completer) + self.downloaddir_entry.setPlaceholderText(u'Ingresá un directorio') grid.addWidget(self.downloaddir_entry, 1, 1, 2, 2) + self.downloaddir_buttn = QPushButton(u"Elegir un directorio") + self.downloaddir_buttn.clicked.connect(self._choose_dir) + grid.addWidget(self.downloaddir_buttn, 2, 1, 3, 2) + self.autoreload_checkbox = QCheckBox( u"Recargar automáticamente la lista de episodios al iniciar") prv = config.get('autorefresh', False) self.autoreload_checkbox.setChecked(prv) - grid.addWidget(self.autoreload_checkbox, 2, 0, 3, 2) + grid.addWidget(self.autoreload_checkbox, 3, 0, 4, 2) self.shownotifs_checkbox = QCheckBox( u"Mostrar una notificación cuando termina cada descarga") prv = config.get('notification', True) self.shownotifs_checkbox.setChecked(prv) - grid.addWidget(self.shownotifs_checkbox, 3, 0, 4, 2) + grid.addWidget(self.shownotifs_checkbox, 4, 0, 5, 2) + + def _choose_dir(self): + """Choose a directory using a dialog.""" + resp = QFileDialog.getExistingDirectory(self, '', + os.path.expanduser("~")) + if resp: + self.downloaddir_entry.setText(resp) def get_config(self): """Return the config for this tab.""" @@ -98,19 +123,34 @@ class ConectatePreferences(QWidget): grid.addWidget(QLabel(u"Usuario:"), 1, 0, 2, 1) prv = config.get('user', '') self.user_entry = QLineEdit(prv) + self.user_entry.setPlaceholderText(u'Ingresá tu usuario de Conectate') grid.addWidget(self.user_entry, 1, 1, 2, 2) grid.addWidget(QLabel(u"Contraseña:"), 2, 0, 3, 1) prv = config.get('password', '') self.password_entry = QLineEdit(prv) + self.password_entry.setEchoMode(QLineEdit.Password) + self.password_entry.setPlaceholderText( + u'Ingresá tu contraseña de Conectate') grid.addWidget(self.password_entry, 2, 1, 3, 2) - l = QLabel(u'Si no tenés estos datos, registrate aquí' - u'' % (URL_CONECTATE,)) + self.password_mask = QCheckBox(u'Mostrar contraseña') + self.password_mask.stateChanged.connect(self._toggle_password_mask) + grid.addWidget(self.password_mask, 3, 1, 4, 2) + + l = QLabel(u'Si no tenés estos datos, ' + u'registrate aquí'.format(URL_CONECTATE)) l.setAlignment(Qt.AlignRight | Qt.AlignVCenter) l.setTextFormat(Qt.RichText) l.setOpenExternalLinks(True) - grid.addWidget(l, 3, 0, 4, 3) + grid.addWidget(l, 4, 0, 5, 3) + + def _toggle_password_mask(self): + """Toggle the password hiding.""" + if self.password_mask.isChecked() is True: + self.password_entry.setEchoMode(QLineEdit.Normal) + else: + self.password_entry.setEchoMode(QLineEdit.Password) def get_config(self): """Return the config for this tab.""" debian/rules0000755000000000000000000000021312157557001010245 0ustar #!/usr/bin/make -f %: ifneq ($(shell dh -l | grep -xF translations),) dh $@ --with python2,translations else dh $@ --with python2 endif debian/copyright0000644000000000000000000000664712157557001011141 0ustar Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: encuentro Upstream-Contact: Facundo Batista Source: https://launchpad.net/encuentro Files: * Copyright: 2010-2013, Facundo Batista License: GPL-3 Files: qtreactor/* Copyright: 2001-2010, Allen Short 2001-2010, Andy Gayton 2001-2010, Andrew Bennetts 2001-2010, Antoine Pitrou 2001-2010, Apple Computer, Inc. 2001-2010, Benjamin Bruheim 2001-2010, Bob Ippolito 2001-2010, Canonical Limited 2001-2010, Christopher Armstrong 2001-2010, David Reid 2001-2010, Donovan Preston 2001-2010, Eric Mangold 2001-2010, Eyal Lotem 2001-2010, Itamar Shtull-Trauring 2001-2010, James Knight 2001-2010, Jason A. Mobarak 2001-2010, Jean-Paul Calderone 2001-2010, Jessica McKellar 2001-2010, Jonathan Jacobs 2001-2010, Jonathan Lange 2001-2010, Jonathan D. Simms 2001-2010, Jörgen Hermann 2001-2010, Kevin Horn 2001-2010, Kevin Turner 2001-2010, Mary Gardiner 2001-2010, Matthew Lefkowitz 2001-2010, Massachusetts Institute of Technology 2001-2010, Moshe Zadka 2001-2010, Paul Swartz 2001-2010, Pavel Pergamenshchik 2001-2010, Ralph Meijer 2001-2010, Sean Riley 2001-2010, Software Freedom Conservancy 2001-2010, Travis B. Hartwell 2001-2010, Thijs Triemstra 2001-2010, Thomas Herve 2001-2010, Timothy Allen License: Expat Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: . The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. . THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. License: GPL-3 This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License version 3, as published by the Free Software Foundation. . This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranties of MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. . You should have received a copy of the GNU General Public License along with this program. If not, see . . The full text of the GPL is distributed in /usr/share/common-licenses/GPL-3 on Debian systems. debian/control0000644000000000000000000000136712157557001010603 0ustar Source: encuentro Section: python Priority: extra Maintainer: Maximiliano Curia Build-Depends: debhelper (>= 9), python X-Python-Version: >= 2.6 Standards-Version: 3.9.4 Homepage: http://encuentro.taniquetil.com.ar/ Package: encuentro Architecture: all Depends: ${python:Depends}, ${misc:Depends}, python-mechanize (>= 0.1.11), python-twisted-bin (>= 8.2.0), python-twisted-web (>= 8.2.0), python-qt4 (>= 4.9.1), python-xdg (>= 0.15), python-notify (>= 0.1.1) Description: Access the content of the Encuentro channel, and others Encuentro is a small program that allows you to search, download and watch videos from the Encuentro argentinian channel. Since the content of the channel is completely in Spanish, so is this program. debian/compat0000644000000000000000000000000212157557001010367 0ustar 9 debian/encuentro.docs0000644000000000000000000000003712157557001012045 0ustar README.txt AYUDA.txt LEEME.txt debian/watch0000644000000000000000000000012312157557001010216 0ustar version=3 http://launchpad.net/encuentro/+download .*/encuentro-([\d\.]+)\.tar\.gz