[arch-commits] Commit in subdownloader/repos (3 files)

[David Runge]

    Date: Saturday, January 27, 2018 @ 10:53:01
  Author: dvzrv
Revision: 287405

archrelease: copy trunk to community-testing-any

Added:
  subdownloader/repos/community-testing-any/
  subdownloader/repos/community-testing-any/PKGBUILD
    (from rev 287404, subdownloader/trunk/PKGBUILD)
  subdownloader/repos/community-testing-any/follow-download-links.patch
    (from rev 287404, subdownloader/trunk/follow-download-links.patch)

-----------------------------+
 PKGBUILD                    |   63 ++++++++++++++++++++++++++++++++++++++++++
 follow-download-links.patch |   53 +++++++++++++++++++++++++++++++++++
 2 files changed, 116 insertions(+)

Copied: subdownloader/repos/community-testing-any/PKGBUILD (from rev 287404, subdownloader/trunk/PKGBUILD)
===================================================================
--- community-testing-any/PKGBUILD	                        (rev 0)
+++ community-testing-any/PKGBUILD	2018-01-27 10:53:01 UTC (rev 287405)
@@ -0,0 +1,63 @@
+# $Id$
+# Maintainer: Ray Rashif <schiv at archlinux.org>
+# Maintainer: David Runge <dave at sleepmap.de>
+# Contributor: Andrea Scarpino <andrea at archlinux.org>
+# Contributor: Geoffroy Carrier <geoffroy.carrier at koon.fr>
+# Contributor: Thomas Jost <thomas.jost at gmail.com>
+
+pkgname=subdownloader
+pkgver=2.0.18
+pkgrel=5
+pkgdesc="Automatic download/upload of subtitles using fast hashing"
+arch=('any')
+url="http://www.subdownloader.net/"
+license=('GPL3')
+depends=('python2-pyqt4')
+source=("https://launchpad.net/${pkgname}/trunk/${pkgver}/+download/${pkgname}_${pkgver}.orig.tar.gz"
+        "follow-download-links.patch")
+sha512sums=('ecddf606ce374af43fff39c225ee896af4d8bd2384a2f300dcbb4b443377807edd5233a0531e95d338b0f9c84a274b3afd4109d9216510a5a4bc8fa17485b999'
+            '09a03b7b06813f887e18b6774fc2d5f1d477b88fe98785fd03d85bcd33b4aedc6ee1cf233e8af7dd3ca7a524ca14e3a1f8d5e7163e803b0f534023f9b5ded5e9')
+
+prepare(){
+  cd "${pkgname}-${pkgver}"
+
+  # See https://bugs.archlinux.org/task/48402
+  patch -Np0 -i "$srcdir/follow-download-links.patch"
+
+  # python2 fix
+  for file in $(find . -name '*.py' -print); do
+    sed -e 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' \
+        -e 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' \
+        -i "${file}"
+  done
+
+  # remove empty, useless dir
+  rmdir modules/mmpython/doc
+}
+
+package() {
+  cd "${pkgname}-${pkgver}"
+
+  # prepare dirs
+  install -d "$pkgdir/usr/share/$pkgname" \
+    "$pkgdir/usr/bin" \
+    "$pkgdir/usr/share/man/man1/"
+
+  # man page
+  install -vDm644 ${pkgname}.1 "$pkgdir/usr/share/man/man1/${pkgname}.1"
+
+  # freedesktop.org
+  install -vDm644 "${pkgname}.desktop" \
+    "${pkgdir}/usr/share/applications/${pkgname}.desktop"
+  install -vDm644 "gui/images/${pkgname}.png" \
+    "${pkgdir}/usr/share/pixmaps/${pkgname}.png"
+
+  # runtime and executables
+  cp -av {FileManagement,gui,languages,locale,modules} \
+    "${pkgdir}/usr/share/${pkgname}/"
+  install -vDm 755 run.py "${pkgdir}/usr/share/${pkgname}/run.py"
+  ln -s "/usr/share/${pkgname}/run.py" \
+    "${pkgdir}/usr/bin/${pkgname}"
+}
+
+# vim:set ts=2 sw=2 et:

Copied: subdownloader/repos/community-testing-any/follow-download-links.patch (from rev 287404, subdownloader/trunk/follow-download-links.patch)
===================================================================
--- community-testing-any/follow-download-links.patch	                        (rev 0)
+++ community-testing-any/follow-download-links.patch	2018-01-27 10:53:01 UTC (rev 287405)
@@ -0,0 +1,53 @@
+------------------------------------------------------------
+revno: 557
+committer: Christos Trochalakis <yatiohi at ideopolis.gr>
+branch nick: subdownloader
+timestamp: Sat 2016-01-02 20:14:12 +0200
+message:
+  Follow opensubtitles.org download link
+  
+  Download links were constructed by subdownloader instead of using the
+  download URL from the API.
+  
+  Closes #1528605
+diff:
+=== modified file 'gui/main.py'
+--- gui/main.py	2012-11-04 14:45:22 +0000
++++ gui/main.py	2016-01-02 18:14:12 +0000
+@@ -1140,7 +1140,7 @@
+                    if not skip_all:
+                         log.debug("Downloading subtitle '%s'" % destinationPath)
+ 			#print {sub.getIdFileOnline():destinationPath}
+-                        osHttpRequests.download('http://www.opensubtitles.org/en/download/file/%s.gz' %sub.getIdFileOnline(), destinationPath)
++                        osHttpRequests.download(sub.getDownloadLink(), destinationPath)
+                         #if self.OSDBServer.DownloadSubtitles({sub.getIdFileOnline():destinationPath}):
+                             #success_downloaded += 1
+                         #else:
+
+=== modified file 'modules/SDService.py'
+--- modules/SDService.py	2011-05-30 02:16:51 +0000
++++ modules/SDService.py	2016-01-02 18:14:12 +0000
+@@ -490,6 +490,7 @@
+                             #sub.setLanguageName(i["LanguageName"]) 
+                             sub.setRating(i["SubRating"])
+                             sub.setUploader(i["UserNickName"])
++                            sub.setDownloadLink(i["SubDownloadLink"])
+                             sub.setVideo(video)
+                             
+                             self.log.debug("  [%s] - %s"%  (sub.getLanguage(), sub.getFileName()))
+
+=== modified file 'modules/subtitlefile.py'
+--- modules/subtitlefile.py	2011-05-30 02:16:51 +0000
++++ modules/subtitlefile.py	2016-01-02 18:14:12 +0000
+@@ -139,6 +139,12 @@
+     def getRating(self):
+         return self.rating
+ 
++    def setDownloadLink(self, link):
++        self.download_link = link
++
++    def getDownloadLink(self):
++        return self.download_link
++
+     def setExtraInfo(self, info, data):
+         self._extraInfo[info] = data