diff --git a/configure.ac b/configure.ac index eb871f271..b39f56c47 100644 --- a/configure.ac +++ b/configure.ac @@ -148,7 +148,6 @@ epgrefresh/Makefile epgrefresh/meta/Makefile epgrefresh/po/Makefile epgrefresh/src/Makefile -epgrefresh/src/webinterface/Makefile epgsearch/Makefile epgsearch/meta/Makefile diff --git a/epgrefresh/src/Makefile.am b/epgrefresh/src/Makefile.am index 1a35d8361..7ece4c182 100644 --- a/epgrefresh/src/Makefile.am +++ b/epgrefresh/src/Makefile.am @@ -1,6 +1,4 @@ installdir = $(libdir)/enigma2/python/Plugins/Extensions/EPGRefresh -SUBDIRS = webinterface - install_PYTHON = *.py install_DATA = mphelp.xml maintainer.info LICENSE plugin.png diff --git a/epgrefresh/src/plugin.py b/epgrefresh/src/plugin.py index bc4e3602c..3ba1aaa5f 100644 --- a/epgrefresh/src/plugin.py +++ b/epgrefresh/src/plugin.py @@ -271,28 +271,6 @@ def autostart(reason, session=None, **kwargs): os.chmod("%s" % (config.misc.epgcache_filename.value), 0o644) except: pass - if os.path.exists("/usr/lib/enigma2/python/Plugins/Extensions/OpenWebif/pluginshook.src"): - try: - from Plugins.Extensions.EPGRefresh.EPGRefreshResource import \ - EPGRefreshStartRefreshResource, \ - EPGRefreshAddRemoveServiceResource, \ - EPGRefreshListServicesResource, \ - EPGRefreshChangeSettingsResource, \ - EPGRefreshSettingsResource, \ - EPGRefreshPreviewServicesResource, \ - API_VERSION - root = EPGRefreshListServicesResource() - root.putChild(b"refresh", EPGRefreshStartRefreshResource()) - root.putChild(b"add", EPGRefreshAddRemoveServiceResource(EPGRefreshAddRemoveServiceResource.TYPE_ADD)) - root.putChild(b"del", EPGRefreshAddRemoveServiceResource(EPGRefreshAddRemoveServiceResource.TYPE_DEL)) - root.putChild(b"set", EPGRefreshChangeSettingsResource()) - root.putChild(b"get", EPGRefreshSettingsResource()) - root.putChild(b"preview", EPGRefreshPreviewServicesResource()) - from Plugins.Extensions.WebInterface.WebChilds.Toplevel import addExternalChild - addExternalChild(("epgrefresh", root, "EPGRefresh-Plugin", API_VERSION)) - print("[EPGRefresh] Use OpenWebif") - except: - print("[EPGRefresh] Error use OpenWebif") elif reason == 1: epgrefresh.stop() diff --git a/epgrefresh/src/webinterface/EPGRefresh.py b/epgrefresh/src/webinterface/EPGRefresh.py deleted file mode 100644 index 0cbdb0a9f..000000000 --- a/epgrefresh/src/webinterface/EPGRefresh.py +++ /dev/null @@ -1,18 +0,0 @@ -from Plugins.Extensions.WebInterface.WebChilds.Toplevel import addExternalChild -from Plugins.Extensions.EPGRefresh.EPGRefreshResource import \ - EPGRefreshStartRefreshResource, \ - EPGRefreshAddRemoveServiceResource, \ - EPGRefreshListServicesResource, \ - EPGRefreshChangeSettingsResource, \ - EPGRefreshSettingsResource, \ - EPGRefreshPreviewServicesResource, \ - API_VERSION - -root = EPGRefreshListServicesResource() -root.putChild(b"refresh", EPGRefreshStartRefreshResource()) -root.putChild(b"add", EPGRefreshAddRemoveServiceResource(EPGRefreshAddRemoveServiceResource.TYPE_ADD)) -root.putChild(b"del", EPGRefreshAddRemoveServiceResource(EPGRefreshAddRemoveServiceResource.TYPE_DEL)) -root.putChild(b"set", EPGRefreshChangeSettingsResource()) -root.putChild(b"get", EPGRefreshSettingsResource()) -root.putChild(b"preview", EPGRefreshPreviewServicesResource()) -addExternalChild(("epgrefresh", root, "EPGRefresh-Plugin", API_VERSION)) diff --git a/epgrefresh/src/webinterface/Makefile.am b/epgrefresh/src/webinterface/Makefile.am deleted file mode 100644 index 1dd8e0f8d..000000000 --- a/epgrefresh/src/webinterface/Makefile.am +++ /dev/null @@ -1,3 +0,0 @@ -installdir = $(libdir)/enigma2/python/Plugins/Extensions/WebInterface/WebChilds/External/ - -install_PYTHON = *.py