Changeset 6914dbb in ammosreader


Ignore:
Timestamp:
05/19/23 13:27:43 (2 years ago)
Author:
Enrico Schwass <ennoausberlin@…>
Branches:
AmmosSource, guix
Children:
04097cd
Parents:
efb5900
Message:

remove DEBUG parameter and update package to new logger mechanism

Files:
22 added
22 deleted
4 edited

Legend:

Unmodified
Added
Removed

  • ammosreader/AbstractAmmosReader.py

    refb5900 r6914dbb  
    11"""I provide a base class for specialized AmmosReaders."""
    2 import logging
    32
    43from abc import ABC, abstractmethod
    … …  
    87from ammosreader.AmmosContainer import AmmosContainer
    98from ammosreader.AmmosConstants import FrameType
    10 
    11 logging.basicConfig(filename='ammos.log', level=logging.DEBUG)
    12 
     9from ammosreader import logger
     10from ammosreader import logger
    1311
    1412class AbstractAmmosReader(ABC):
    … …  
    6765        frames_read = 0
    6866        while True:
    69             logging.info("Reading single frame %s ...", frames_read)
     67            logger.info("Reading single frame %s ...", frames_read)
    7068            current_frame = self.read_next_single_frame()
    7169            if current_frame is not None:
    … …  
    7371                self.container.add_frame(current_frame)
    7472            else:
    75                 logging.debug("Frame: %s incomplete", frames_read+1)
     73                logger.debug("Frame: %s incomplete", frames_read+1)
    7674                break
    77         logging.info("%s frames read", len(self.container.global_frames))
     75        logger.info("%s frames read", len(self.container.global_frames))
    7876        return self.container
    7977
    … …  
    8886
    8987        bytes = self.ammos_file.read(header_size)
    90         logging.info("Reading next global frame header")
     88        logger.info("Reading next global frame header")
    9189        if ((not bytes) or (len(bytes) < header_size)):
    92             logging.debug("Can not read all %s bytes of global frame header", header_size)
     90            logger.debug("Can not read all %s bytes of global frame header", header_size)
    9391            return None
    9492
    … …  
    9896            return None
    9997
    100         # logging.info("Current global frame header %s", current_global_frame_header)
     98        # logger.info("Current global frame header %s", current_global_frame_header)
    10199        return current_global_frame_header
    102100
    … …  
    119117
    120118        if global_frame_header is None:
    121             logging.debug("Global frame header missing")
     119            logger.debug("Global frame header missing")
    122120            return None
    123121
    124122        if global_frame_header.data_header_length is None:
    125             logging.debug("Data header length empty")
     123            logger.debug("Data header length empty")
    126124            return None
    127125
    128126        if global_frame_header.frame_type not in list(FrameType):
    129             logging.info("Unknown frame type %s found", global_frame_header.frame_type)
     127            logger.info("Unknown frame type %s found", global_frame_header.frame_type)
    130128            return None
    131129
    … …  
    141139
    142140        if global_frame_header.frame_type == FrameType.AUDIO_DATA.value:
    143             logging.info("Audio Datastream found")
     141            logger.info("Audio Datastream found")
    144142            global_frame_body = self.read_next_global_frame_body(global_frame_header.data_header_length)
    145143            if global_frame_body is None:
    … …  
    148146
    149147        if global_frame_header.frame_type in if_data_types:
    150             logging.info("IF Datastream found")
     148            logger.info("IF Datastream found")
    151149            global_frame_body = self.read_next_global_frame_body(global_frame_header.data_header_length)
    152150            if global_frame_body is None:
    … …  
    157155            return None
    158156
    159         logging.info("Unsupported frame type %s found", global_frame_header.frame_type)
     157        logger.info("Unsupported frame type %s found", global_frame_header.frame_type)
    160158        return None

  • ammosreader/AmmosAudioReader.py

    refb5900 r6914dbb  
    11"""I provide a specialized Ammos Reader for audio data."""
    2 import logging
    32
    43from ammosreader.AbstractAmmosReader import AbstractAmmosReader
    … …  
    76from ammosreader.AmmosExtendedAudioDataHeader import AmmosExtendedAudioDataHeader
    87from ammosreader.AmmosAudioDataBody import AmmosAudioDataBody
    9 
     8from ammosreader import logger
    109
    1110class AmmosAudioReader(AbstractAmmosReader):
    … …  
    3433        bytes = self.ammos_file.read(header_size)
    3534
    36         logging.info("\nReading global frame body standard data header\n")
     35        logger.info("\nReading global frame body standard data header\n")
    3736        if ((not bytes) or (len(bytes) < header_size)):
    38             logging.debug("Can not read all %s bytes of global frame body data header", header_size)
     37            logger.debug("Can not read all %s bytes of global frame body data header", header_size)
    3938            return None
    4039        return AmmosAudioDataHeader.from_bytes(bytes)
    … …  
    5251
    5352        if ((not bytes) or (len(bytes) < header_size)):
    54             logging.debug("Can not read all %s bytes of global frame extended data header", header_size)
     53            logger.debug("Can not read all %s bytes of global frame extended data header", header_size)
    5554            return None
    5655        return AmmosExtendedAudioDataHeader.from_bytes(bytes)
    … …  
    7776
    7877        if len(byte_string) != total:
    79             logging.debug("Can not read all %s bytes of data body", total)
     78            logger.debug("Can not read all %s bytes of data body", total)
    8079            return None
    8180        return AmmosAudioDataBody(byte_string, number_of_channels, number_of_samples, sample_size)
    … …  
    9190
    9291        if data_header_length == AmmosAudioDataHeader.HEADER_SIZE:
    93             logging.info("Read standard data header")
     92            logger.info("Read standard data header")
    9493            audio_data_header = self.read_next_global_frame_body_data_header()
    9594
    96         logging.info("Data header length %s", data_header_length)
     95        logger.info("Data header length %s", data_header_length)
    9796        if data_header_length == AmmosExtendedAudioDataHeader.HEADER_SIZE:
    98             logging.info("Read extended data header")
     97            logger.info("Read extended data header")
    9998            audio_data_header = self.read_next_global_frame_body_extended_data_header()
    10099
    101100        if audio_data_header is None:
    102             logging.debug("Data header missing or format unknown")
     101            logger.debug("Data header missing or format unknown")
    103102            return None
    104103
    … …  
    108107
    109108        if audio_data_body is None:
    110             logging.debug("Data body missing")
     109            logger.debug("Data body missing")
    111110            return None
    112111

  • ammosreader/AmmosAudioSocketReader.py

    refb5900 r6914dbb  
    88from ammosreader.AmmosExtendedAudioDataHeader import AmmosExtendedAudioDataHeader
    99from ammosreader.AmmosGlobalFrameHeader import AmmosGlobalFrameHeader
    10 
     10from ammosreader import logger
    1111
    1212class AmmosAudioSocketReader:
    13     def __init__(self, socket:socket.socket, debug=True):
     13    def __init__(self, socket:socket.socket):
    1414        """
    1515        Initializes the AmmosAudioSocketReader
    … …  
    1717        Args:
    1818            socket (socket.socket): socket to read from
    19             debug (bool): if true, prints debug information
    2019        """
    2120
    … …  
    2524        #input socket to read from
    2625        self.__socket = socket
    27 
    28         #
    29         self.DEBUG_MODE = debug
    3026
    3127    def __get_next_data(self, byte_count: int) -> bytearray:
    … …  
    4642       
    4743        while len(b''.join(byte_array)) < byte_count:
    48             if self.DEBUG_MODE:
    49                 print(f"Remaining Bytes: {byte_count - len(b''.join(byte_array))}")
     44            logger.info(f"Remaining Bytes: {byte_count - len(b''.join(byte_array))}")
    5045            self.__socket.settimeout(5)
    5146            new_bytes = self.__socket.recv(byte_count - len(b''.join(byte_array)), socket.MSG_WAITALL)
    … …  
    5449                raise TimeoutError("Socket timed out while reading data")
    5550
    56             if self.DEBUG_MODE:
    57                 print(f"Got {len(new_bytes)} bytes of {byte_count - len(b''.join(byte_array))} ramining")
     51            logger.info(f"Got {len(new_bytes)} bytes of {byte_count - len(b''.join(byte_array))} ramining")
    5852
    5953            byte_array.append(new_bytes)
    … …  
    107101                   
    108102                ammos_global_header = AmmosGlobalFrameHeader.from_bytes(b''.join(ammos_global_header_buffer))
    109                 if self.DEBUG_MODE:
    110                     print(ammos_global_header)
     103                logger.info(ammos_global_header)
    111104
    112105                if ammos_global_header.data_header_length == 44 and ammos_global_header.frame_type == 256:
    … …  
    116109
    117110                    ammos_extended_audio_data_header = AmmosExtendedAudioDataHeader.from_bytes(byte_array_header)
    118                     if self.DEBUG_MODE:
    119                         print(ammos_extended_audio_data_header.number_of_samples, ammos_extended_audio_data_header.number_of_channels, ammos_extended_audio_data_header.sample_size)
     111                    logger.info(ammos_extended_audio_data_header.number_of_samples, ammos_extended_audio_data_header.number_of_channels, ammos_extended_audio_data_header.sample_size)
    120112                    audio_body = self.__get_next_data(ammos_extended_audio_data_header.number_of_samples*
    121113                                                      ammos_extended_audio_data_header.number_of_channels*
    … …  
    123115
    124116                    audio_array = self.__audio_data_body_to_numpy(audio_body)
    125                     if self.DEBUG_MODE:
    126                         print(len(audio_array), len(audio_array)/ammos_extended_audio_data_header.sample_rate)
     117                    logger.info(len(audio_array), len(audio_array)/ammos_extended_audio_data_header.sample_rate)
    127118
    128119                    return [audio_array, ammos_extended_audio_data_header.sample_rate]
    … …  
    134125
    135126                    ammos_audio_data_header = AmmosAudioDataHeader.from_bytes(byte_array_header)
    136                     if self.DEBUG_MODE:
    137                         print(ammos_audio_data_header.number_of_samples, ammos_audio_data_header.number_of_channels, ammos_audio_data_header.sample_size)
     127                    logger.info(ammos_audio_data_header.number_of_samples, ammos_audio_data_header.number_of_channels, ammos_audio_data_header.sample_size)
    138128                    audio_body = self.__get_next_data(ammos_extended_audio_data_header.number_of_samples*
    139129                                                      ammos_extended_audio_data_header.number_of_channels*
    … …  
    141131
    142132                    audio_array = self.__audio_data_body_to_numpy(audio_body)
    143                     if self.DEBUG_MODE:
    144                         print(len(audio_array), len(audio_array)/ammos_audio_data_header.sample_rate)
     133                    logger.info(len(audio_array), len(audio_array)/ammos_audio_data_header.sample_rate)
    145134
    146135                    return [audio_array, ammos_audio_data_header.sample_rate]

  • ammosreader/AmmosIFReader.py

    refb5900 r6914dbb  
    11"""I provide a specialized Ammos Reader for IF data."""
    2 import logging
    32
    43from ammosreader.AbstractAmmosReader import AbstractAmmosReader
    … …  
    98from ammosreader.AmmosIFDataBlock import AmmosIFDataBlock
    109from ammosreader.AmmosIFDataBlockHeader import AmmosIFDataBlockHeader
    11 
     10from ammosreader import logger
    1211
    1312class AmmosIFReader(AbstractAmmosReader):
    … …  
    2322        bytes = self.ammos_file.read(header_size)
    2423
    25         logging.info("\nReading global frame body standard data header\n")
     24        logger.info("\nReading global frame body standard data header\n")
    2625        if ((not bytes) or (len(bytes) < header_size)):
    27             logging.debug("Can not read all %s bytes of global frame body data header", header_size)
     26            logger.debug("Can not read all %s bytes of global frame body data header", header_size)
    2827            return None
    2928        return AmmosIFDataHeader.from_bytes(bytes)
    … …  
    4039        bytes = self.ammos_file.read(header_size)
    4140
    42         logging.info("\nReading global frame body extended data header\n")
     41        logger.info("\nReading global frame body extended data header\n")
    4342        if ((not bytes) or (len(bytes) < header_size)):
    44             logging.debug("Can not read all %s bytes of global frame extended data header", header_size)
     43            logger.debug("Can not read all %s bytes of global frame extended data header", header_size)
    4544            return None
    4645        return AmmosExtendedIFDataHeader.from_bytes(bytes)
    … …  
    6766
    6867        if len(byte_string) != total:
    69             logging.debug("Can not read all %s bytes of data body", total)
     68            logger.debug("Can not read all %s bytes of data body", total)
    7069            return None
    7170
    … …  
    9291
    9392        if if_data_header is None:
    94             logging.debug("Data header missing")
     93            logger.debug("Data header missing")
    9594            return None
    9695
    … …  
    9897
    9998        if if_data_body is None:
    100             logging.debug("Data body missing")
     99            logger.debug("Data body missing")
    101100            return None
    102101
Note: See TracChangeset for help on using the changeset viewer.