Compare commits

...

3 Commits

Author SHA1 Message Date
FORCHA PEARL
ff487582f9
Merge 4b89887f4b into 9d47acc228 2024-05-03 13:28:09 +02:00
Tek
9d47acc228
Returns empty string when no date in date converter (#493) 2024-04-30 16:51:58 +02:00
FORCHA
4b89887f4b
Fixed docker warnings
Removed empty lines within RUN command
2023-08-04 18:29:46 +01:00
2 changed files with 3 additions and 8 deletions

View File

@ -13,7 +13,6 @@ ENV DEBIAN_FRONTEND=noninteractive
# ----------------------------
RUN apt update \
&& apt install -y python3 python3-pip libusb-1.0-0-dev wget unzip default-jre-headless adb \
# Install build tools for libimobiledevice
# ----------------------------------------
build-essential \
@ -27,7 +26,6 @@ RUN apt update \
libssl-dev \
sqlite3 \
pkg-config \
# Clean up
# --------
&& apt-get clean \
@ -41,17 +39,11 @@ RUN git clone https://github.com/libimobiledevice/libplist \
&& git clone https://github.com/libimobiledevice/libusbmuxd \
&& git clone https://github.com/libimobiledevice/libimobiledevice \
&& git clone https://github.com/libimobiledevice/usbmuxd \
&& cd libplist && ./autogen.sh && make && make install && ldconfig \
&& cd ../libimobiledevice-glue && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh --prefix=/usr && make && make install && ldconfig \
&& cd ../libusbmuxd && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh && make && make install && ldconfig \
&& cd ../libimobiledevice && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh --enable-debug && make && make install && ldconfig \
&& cd ../usbmuxd && PKG_CONFIG_PATH=/usr/local/lib/pkgconfig ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var --runstatedir=/run && make && make install \
# Clean up.
&& cd .. && rm -rf libplist libimobiledevice-glue libusbmuxd libimobiledevice usbmuxd

View File

@ -59,6 +59,9 @@ def convert_datetime_to_iso(date_time: datetime.datetime) -> str:
:rtype: str
"""
if not date_time:
return ""
if date_time.tzinfo:
# Timezone aware object - convert to UTC
date_time = date_time.astimezone(tz=datetime.timezone.utc)