summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* * src/db-artwork-writer.c, src/itdb_itunesdb.c,Jorg Schuler2005-12-047-34/+30
| | | | | | | | src/itdb_track.c, src/ithumb-writer.c: handle artwork size and count self-consistently. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1184 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * src/db-artwork-writer/parser.c: Create ArtworkDB when it doesJorg Schuler2005-12-043-8/+30
| | | | | | | not exist. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1183 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-30 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-302-3/+10
| | | | | | | | * src/db-artwork-parser.c: (parse_mhni): don't crash if ipod_image_new_from_mhni returns NULL git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1182 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-28 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-284-0/+24
| | | | | | | | | | | | * src/itdb_artwork.c: (unpack_RGB_565), (get_pixel_data): * src/itdb_itunesdb.c: (get_mhod): * src/ithumb-writer.c: (pack_RGB_565), (ithumb_rearrange_thumbnail_file): added some paranoia checks before doing some mallocs to prevent potential int overflows in some mallocs which could be triggered by using forged iTunesDB files git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1181 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* New API for thumbnail support: see src/itdb.h for details.Jorg Schuler2005-11-2813-466/+1054
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/itdb.h: Introduced Itdb_Artwork and ItdbThumbType and changed Itdb_Image to Itdb_Thumb throughout the source. * src/itdb_artwork.c: new file as backend for Itdb_Artwork support (new, free, duplicate, get_thumb_by_type, add_thumbnail, remove_thumbnail, remove_thumbnails), as well as for the Itdb_Thumb support (new, free, duplicate, get_gdk_pixbuf, get_filename) * src/itdb_track.c: new functions for artwork support (set_thumbnails, remove_thumbnails) * src/ithumb-writer.c: added support to write thumbnails in addition to existing thumbnails * src/db-artwork-parcer.c: (mhod3_get_ithmb_filename) * src/itdb_itunesdb.c: (update_artwork_info) * tests/test-covers.c: updated to new API. * tests/test-write-covers.c: updated to new API. Known issues: iTunes wipes off our thumbnails. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1180 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* Add a little note to say where to send patchesNicholas Piper2005-11-271-0/+4
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1179 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* Add a toy script to fetch images from AmazonNicholas Piper2005-11-271-0/+72
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1178 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* Add some playing with artworkNicholas Piper2005-11-271-15/+29
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1177 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* Add a comment about unicodeNicholas Piper2005-11-271-0/+4
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1176 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* Add LGPL messagesNicholas Piper2005-11-263-0/+74
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1175 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* Add sw_get_playlist_tracks() and define G_BEGIN_DECLS/G_END_DECLS for swigNicholas Piper2005-11-262-2/+23
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1174 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * configure.ac: bumped version to 0.2.2Jorg Schuler2005-11-242-2/+5
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1173 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * overall changes to support itdb_image_get_gdk_pixbuf(). RunJorg Schuler2005-11-248-110/+145
| | | | | | | | "tests/test-thumbnails <ipod_mount> to copy all thumbnails into the current directory. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1172 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-23 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-2310-205/+270
| | | | | | | | | | | | | | | | | | | | | | * src/db-artwork-debug.c: (get_utf16_string): * src/db-artwork-parser.c: (get_utf16_string), (parse_mhod_3), (parse_mhni), (ipod_supports_cover_art), (ipod_parse_artwork_db): * src/db-artwork-parser.h: * src/db-artwork-writer.c: (get_artwork_info), (write_mhod_type_3), (write_mhni), (write_mhod), (write_mhii), (write_mhif): * src/db-image-parser.c: (unpack_RGB_565), (image_type_from_corr_id), (ipod_image_new_from_mhni): * src/db-image-parser.h: * src/itdb.h: * src/ithumb-writer.c: (pack_RGB_565), (ithumb_writer_write_thumbnail), (ipod_image_get_ithmb_filename), (ithumb_writer_new), (ithumb_writer_free), (write_thumbnail), (itdb_write_ithumb_files): * tests/test-covers.c: (save_song_thumbnails): rework artwork code in an attempt to properly support artwork on all the iPod models git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1171 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-23 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-233-2/+9
| | | | | | | | | * src/hal-common.c: * tests/test-covers.c: (ipod_image_to_gdk_pixbuf): more glib 2.4 changes git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1170 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-23 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-232-1/+7
| | | | | | | * configure.ac: bumped version number git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1169 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-23 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-232-2/+6
| | | | | | | * configure.ac: set version number to 0.2.0 git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1167 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-22 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-222-3/+6
| | | | | | | * src/ipod-device.c: fix compilation issue when hal isn't available git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1166 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-22 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-222-5/+6
| | | | | | | * configure.ac: fix .so versioning git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1165 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-22 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-222-1/+6
| | | | | | | * src/glib-compat.h: include stdio.h in the glib 2.4 compat code git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1164 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-212-239/+385
| | | | | | | * COPYING: libgpod really is LGPL git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1163 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-213-3/+14
| | | | | | | | * configure.ac: set version number to 0.2.0 * src/Makefile.am: added glib-compat.h git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1162 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-212-0/+44
| | | | | | | | * src/glib-compat.h: added a missing helper file for glib 2.4 compilation git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1161 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-213-54/+24
| | | | | | | | * src/hal-common.c: * src/ipod-device.c: marked some functions as static git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1160 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-212-5/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * src/ipod-device.c: fix g_mkdir_with_parents use (don't use it with glib 2.8, and mark it static) 2005-11-21 Christophe Fergeau <teuf@gnome.org> * src/db-artwork-writer.c: (write_mhod_type_3): * src/db-parse-context.c: * src/ipod-device.c: * src/itdb_private.h: * src/itdb_track.c: * src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some changes which should help compiling with glib 2.4 2005-11-21 Christophe Fergeau <teuf@gnome.org> * autogen.sh: * gnome-autogen.sh: use autogen.sh script from gnome-common since the custom libgpod one keep having issues (this doesn't add a dependency on gnome-common since I imported the necessary script to our CVS) 2005-11-21 Christophe Fergeau <teuf@gnome.org> * INSTALL: * autogen.sh: * gnome-autogen.sh: 2005-11-21 Christophe Fergeau <teuf@gnome.org> * src/hal-common.h: mark hal stubs (for when hal isn't available) as G_GNUC_INTERNAL to avoid namespace clashes * src/ipod-device.c: * src/ipod-device.h: move hal header inclusion in the .c instead of having it in the .h 2005-11-19 Jorg Schuler <jcsjcs at users.sourceforge.net> * itdb_playlist.c: simplified API for itdb_spl_update() and itdb_splr_eval() * itdb_playlist.c: added itdb_spl_update_live() for convenience * itdb_itunesdb.c: (itdb_rename_files) also remove "iTunesShuffle" as this file might confuse iPod Shuffles. 2005-11-17 Jorg Schuler <jcsjcs at users.sourceforge.net> * configure.ac: check for version 2.4 of glib -- now we need to make sure that libgpod actually works with 2.4... 2005-11-15 Christophe Fergeau <teuf@gnome.org> * src/itdb_itunesdb.c: (itdb_new): initialise glib type system before calling ipod_device_new (which creates a gobject) 2005-11-13 Jorg Schuler <jcsjcs at users.sourceforge.net> * src/itdb_itunesdb.c: when new rating is set on the iPod, backup the old rating to app_rating. Not sure what it's for, but iTunes seem to do it. * src/itdb_itunesdb.c: * src/itdb.h: split unk164 into flag1, flag2, flag3, and flag4. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1159 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-217-9/+23
| | | | | | | | | | | | | * src/db-artwork-writer.c: (write_mhod_type_3): * src/db-parse-context.c: * src/ipod-device.c: * src/itdb_private.h: * src/itdb_track.c: * src/ithumb-writer.c: (ithumb_writer_write_thumbnail): commit some changes which should help compiling with glib 2.4 git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1158 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-213-40/+489
| | | | | | | | | | * autogen.sh: * gnome-autogen.sh: use autogen.sh script from gnome-common since the custom libgpod one keep having issues (this doesn't add a dependency on gnome-common since I imported the necessary script to our CVS) git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1157 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-21 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-214-28/+24
| | | | | | | | | | | * src/hal-common.h: mark hal stubs (for when hal isn't available) as G_GNUC_INTERNAL to avoid namespace clashes * src/ipod-device.c: * src/ipod-device.h: move hal header inclusion in the .c instead of having it in the .h git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1156 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * itdb_itunesdb.c: (itdb_rename_files) also remove "iTunesShuffle"Jorg Schuler2005-11-192-1/+25
| | | | | | | as this file might confuse iPod Shuffles. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1155 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * itdb_playlist.c: added itdb_spl_update_live() for convenienceJorg Schuler2005-11-193-5/+24
| | | | git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1154 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * itdb_playlist.c: simplified API for itdb_spl_update() andJorg Schuler2005-11-193-13/+29
| | | | | | | itdb_splr_eval() git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1153 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * configure.ac: check for version 2.4 of glib -- now we need toJorg Schuler2005-11-172-2/+7
| | | | | | | make sure that libgpod actually works with 2.4... git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1152 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-15 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-152-1/+10
| | | | | | | | * src/itdb_itunesdb.c: (itdb_new): initialise glib type system before calling ipod_device_new (which creates a gobject) git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1151 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * src/itdb_itunesdb.c:Jorg Schuler2005-11-133-15/+28
| | | | | | | * src/itdb.h: split unk164 into flag1, flag2, flag3, and flag4. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1150 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * src/itdb_itunesdb.c: when new rating is set on the iPod,Jorg Schuler2005-11-133-5/+21
| | | | | | | | | backup the old rating to app_rating. Not sure what it's for, but iTunes seem to do it. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1149 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * src/itdb_track.c: (itdb_track_set_defaults) only change unk208Jorg Schuler2005-11-122-14/+25
| | | | | | | (audio/video) if not already set to non-zero. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1148 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * src/itdb_itunesdb.c: (itdb_set_mountpoint) do not callJorg Schuler2005-11-123-21/+27
| | | | | | | | | | | itdb_device_new() with NULL pointer (no mountpoint == local repository) to avoid critical warning. * src/itdb.h src/itdb_itunesdb.c: change API for itdb_shuffle_write() to be identical to itdb_itunesdb_write() git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1147 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-08 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-082-3/+27
| | | | | | | | * configure.ac: fixed hal detection, stole a bit more autoconf-fu from libipoddevice so that ipod-device.c compiles when hal is detected git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1146 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-08 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-083-3/+8
| | | | | | | | * src/hal-common.c: * src/hal-common.h: more #if => #ifdef changes git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1145 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-08 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-083-2/+8
| | | | | | | | * src/ipod-device.c: * src/ipod-device.h: update comments to reflect the fact we are using git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1144 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-08 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-084-7/+24
| | | | | | | | | | | | * src/hal-common.c: * src/hal-common.h: * src/ipod-device.c: (ipod_device_set_property), (ipod_device_hal_initialize), (ipod_device_detect_volume_info), (ipod_device_new), (ipod_device_eject): sync with libipoddevice CVS, use #ifdef HAVE_LIBHAL instead of #if HAVE_LIBHAL git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1143 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-06 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-063-0/+11
| | | | | | | | * src/ipod-device.h: * src/itdb.h: added missing G_BEGIN_DECLS and G_END_DECLS git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1142 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-05 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-052-5/+27
| | | | | | | | | * src/itdb_track.c: (is_video_ipod), (itdb_track_set_defaults): deal with unk208 differently on iPod video (it's used to indicate if the current track must be shown in the video or audio menu or both) git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1141 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-05 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-053-9/+110
| | | | | | | | | | * src/ipod-device.c: (ipod_device_get_property), (ipod_device_class_init): * src/ipod-device.h: sync with libipoddevice CVS to get information about artwork formats supported by the various iPod models git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1140 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-04 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-045-7/+27
| | | | | | | | | | | | | | | * src/ipod-device.c: (ipod_device_new): * src/ipod-device.h: * src/itdb.h: * src/itdb_itunesdb.c: (itdb_free), (itdb_parse), (itdb_shuffle_write), (itdb_set_mountpoint): added an IpodDevice element to Itdb_iTunesDB. This makes it possible for libgpod to know the type (regular/nano/mini/video/...) of the iPod it's currently dealing with (which is necessary for proper cover art support for example) git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1139 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-04 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-042-0/+6
| | | | | | | | * src/Makefile.am: db-itunes-parser.h was missing from the source file list, this made "make dist" generate uncompilable tarballs git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1138 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-04 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-042-8/+8
| | | | | | | | * autogen.sh: add missing call to glib-gettextize, this has the nice side-effect of adding mkinstalldirs if automake didn't copy it for us. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1137 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-02 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-023-6/+38
| | | | | | | | | | * configure.ac: * src/db-artwork-writer.c: (ipod_buffer_grow_mapping), (ipod_buffer_maybe_grow): added fallback code for systems not having mremap (pretty much all non-linux systems actually) git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1136 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* 2005-11-02 Christophe Fergeau <teuf@gnome.org>Christophe Fergeau2005-11-023-1/+22
| | | | | | | | | | * src/db-artwork-writer.c: (ipod_buffer_destroy): * src/itdb_track.c: (itdb_track_set_defaults): applied patch from Uwe Hermann <uwe@hermann-uwe.de> to add video support to libgpod, removed spurious g_print git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1135 f01d2545-417e-4e96-918e-98f8d0dbbcb6
* * itdb_itunesdb.c: used GUINTxx_TO/FROM_xE() instead of "#ifJorg Schuler2005-11-012-40/+17
| | | | | | | ..." constructions. git-svn-id: https://gtkpod.svn.sf.net/svnroot/gtkpod/libgpod/trunk@1134 f01d2545-417e-4e96-918e-98f8d0dbbcb6