Remove desktop support for nzb files.

11 files changed, 5 insertions, 104 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 59b8caa3e549..cf3512bf5dd4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -14,34 +14,18 @@ pkgbase = sabnzbd
 	depends = sqlite
 	depends = unrar
 	depends = unzip
-	optdepends = xdg-utils: registration of .nzb files
 	optdepends = python2-feedparser: rss support
 	optdepends = python2-pyopenssl: ssl support
 	optdepends = par2cmdline-tbb: par2 multi-threading
-	backup = etc/conf.d/sabnzbd
 	backup = opt/sabnzbd/sabnzbd.ini
 	source = https://github.com/sabnzbd/sabnzbd/releases/download/2.3.9/SABnzbd-2.3.9-src.tar.gz
-	source = sabnzbd
-	source = sabnzbd.desktop
-	source = addnzb.sh
-	source = nzb.png
-	source = sabnzbd.png
-	source = x-nzb.xml
 	source = sabnzbd.service
 	source = sabnzbd.sysusers
 	source = sabnzbd.tmpfiles
-	source = sabnzbd.confd
 	sha256sums = f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c
-	sha256sums = 82630edfc767a383843ffaae9d716e99010dad9e93bdee08d541faa74e694a65
-	sha256sums = 887f93942b78c0475009b1ce84b502c28e273c222451a4736cd4c37ff5454f04
-	sha256sums = 30ffff8b9c00e91358cd6c5dca89f9d9f8f12843e7b3c44c6d5b0f09b0ea424a
-	sha256sums = ef8f4fb1a3a0750c74b7addd302ab8733187ad370b5d27336afb2677d7154571
-	sha256sums = fce3e065d017ce3bc4548a766f25c95f982af4f6085263c72f3000f49d810409
-	sha256sums = f53261d7578c67fb9fd6a639df94cd53604bcf37b9b03a926cb03e5214b496fe
 	sha256sums = 64f5c25f140456489d71e8c7eba115362640edff81087515605db254efd3038f
 	sha256sums = 8cdeae7e8fa327bafc2fd1b19c1995f89f52b2ba231c8305b4e7269ab9e0738a
 	sha256sums = f86a23384e430b79b328167262216ad315ef89c4a2c49276e6d25c5f7b4cf5bf
-	sha256sums = 8462203454d488b5d4f7beb85e61da2efa42d3dffa465f3bf16a95abe0bc7c0a
 
 pkgname = sabnzbd
 
diff --git a/PKGBUILD b/PKGBUILD
index 039c40b8aed1..e5ee33d5dd92 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -17,36 +17,21 @@ depends=('curl'
          'unrar'
          'unzip')
 
-optdepends=('xdg-utils: registration of .nzb files'
-            'python2-feedparser: rss support'
+optdepends=('python2-feedparser: rss support'
             'python2-pyopenssl: ssl support'
             'par2cmdline-tbb: par2 multi-threading')
 
 install='sabnzbd.install'
-backup=('etc/conf.d/sabnzbd' 'opt/sabnzbd/sabnzbd.ini')
+backup=('opt/sabnzbd/sabnzbd.ini')
 source=("https://github.com/sabnzbd/sabnzbd/releases/download/${pkgver}/${_pkgname}-${pkgver}-src.tar.gz"
-        'sabnzbd'
-        'sabnzbd.desktop'
-        'addnzb.sh'
-        'nzb.png'
-        'sabnzbd.png'
-        'x-nzb.xml'
         'sabnzbd.service'
         'sabnzbd.sysusers'
-        'sabnzbd.tmpfiles'
-        'sabnzbd.confd')
-
+        'sabnzbd.tmpfiles')
+        
 sha256sums=('f3ab6dffba914e6ddf88f1a755ec3ebaa95f0bdbec6f04b7bf0f90822249bb0c'
-            '82630edfc767a383843ffaae9d716e99010dad9e93bdee08d541faa74e694a65'
-            '887f93942b78c0475009b1ce84b502c28e273c222451a4736cd4c37ff5454f04'
-            '30ffff8b9c00e91358cd6c5dca89f9d9f8f12843e7b3c44c6d5b0f09b0ea424a'
-            'ef8f4fb1a3a0750c74b7addd302ab8733187ad370b5d27336afb2677d7154571'
-            'fce3e065d017ce3bc4548a766f25c95f982af4f6085263c72f3000f49d810409'
-            'f53261d7578c67fb9fd6a639df94cd53604bcf37b9b03a926cb03e5214b496fe'
             '64f5c25f140456489d71e8c7eba115362640edff81087515605db254efd3038f'
             '8cdeae7e8fa327bafc2fd1b19c1995f89f52b2ba231c8305b4e7269ab9e0738a'
-            'f86a23384e430b79b328167262216ad315ef89c4a2c49276e6d25c5f7b4cf5bf'
-            '8462203454d488b5d4f7beb85e61da2efa42d3dffa465f3bf16a95abe0bc7c0a')
+            'f86a23384e430b79b328167262216ad315ef89c4a2c49276e6d25c5f7b4cf5bf')
 
 package() {
   mkdir -p "${pkgdir}/opt/sabnzbd"
@@ -59,16 +44,7 @@ package() {
   find "${pkgdir}/opt/sabnzbd" -type f -exec chmod 644 {} \;
   chmod 755 "${pkgdir}/opt/sabnzbd/SABnzbd.py"
 
-  install -D -m 755 "${srcdir}/sabnzbd"       "${pkgdir}/usr/bin/sabnzbd"
-  install -D -m 644 "${srcdir}/sabnzbd.confd" "${pkgdir}/etc/conf.d/sabnzbd"
-
   install -D -m 644 "${srcdir}/sabnzbd.service" "${pkgdir}/usr/lib/systemd/system/sabnzbd.service"
   install -D -m 644 "${srcdir}/sabnzbd.sysusers" "${pkgdir}/usr/lib/sysusers.d/sabnzbd.conf"
   install -D -m 644 "${srcdir}/sabnzbd.tmpfiles" "${pkgdir}/usr/lib/tmpfiles.d/sabnzbd.conf"
-
-  install -D -m 755 "${srcdir}/sabnzbd.desktop" "${pkgdir}/usr/share/applications/sabnzbd.desktop"
-  install -D -m 755 "${srcdir}/addnzb.sh"    "${pkgdir}/opt/sabnzbd/addnzb.sh"
-  install -D -m 644 "${srcdir}/nzb.png"    "${pkgdir}/opt/sabnzbd/nzb.png"
-  install -D -m 644 "${srcdir}/sabnzbd.png"  "${pkgdir}/opt/sabnzbd/sabnzbd.png"
-  install -D -m 770 "${srcdir}/x-nzb.xml"    "${pkgdir}/opt/sabnzbd/x-nzb.xml"
 }
diff --git a/addnzb.sh b/addnzb.sh
deleted file mode 100644
index e3b60513382c..000000000000
--- a/addnzb.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/sh
-
-. /etc/conf.d/sabnzbd 
-curl -s -F apikey="$API_KEY" -F mode="addfile" -F name=@"$1" $URL/sabnzbd/api &> /dev/null
diff --git a/nzb.png b/nzb.png
deleted file mode 100644
index f443c215e529..000000000000
--- a/nzb.png
+++ /dev/null
diff --git a/sab2_64.png b/sab2_64.png
deleted file mode 100644
index 2c6290006300..000000000000
--- a/sab2_64.png
+++ /dev/null
diff --git a/sabnzbd b/sabnzbd
deleted file mode 100644
index 0fa0d41ddddd..000000000000
--- a/sabnzbd
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-python2 /opt/sabnzbd/SABnzbd.py -f ${HOME}/.sabnzbd.ini "${@}"
diff --git a/sabnzbd.confd b/sabnzbd.confd
deleted file mode 100644
index 389676c6196d..000000000000
--- a/sabnzbd.confd
+++ /dev/null
@@ -1,8 +0,0 @@
-# This file is used to make association of .nzb files with SABnzbd possible.
-# If you do not want this feature, you do no have to fill in these settings.
-
-# The SABnzbd url. Make sure to add a username and password if required
-URL="http://127.0.0.1:8080"
-
-# Put the API key from Config > General here
-API_KEY=""
diff --git a/sabnzbd.desktop b/sabnzbd.desktop
deleted file mode 100755
index 4ce54a2a515e..000000000000
--- a/sabnzbd.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env xdg-open
-[Desktop Entry]
-Type=Application
-Version=1.0
-Name=SABnzbd+
-GenericName=Binary Newsreader
-Icon=/opt/sabnzbd/sabnzbd.png
-Exec=sh /opt/sabnzbd/addnzb.sh %u
-Terminal=false
-Categories=Network
-MimeType=application/x-nzb
diff --git a/sabnzbd.install b/sabnzbd.install
index a0abc8266b6f..8cb6bab0600b 100644
--- a/sabnzbd.install
+++ b/sabnzbd.install
@@ -2,19 +2,6 @@
 SABNZBD_DIR="/opt/sabnzbd"  # should not be changed
 
 ## arg 1:  the new package version
-post_install() {
-  # add x-nzb mimetype
-  if [[ -f /usr/bin/xdg-mime ]]; then
-    xdg-mime install --mode system "${SABNZBD_DIR}/x-nzb.xml"
-    xdg-icon-resource install --context mimetypes --size 256 "${SABNZBD_DIR}/nzb.png" application-x-nzb
-  fi
-
-  cat << "EOM"
-==> If you want to associate .nzb-files with SABnzbd, run 'xdg-mime default sabnzbd.desktop applications/x-nzb'
-EOM
-}
-
-## arg 1:  the new package version
 ## arg 2:  the old package version
 pre_upgrade() {
   PID="$(pgrep -f SABnzbd.py)"
@@ -25,16 +12,6 @@ pre_upgrade() {
 }
 
 ## arg 1:  the old package version
-pre_remove() {
-  pre_upgrade
-
-  if [[ -f /usr/bin/xdg-mime ]]; then
-    xdg-mime uninstall --mode system "${SABNZBD_DIR}/x-nzb.xml"
-    xdg-icon-resource uninstall --context mimetypes --size 256 application-x-nzb
-  fi
-}
-
-## arg 1:  the old package version
 post_remove() {
   echo "==> There may be some files left in ${SABNZBD_DIR}."
 }
diff --git a/sabnzbd.png b/sabnzbd.png
deleted file mode 100644
index 5770c0a9f96c..000000000000
--- a/sabnzbd.png
+++ /dev/null
diff --git a/x-nzb.xml b/x-nzb.xml
deleted file mode 100644
index e77d2841031d..000000000000
--- a/x-nzb.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-nzb">
-  
-    <comment xml:lang='en'>An XML-based file format for retrieving posts from NNTP (Usenet) servers</comment>
-    <sub-class-of type="application/xml"/>
-    <glob pattern="*.nzb"/>
-
-  </mime-type>
-</mime-info>