-
Notifications
You must be signed in to change notification settings - Fork 83
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Add a remote command for batch duplicate finding. #1524
Open
porridge
wants to merge
3
commits into
BestImageViewer:master
Choose a base branch
from
porridge:batch-dupes
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
/* | ||
* Copyright (C) 2024 The Geeqie Team | ||
* | ||
* Author: Marcin Owsiany <[email protected]> | ||
* | ||
* This program 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 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program 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 this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* | ||
* Helper class for computing equivalence sets of pictures. | ||
* | ||
*/ | ||
|
||
#include "pic-equiv.h" | ||
|
||
/** | ||
* @param cname path to picture file to represent | ||
*/ | ||
pic_equiv::pic_equiv(char const *cname) : name(cname), equivalent{name}, sim(load_image_sim(cname)) {} | ||
|
||
ImageSimilarityData *pic_equiv::load_image_sim(const char *cname) | ||
{ | ||
g_autoptr(GError) error = nullptr; | ||
g_autoptr(GdkPixbuf) buf = gdk_pixbuf_new_from_file(cname, &error); | ||
if (error) | ||
{ | ||
fprintf(stderr, "Unable to read file %s: %s\n", cname, error->message); | ||
return nullptr; | ||
} | ||
return image_sim_new_from_pixbuf(buf); | ||
} | ||
|
||
pic_equiv::~pic_equiv() | ||
{ | ||
if (sim != nullptr) | ||
image_sim_free(sim); | ||
} | ||
|
||
/** | ||
* @brief orders two pic_equiv objects, according to the paths they represent | ||
*/ | ||
int operator<(const pic_equiv &a, const pic_equiv &b) | ||
{ | ||
return a.name < b.name; | ||
} | ||
|
||
/** | ||
* @brief compares this pic_equiv object to another | ||
* @param other object to compare to | ||
* @returns a number between 0 and 100 which denotes visual similarity | ||
*/ | ||
gdouble pic_equiv::compare(const pic_equiv &other) | ||
{ | ||
if (sim == nullptr || other.sim == nullptr) | ||
return 0.0; | ||
return 100.0 * image_sim_compare(sim, other.sim); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Copyright (C) 2024 The Geeqie Team | ||
* | ||
* Author: Marcin Owsiany <[email protected]> | ||
* | ||
* This program 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 2 of the License, or | ||
* (at your option) any later version. | ||
* | ||
* This program 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 this program; if not, write to the Free Software Foundation, Inc., | ||
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. | ||
* | ||
* | ||
* Helper class for computing equivalence sets of pictures. | ||
* | ||
*/ | ||
|
||
#include <set> | ||
#include <string> | ||
|
||
#include <gdk-pixbuf/gdk-pixbuf.h> | ||
#include <glib/gtypes.h> | ||
|
||
#include "similar.h" | ||
|
||
/** | ||
* @class pic_equiv | ||
* @brief holds a picture's similarity data, as well as its equivalence set, and allows comparing pictures. | ||
*/ | ||
class pic_equiv { | ||
public: | ||
explicit pic_equiv(char const *cname); | ||
~pic_equiv(); | ||
pic_equiv(const pic_equiv& other) = delete; | ||
pic_equiv& operator=(const pic_equiv& other) = delete; | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I guess And one more thing. Would you mind renaming class to |
||
gdouble compare(const pic_equiv&); | ||
std::string name; | ||
std::set<std::string> equivalent; | ||
private: | ||
ImageSimilarityData *sim; | ||
static ImageSimilarityData *load_image_sim(const char *cname); | ||
friend int operator<(const pic_equiv &a, const pic_equiv &b); | ||
}; |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
unique_ptr
seems redundant.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Thanks for the review @qarkai
I addressed the other comments, but with my rudimentary C++ skills I cannot see how to address this one?
pic_equiv *
would leak memory, right?pic_equiv
does not work because the assignment operator is deleted:and it's deleted because of the
sim
member.It also seems to me like using a pointer is better than copying the sim structure around...
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I see.
ImageSimilarityData
lacks constructors and moving operator. Ok. let's stay withunique_ptr
for now.