Merge remote-tracking branch 'telmich/install' into oo-restructure

This commit is contained in:
Steven Armstrong 2011-10-05 16:47:49 +02:00
commit 8e06626c5a
2 changed files with 52 additions and 30 deletions

View file

@ -171,30 +171,11 @@ class Path:
"""Return list of available explorers""" """Return list of available explorers"""
return os.listdir(self.global_explorer_dir) return os.listdir(self.global_explorer_dir)
# FIXME: Type - only needs to know its path
def list_type_explorers(self, type):
"""Return list of available explorers for a specific type"""
dir = self.type_dir(type, "explorer")
if os.path.isdir(dir):
list = os.listdir(dir)
else:
list = []
log.debug("Explorers for %s in %s: %s", type, dir, list)
return list
# Stays here # Stays here
def list_types(self): def list_types(self):
"""Retuns list of types""" """Retuns list of types"""
return os.listdir(self.type_base_dir) return os.listdir(self.type_base_dir)
# FIXME: type
def is_install_type(self, type):
"""Check whether a type is used for installation (if not: for configuration)"""
marker = os.path.join(self.type_dir(type), "install")
return os.path.isfile(marker)
# Stays here # Stays here
def list_object_paths(self, starting_point): def list_object_paths(self, starting_point):
"""Return list of paths of existing objects""" """Return list of paths of existing objects"""
@ -260,16 +241,6 @@ class Path:
return objects return objects
# FIXME: Type
def type_dir(self, type, *args):
"""Return (sub-)directory of a type"""
return os.path.join(self.type_base_dir, type, *args)
# FIXME: Type
def remote_type_explorer_dir(self, type):
"""Return remote directory that holds the explorers of a type"""
return os.path.join(REMOTE_TYPE_DIR, type, "explorer")
# Stays here # Stays here
def transfer_object_parameter(self, cdist_object): def transfer_object_parameter(self, cdist_object):
"""Transfer the object parameter to the remote destination""" """Transfer the object parameter to the remote destination"""
@ -286,7 +257,7 @@ class Path:
self.remote_mkdir(REMOTE_GLOBAL_EXPLORER_DIR) self.remote_mkdir(REMOTE_GLOBAL_EXPLORER_DIR)
self.transfer_dir(self.global_explorer_dir, REMOTE_GLOBAL_EXPLORER_DIR) self.transfer_dir(self.global_explorer_dir, REMOTE_GLOBAL_EXPLORER_DIR)
# Stays here # Stays here - FIXME: adjust to type code, loop over types!
def transfer_type_explorers(self, type): def transfer_type_explorers(self, type):
"""Transfer explorers of a type, but only once""" """Transfer explorers of a type, but only once"""
if type in self.type_explorers_transferred: if type in self.type_explorers_transferred:

51
lib/cdist/type.py Normal file
View file

@ -0,0 +1,51 @@
#!/usr/bin/env python3
# -*- coding: utf-8 -*-
#
# 2011 Nico Schottelius (nico-cdist at schottelius.org)
#
# This file is part of cdist.
#
# cdist is free software: you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation, either version 3 of the License, or
# (at your option) any later version.
#
# cdist is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with cdist. If not, see <http://www.gnu.org/licenses/>.
#
#
import logging
import os
log = logging.getLogger(__name__)
class Type(object):
def __init__(self, path, remote_path):
self.path = path
self.remote_path = remote_path
def list_explorers(self):
"""Return list of available explorers"""
dir = os.path.join(self.path, "explorer")
if os.path.isdir(dir):
list = os.listdir(dir)
else:
list = []
log.debug("Explorers for %s in %s: %s", type, dir, list)
return list
def is_install(self):
"""Check whether a type is used for installation (if not: for configuration)"""
return os.path.isfile(os.path.join(self.path, "install"))
def remote_explorer_dir(self):
"""Return remote directory that holds the explorers of a type"""
return os.path.join(self.remote_path, "explorer")