mirror of
https://github.com/kovidgoyal/calibre.git
synced 2025-07-09 03:04:10 -04:00
BSD patches
This commit is contained in:
parent
37eb993044
commit
43e8d66dfc
@ -28,7 +28,8 @@ isosx = 'darwin' in _plat
|
|||||||
isnewosx = isosx and getattr(sys, 'new_app_bundle', False)
|
isnewosx = isosx and getattr(sys, 'new_app_bundle', False)
|
||||||
isfreebsd = 'freebsd' in _plat
|
isfreebsd = 'freebsd' in _plat
|
||||||
isnetbsd = 'netbsd' in _plat
|
isnetbsd = 'netbsd' in _plat
|
||||||
isbsd = isfreebsd or isnetbsd
|
isdragonflybsd = 'dragonfly' in _plat
|
||||||
|
isbsd = isfreebsd or isnetbsd or isdragonflybsd
|
||||||
islinux = not(iswindows or isosx or isbsd)
|
islinux = not(iswindows or isosx or isbsd)
|
||||||
isfrozen = hasattr(sys, 'frozen')
|
isfrozen = hasattr(sys, 'frozen')
|
||||||
isunix = isosx or islinux
|
isunix = isosx or islinux
|
||||||
|
@ -10,7 +10,8 @@ from threading import RLock
|
|||||||
from collections import namedtuple
|
from collections import namedtuple
|
||||||
|
|
||||||
from calibre import prints, as_unicode
|
from calibre import prints, as_unicode
|
||||||
from calibre.constants import iswindows, isosx, plugins, islinux, isfreebsd
|
from calibre.constants import (iswindows, isosx, plugins, islinux, isfreebsd,
|
||||||
|
isnetbsd)
|
||||||
|
|
||||||
osx_scanner = win_scanner = linux_scanner = None
|
osx_scanner = win_scanner = linux_scanner = None
|
||||||
|
|
||||||
@ -253,13 +254,18 @@ freebsd_scanner = None
|
|||||||
if isfreebsd:
|
if isfreebsd:
|
||||||
freebsd_scanner = FreeBSDScanner()
|
freebsd_scanner = FreeBSDScanner()
|
||||||
|
|
||||||
|
netbsd_scanner = None
|
||||||
|
|
||||||
|
''' NetBSD support currently not written yet '''
|
||||||
|
if isnetbsd:
|
||||||
|
netbsd_scanner = None
|
||||||
|
|
||||||
class DeviceScanner(object):
|
class DeviceScanner(object):
|
||||||
|
|
||||||
def __init__(self, *args):
|
def __init__(self, *args):
|
||||||
if isosx and osx_scanner is None:
|
if isosx and osx_scanner is None:
|
||||||
raise RuntimeError('The Python extension usbobserver must be available on OS X.')
|
raise RuntimeError('The Python extension usbobserver must be available on OS X.')
|
||||||
self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else linux_scanner
|
self.scanner = win_scanner if iswindows else osx_scanner if isosx else freebsd_scanner if isfreebsd else netbsd_scanner if isnetbsd else linux_scanner
|
||||||
self.devices = []
|
self.devices = []
|
||||||
|
|
||||||
def scan(self):
|
def scan(self):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user