removed old external plugins, fixed optdepens

4 files changed, 14 insertions, 234 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6732ad558e03..32a717e651f6 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = rutorrent-git
 	pkgdesc = Web frontend to rTorrent in PHP designed to resemble uTorrent
-	pkgver = r2617.1f15836b
+	pkgver = r2999.3830f834
 	pkgrel = 1
 	url = https://github.com/Novik/ruTorrent
 	install = rutorrent.install
@@ -10,12 +10,13 @@ pkgbase = rutorrent-git
 	depends = php
 	depends = curl
 	depends = mktorrent
+	optdepends = ffmpeg: enable screenshots plugin
+	optdepends = sox: enable spectrogram plugin
+	optdepends = mediainfo: enable mediainfo plugin
 	optdepends = php-geoip: enable geoip plugin
-	optdepends = geoip: enable geoip plugin
 	optdepends = unrar: enable unpack plugin
 	optdepends = unzip: enable unpack plugin
-	optdepends = plowshare: fileupload plugin functionality
-	optdepends = python-cfscrape: cloudflare plugin requirement
+	optdepends = python-cloudscraper: cloudflare plugin requirement
 	provides = rutorrent
 	provides = rutorrent-plugins
 	conflicts = rutorrent
@@ -24,26 +25,7 @@ pkgbase = rutorrent-git
 	backup = usr/share/webapps/rutorrent/conf/config.php
 	backup = usr/share/webapps/rutorrent/conf/access.ini
 	backup = usr/share/webapps/rutorrent/conf/plugins.ini
-	source = plugins.ini
-	source = https://raw.githubusercontent.com/weixiyen/jquery-filedrop/master/jquery.filedrop.js
 	source = rutorrent::git+https://github.com/Novik/ruTorrent.git
-	source = titlebar::git+https://github.com/SanKen/rutorrent-titlebar.git
-	source = ratiocolor::git+https://github.com/senki/rutorrent-ratiocolor.git
-	source = extra::git+https://github.com/nelu/rutorrent-thirdparty-plugins.git
-	source = mobile::git+https://github.com/xombiemp/rutorrentMobile.git
-	source = MaterialDesign::git+https://github.com/Phlooo/ruTorrent-MaterialDesign.git
-	source = QuickBox::git+https://github.com/QuickBox/club-QuickBox.git
-	source = git+https://github.com/exetico/FlatUI.git
-	md5sums = 21b595d878e49dde91fca665a0a8effb
-	md5sums = 3e0002fe9ce69f43513152c515944559
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
-	md5sums = SKIP
 	md5sums = SKIP
 
 pkgname = rutorrent-git
-
diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f7591d37d238..000000000000
--- a/.gitignore
+++ /dev/null
@@ -1,10 +0,0 @@
-extra/
-chat/
-file*/
-mediastream/
-pkg/
-src/
-rutorrent/
-titlebar/
-*.pkg.tar
-jquery.filedrop.js
diff --git a/PKGBUILD b/PKGBUILD
index 30a8d0d555b8..abbd5bf503ae 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: skydrome <skydrome@i2pmail.org>
 
 pkgname='rutorrent-git'
-pkgver=r2617.1f15836b
+pkgver=r2999.3830f834
 pkgrel=1
 pkgdesc="Web frontend to rTorrent in PHP designed to resemble uTorrent"
 url="https://github.com/Novik/ruTorrent"
@@ -14,12 +14,13 @@ options=(!strip)
 
 depends=('php' 'curl' 'mktorrent')
 makedepends=('git')
-optdepends=('php-geoip: enable geoip plugin'
-            'geoip: enable geoip plugin'
+optdepends=('ffmpeg: enable screenshots plugin'
+            'sox: enable spectrogram plugin'
+            'mediainfo: enable mediainfo plugin'
+            'php-geoip: enable geoip plugin'
             'unrar: enable unpack plugin'
             'unzip: enable unpack plugin'
-            'plowshare: fileupload plugin functionality'
-            'python-cfscrape: cloudflare plugin requirement')
+            'python-cloudscraper: cloudflare plugin requirement')
  
 conflicts=('rutorrent' 'rutorrent-plugins')
 provides=('rutorrent' 'rutorrent-plugins')
@@ -29,39 +30,9 @@ backup=("${_webdir}/rutorrent/conf/config.php"
         "${_webdir}/rutorrent/conf/access.ini"
         "${_webdir}/rutorrent/conf/plugins.ini")
 
-_plugins=('extra/filemanager'
-          'extra/fileshare'
-          'extra/fileupload'
-          'extra/mediastream'
-          'titlebar'
-          'ratiocolor'
-          'mobile')
-
-_themes=('MaterialDesign'
-         'QuickBox'
-         'FlatUI')
-
-source=("plugins.ini"
-        "https://raw.githubusercontent.com/weixiyen/jquery-filedrop/master/jquery.filedrop.js"
-        "rutorrent::git+https://github.com/Novik/ruTorrent.git"
-        "titlebar::git+https://github.com/SanKen/rutorrent-titlebar.git"
-        "ratiocolor::git+https://github.com/senki/rutorrent-ratiocolor.git"
-        "extra::git+https://github.com/nelu/rutorrent-thirdparty-plugins.git"
-        "mobile::git+https://github.com/xombiemp/rutorrentMobile.git"
-        "MaterialDesign::git+https://github.com/Phlooo/ruTorrent-MaterialDesign.git"
-        "QuickBox::git+https://github.com/QuickBox/club-QuickBox.git"
-        "git+https://github.com/exetico/FlatUI.git")
-
-md5sums=('21b595d878e49dde91fca665a0a8effb'
-         '3e0002fe9ce69f43513152c515944559'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP'
-         'SKIP')
+source=("rutorrent::git+https://github.com/Novik/ruTorrent.git")
+
+md5sums=('SKIP')
 
 pkgver() {
     cd "$srcdir/rutorrent"
@@ -85,8 +56,6 @@ prepare() {
     done
 
     for i in rar zip unzip unrar tar; do
-        sed -i ../extra/filemanager/conf.php \
-            -e "s:\$pathToExternals\['$i'\] = '':\$pathToExternals\['$i'\] = '/usr/bin/$i':"
         sed -i plugins/unpack/conf.php \
             -e "s:\$pathToExternals\['$i'\] = '':\$pathToExternals\['$i'\] = '/usr/bin/$i':"
     done
@@ -110,18 +79,6 @@ package() {
     export LC_ALL=$LANG
     cd "$srcdir/rutorrent/plugins"
 
-    for i in ${_plugins[@]}; do
-        rm -rf "$srcdir/$i/.git"
-        cp -r  "$srcdir/$i" .
-    done
-
-    for i in ${_themes[@]}; do
-        rm -rf "$srcdir/$i/.git"
-        cp -r  "$srcdir/$i" ./theme/themes
-    done
-
-    cp -f  "$srcdir/jquery.filedrop.js" filedrop/jquery.filedrop.js
-
     install -dm755 "$pkgdir/$_webdir"
 
     cd "$pkgdir/$_webdir"
@@ -131,7 +88,6 @@ package() {
 
     cd rutorrent
 
-    install -Dm755 "$srcdir/plugins.ini" conf/plugins.ini
     mkdir -p tmp
     cp share/.htaccess tmp/
 }
diff --git a/plugins.ini b/plugins.ini
deleted file mode 100755
index d1973a4c3efc..000000000000
--- a/plugins.ini
+++ /dev/null
@@ -1,148 +0,0 @@
-;; Plugins' permissions.
-;; If flag is not found in plugin section, corresponding flag from "default" section is used.
-;; If flag is not found in "default" section, it is assumed to be "yes".
-;;
-;; For setting individual plugin permissions you must write something like that:
-;;
-;; [ratio]
-;; enabled = yes			;; also may be "user-defined", in this case user can control plugin's state from UI
-;; canChangeToolbar = yes
-;; canChangeMenu = yes
-;; canChangeOptions = no
-;; canChangeTabs = yes
-;; canChangeColumns = yes
-;; canChangeStatusBar = yes
-;; canChangeCategory = yes
-;; canBeShutdowned = yes
-
-[default]
-enabled = user-defined
-canChangeToolbar = yes
-canChangeMenu = yes
-canChangeOptions = yes
-canChangeTabs = yes
-canChangeColumns = yes
-canChangeStatusBar = yes
-canChangeCategory = yes
-canBeShutdowned = yes
-
-
-;; Default
-
-[_getdir]
-enabled = yes
-[_noty2]
-enabled = yes
-[_task]
-enabled = yes
-[datadir]
-enabled = yes
-[erasedata]
-enabled = yes
-[httprpc]
-enabled = yes
-canBeShutdowned = no
-[show_peers_like_wtorrent]
-enabled = yes
-[theme]
-enabled = yes
-
-
-;; Enabled
-
-[autotools]
-enabled = user-defined
-[check_port]
-enabled = user-defined
-[cookies]
-enabled = user-defined
-[cpuload]
-enabled = user-defined
-[create]
-enabled = user-defined
-[data]
-enabled = user-defined
-[diskspace]
-enabled = user-defined
-[edit]
-enabled = user-defined
-[extratio]
-enabled = user-defined
-[extsearch]
-enabled = user-defined
-[feeds]
-enabled = user-defined
-[fileshare]
-enabled = user-defined
-[fileupload]
-enabled = user-defined
-[filedrop]
-enabled = user-defined
-[filemanager]
-enabled = user-defined
-[geoip]
-enabled = user-defined
-[mobile]
-enabled = user-defined
-[ratio]
-enabled = user-defined
-[ratiocolor]
-enabled = user-defined
-[rss]
-enabled = user-defined
-[seedingtime]
-enabled = user-defined
-[screenshots]
-enabled = user-defined
-[throttle]
-enabled = user-defined
-[titlebar]
-enabled = user-defined
-[tracklabels]
-enabled = user-defined
-[trafic]
-enabled = user-defined
-[unpack]
-enabled = user-defined
-
-
-;; Disabled
-
-[_noty]
-enabled = no
-[chat]
-enabled = no
-[chunks]
-enabled = no
-[history]
-enabled = no
-[instantsearch]
-enabled = no
-[ipad]
-enabled = no
-[logoff]
-enabled = no
-[loginmgr]
-enabled = no
-[lookat]
-enabled = no
-[mediainfo]
-enabled = no
-[mediastream]
-enabled = no
-[nfo]
-enabled = no
-[retrackers]
-enabled = no
-[rpc]
-enabled = no
-[rssurlrewrite]
-enabled = no
-[rutracker_check]
-enabled = no
-[scheduler]
-enabled = no
-[source]
-enabled = no
-[spectrogram]
-enabled = no