Skip to content

Commit

Permalink
[RFC] Filetype detection without extension (#77)
Browse files Browse the repository at this point in the history
* first draft of filetype detection

* Nix: add file dependency

* Fix coding style mistake

* Manually format my code

---------

Co-authored-by: Mihai Fufezan <fufexan@protonmail.com>
  • Loading branch information
XenHat and fufexan authored Jun 23, 2023
1 parent 64d0ebd commit a1d9ab7
Show file tree
Hide file tree
Showing 3 changed files with 21 additions and 2 deletions.
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ target_link_libraries(hyprpaper
OpenGL
GLESv2
pthread
magic
${CMAKE_THREAD_LIBS_INIT}
${CMAKE_SOURCE_DIR}/wlr-layer-shell-unstable-v1-protocol.o
${CMAKE_SOURCE_DIR}/xdg-shell-protocol.o
Expand Down
2 changes: 2 additions & 0 deletions nix/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
cmake,
ninja,
cairo,
file,
fribidi,
libdatrie,
libjpeg,
Expand Down Expand Up @@ -34,6 +35,7 @@ stdenv.mkDerivation {

buildInputs = [
cairo
file
fribidi
libdatrie
libjpeg
Expand Down
20 changes: 18 additions & 2 deletions src/render/WallpaperTarget.cpp
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
#include "WallpaperTarget.hpp"

#include <magic.h>

CWallpaperTarget::~CWallpaperTarget() {
cairo_surface_destroy(m_pCairoSurface);
}
Expand All @@ -17,8 +19,22 @@ void CWallpaperTarget::create(const std::string& path) {
CAIROSURFACE = JPEG::createSurfaceFromJPEG(path);
m_bHasAlpha = false;
} else {
Debug::log(CRIT, "unrecognized image %s", path.c_str());
exit(1);
// magic is slow, so only use it when no recognized extension is found
auto handle = magic_open(MAGIC_NONE|MAGIC_COMPRESS);
magic_load(handle, nullptr);

const auto type_str = std::string(magic_file(handle, path.c_str()));
const auto first_word = type_str.substr(0, type_str.find(" "));

if (first_word == "PNG") {
CAIROSURFACE = cairo_image_surface_create_from_png(path.c_str());
} else if (first_word == "JPEG") {
CAIROSURFACE = JPEG::createSurfaceFromJPEG(path);
m_bHasAlpha = false;
} else {
Debug::log(CRIT, "unrecognized image %s", path.c_str());
exit(1);
}
}

if (cairo_surface_status(CAIROSURFACE) != CAIRO_STATUS_SUCCESS) {
Expand Down

0 comments on commit a1d9ab7

Please sign in to comment.