mirror of
https://github.com/jlu5/SupyPlugins.git
synced 2025-05-03 17:01:07 -05:00
Updates to PkgInfo
- In exception handling, only catch utils.web.Error instead of all possible exceptions - Rename 'package' command to 'pkg' - vlist/pkgsearch: guess distribution from release name as with 'pkg', so that 'vlist trusty <app>' is accepted
This commit is contained in:
James Lu
parent
523e0f9fad
commit
afe692e8c9
@ -70,6 +70,21 @@ class PkgInfo(callbacks.Plugin):
|
||||
self.addrs = {'ubuntu':'http://packages.ubuntu.com/',
|
||||
'debian':"https://packages.debian.org/"}
|
||||
|
||||
def _getDistro(self, release):
|
||||
"""<release>
|
||||
|
||||
Guesses the distribution from the release name."""
|
||||
release = release.lower()
|
||||
if release.startswith(("oldstable","squeeze","wheezy","stable",
|
||||
"jessie","testing","sid","unstable")):
|
||||
distro = "debian"
|
||||
elif release.startswith(("hardy","lucid","maverick","natty","oneiric",
|
||||
"precise","quantal","raring","saucy","trusty","utopic","vivid")):
|
||||
distro = "ubuntu"
|
||||
else:
|
||||
distro = None
|
||||
return distro
|
||||
|
||||
def MadisonParse(self, pkg, dist, codenames='', suite='', useSource=False):
|
||||
arch = ','.join(self.registryValue("archs"))
|
||||
self.arg = {'package':pkg,'table':dist,'a':arch,'c':codenames,'s':suite,
|
||||
@ -97,26 +112,25 @@ class PkgInfo(callbacks.Plugin):
|
||||
else:
|
||||
self.log.debug("PkgInfo: No results found for URL %s" % url)
|
||||
|
||||
def package(self, irc, msg, args, suite, pkg):
|
||||
"""<suite> <package>
|
||||
def package(self, irc, msg, args, release, pkg):
|
||||
"""<release> <package>
|
||||
|
||||
Fetches information for <package> from Debian or Ubuntu's repositories.
|
||||
<suite> is the codename/release name (e.g. 'trusty', 'squeeze').
|
||||
<release> is the codename/release name (e.g. 'trusty', 'squeeze').
|
||||
For Arch Linux packages, please use 'archpkg' and 'archaur' instead."""
|
||||
if not bs4Present:
|
||||
irc.error("This command requires the Beautiful Soup 4 library. See"
|
||||
" https://github.com/GLolol/SupyPlugins/blob/master/README.md"
|
||||
"#pkginfo for instructions on how to install it.", Raise=True)
|
||||
# Guess the distro from the suite name
|
||||
pkg, suite, pkg = map(str.lower, (pkg, suite, pkg))
|
||||
if suite.startswith(("oldstable","squeeze","wheezy","stable",
|
||||
"jessie","testing","sid","unstable")):
|
||||
distro = "debian"
|
||||
else: distro = "ubuntu"
|
||||
url = self.addrs[distro] + "{}/{}".format(suite, pkg)
|
||||
pkg = pkg.lower()
|
||||
distro = self._getDistro(release)
|
||||
try:
|
||||
url = self.addrs[distro] + "{}/{}".format(release, pkg)
|
||||
except KeyError:
|
||||
irc.error('Unknown distribution.', Raise=True)
|
||||
try:
|
||||
fd = utils.web.getUrl(url).decode("utf-8")
|
||||
except Exception as e:
|
||||
except utils.web.Error as e:
|
||||
irc.error(str(e), Raise=True)
|
||||
soup = BeautifulSoup(fd)
|
||||
if "Error" in soup.title.string:
|
||||
@ -131,17 +145,20 @@ class PkgInfo(callbacks.Plugin):
|
||||
keywords = keywords.replace(",","").split()
|
||||
irc.reply("Package: \x02{} ({})\x02 in {} - {}; View more at: {}".format(pkg,
|
||||
keywords[-1], keywords[1], desc, url))
|
||||
package = wrap(package, ['somethingWithoutSpaces', 'somethingWithoutSpaces'])
|
||||
pkg = wrap(package, ['somethingWithoutSpaces', 'somethingWithoutSpaces'])
|
||||
|
||||
def vlist(self, irc, msg, args, distro, pkg, opts):
|
||||
"""<distribution> <package> [--source]
|
||||
|
||||
Fetches all available version of <package> in <distribution>, if
|
||||
such package exists. Supported entries for <distribution>
|
||||
include: 'debian', 'ubuntu', 'derivatives', and 'all'. If
|
||||
include 'debian', 'ubuntu', 'derivatives', and 'all'. If
|
||||
--source is given, search for packages by source package
|
||||
name."""
|
||||
pkg, distro = map(str.lower, (pkg, distro))
|
||||
supported = ("debian", "ubuntu", "derivatives", "all")
|
||||
if distro not in supported:
|
||||
distro = self._getDistro(distro)
|
||||
d = self.MadisonParse(pkg, distro, useSource='source' in dict(opts))
|
||||
if not d: irc.error("No results found.",Raise=True)
|
||||
try:
|
||||
@ -217,13 +234,15 @@ class PkgInfo(callbacks.Plugin):
|
||||
" https://github.com/GLolol/SupyPlugins/blob/master/README.md"
|
||||
"#pkginfo for instructions on how to install it.", Raise=True)
|
||||
distro = distro.lower()
|
||||
if distro not in ("debian", "ubuntu"):
|
||||
distro = self._getDistro(distro)
|
||||
try:
|
||||
url = '%ssearch?keywords=%s' % (self.addrs[distro], quote(query))
|
||||
except KeyError:
|
||||
irc.error('Unknown distribution.', Raise=True)
|
||||
try:
|
||||
fd = utils.web.getUrl(url).decode("utf-8")
|
||||
except Exception as e:
|
||||
except utils.web.Error as e:
|
||||
irc.error(str(e), Raise=True)
|
||||
soup = BeautifulSoup(fd)
|
||||
# Debian/Ubuntu use h3 for result names in the format 'Package abcd'
|
||||
@ -259,7 +278,7 @@ class PkgInfo(callbacks.Plugin):
|
||||
addr = 'http://packages.linuxmint.com/list.php?release=' + quote(release)
|
||||
try:
|
||||
fd = utils.web.getUrl(addr).decode("utf-8")
|
||||
except Exception as e:
|
||||
except utils.web.Error as e:
|
||||
irc.error(str(e), Raise=True)
|
||||
soup = BeautifulSoup(fd)
|
||||
# Linux Mint puts their package lists in tables
|
||||
|
||||
@ -33,13 +33,13 @@ from supybot.test import *
|
||||
|
||||
class PkgInfoTestCase(PluginTestCase):
|
||||
plugins = ('PkgInfo',)
|
||||
def testPackageCommandBasics(self):
|
||||
self.assertRegexp('package sid bash', 'Package: .*?bash'
|
||||
def testPkgCommand(self):
|
||||
self.assertRegexp('pkg sid bash', 'Package: .*?bash'
|
||||
' .*?; View more at: .*?packages.debian.org/sid/bash')
|
||||
self.assertRegexp('package trusty apt', 'Package: .*?apt'
|
||||
self.assertRegexp('pkg trusty apt', 'Package: .*?apt'
|
||||
' .*?; View more at: .*?packages.ubuntu.com/trusty/apt')
|
||||
self.assertError('package afdsfsadf asfasfasf')
|
||||
self.assertRegexp('package sid afsadfasfsa', 'no such package', re.I)
|
||||
self.assertError('pkg afdsfsadf asfasfasf')
|
||||
self.assertRegexp('pkg sid afsadfasfsa', 'no such package', re.I)
|
||||
|
||||
def testVlistCommandBasics(self):
|
||||
self.assertError('vlist all afdsafas')
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user