Skip to content

Commit

Permalink
Add emoji stripping, show filepaths, no confirmation option
Browse files Browse the repository at this point in the history
  • Loading branch information
@Slackadays
Slackadays committed Apr 16, 2023
1 parent fe3894e commit f41fc48
Show file tree
Hide file tree
Showing 3 changed files with 68 additions and 48 deletions.
78 changes: 41 additions & 37 deletions src/clipboard/src/actions.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ void copyText() {
writeToFile(path.data.raw, copying.buffer);

if (!output_silent) {
printf(replaceColors("[success]โœ… %s text \"[bold]%s[blank][success]\"[blank]\n").data(), did_action[action].data(), copying.buffer.data());
printf(formatMessage("[success]โœ… %s text \"[bold]%s[blank][success]\"[blank]\n").data(), did_action[action].data(), copying.buffer.data());
}

if (action == Action::Cut) writeToFile(path.metadata.originals, path.data.raw.string());
Expand Down Expand Up @@ -142,7 +142,6 @@ void pipeOut() {
}

void clear() {
if (fs::is_empty(path.data)) printf("%s", no_clipboard_contents_message().data());
clearTempDirectory(true);
}

Expand All @@ -154,16 +153,11 @@ void show() {

stopIndicator();

if (!fs::exists(path.data) || fs::is_empty(path.data)) {
printf(no_clipboard_contents_message().data(), actions[Action::Cut].data(), actions[Action::Copy].data(), actions[Action::Paste].data(), actions[Action::Copy].data());
return;
}

if (fs::is_regular_file(path.data.raw)) {
std::string content(fileContents(path.data.raw));
std::erase(content, '\n');
printf(clipboard_text_contents_message().data(), std::min(static_cast<size_t>(250), content.size()), clipboard_name.data());
printf(replaceColors("[bold][info]%s\n[blank]").data(), content.substr(0, 250).data());
printf(formatMessage("[bold][info]%s\n[blank]").data(), content.substr(0, 250).data());
if (content.size() > 250) {
printf(and_more_items_message().data(), content.size() - 250);
}
Expand All @@ -175,7 +169,15 @@ void show() {
for (const auto& entry : fs::directory_iterator(path.data)) {
if (!regexes.empty() && !std::any_of(regexes.begin(), regexes.end(), [&](const auto& regex) { return std::regex_match(entry.path().filename().string(), regex); }))
continue;
printf(replaceColors("[info]โ– [bold][help]%s[blank]\n").data(), entry.path().filename().string().data());
printf(formatMessage("[info]โ– [bold][help]%s[blank]\n").data(), entry.path().filename().string().data());
}
}

void showFilepaths() {
// output filepaths of all stored items to stdout
for (const auto& entry : fs::directory_iterator(path.data)) {
printf("%s ", entry.path().string().data());
incrementSuccessesForItem(entry);
}
}

Expand All @@ -185,7 +187,7 @@ void addFiles() {
if (fs::is_regular_file(path.data.raw)) {
fprintf(stderr,
"%s",
replaceColors("[error]โŒ You can't add items to text. [blank][help]Try copying text first, or add "
formatMessage("[error]โŒ You can't add items to text. [blank][help]Try copying text first, or add "
"text instead.[blank]\n")
.data());
exit(EXIT_FAILURE);
Expand All @@ -205,7 +207,7 @@ void addData() {
} else if (!fs::is_empty(path.data)) {
fprintf(stderr,
"%s",
replaceColors("[error]โŒ You can't add text to items. [blank][help]Try copying text first, or add a "
formatMessage("[error]โŒ You can't add text to items. [blank][help]Try copying text first, or add a "
"file instead.[blank]\n")
.data());
exit(EXIT_FAILURE);
Expand Down Expand Up @@ -237,7 +239,7 @@ void removeRegex() {
} else {
fprintf(stderr,
"%s",
replaceColors("[error]โŒ Clipboard couldn't match your pattern(s) against anything. [blank][help]Try using a different pattern instead or check what's "
formatMessage("[error]โŒ Clipboard couldn't match your pattern(s) against anything. [blank][help]Try using a different pattern instead or check what's "
"stored.[blank]\n")
.data());
exit(EXIT_FAILURE);
Expand All @@ -258,7 +260,7 @@ void removeRegex() {
if (successes.directories == 0 && successes.files == 0) {
fprintf(stderr,
"%s",
replaceColors("[error]โŒ Clipboard couldn't match your pattern(s) against anything. [blank][help]Try using a different pattern instead or check what's "
formatMessage("[error]โŒ Clipboard couldn't match your pattern(s) against anything. [blank][help]Try using a different pattern instead or check what's "
"stored.[blank]\n")
.data());
exit(EXIT_FAILURE);
Expand All @@ -272,25 +274,25 @@ void noteText() {
fs::remove(path.metadata.notes);
if (output_silent) return;
stopIndicator();
fprintf(stderr, "%s", replaceColors("[success]โœ… Removed note\n").data());
fprintf(stderr, "%s", formatMessage("[success]โœ… Removed note\n").data());
} else {
writeToFile(path.metadata.notes, copying.items.at(0).string());
if (output_silent) return;
stopIndicator();
fprintf(stderr, replaceColors("[success]โœ… Saved note \"%s\"\n").data(), copying.items.at(0).string().data());
fprintf(stderr, formatMessage("[success]โœ… Saved note \"%s\"\n").data(), copying.items.at(0).string().data());
}
} else if (copying.items.empty()) {
if (fs::is_regular_file(path.metadata.notes)) {
std::string content(fileContents(path.metadata.notes));
if (is_tty.out)
fprintf(stdout, replaceColors("[info]โ€ข Note for this clipboard: %s\n").data(), content.data());
fprintf(stdout, formatMessage("[info]โ€ข Note for this clipboard: %s\n").data(), content.data());
else
fprintf(stdout, replaceColors("%s").data(), content.data());
fprintf(stdout, formatMessage("%s").data(), content.data());
} else {
fprintf(stderr, "%s", replaceColors("[info]โ€ข There is no note for this clipboard.[blank]\n").data());
fprintf(stderr, "%s", formatMessage("[info]โ€ข There is no note for this clipboard.[blank]\n").data());
}
} else {
fprintf(stderr, "%s", replaceColors("[error]โŒ You can't add multiple items to a note. [blank][help]Try providing a single piece of text instead.[blank]\n").data());
fprintf(stderr, "%s", formatMessage("[error]โŒ You can't add multiple items to a note. [blank][help]Try providing a single piece of text instead.[blank]\n").data());
exit(EXIT_FAILURE);
}
}
Expand All @@ -300,7 +302,7 @@ void notePipe() {
writeToFile(path.metadata.notes, content);
if (output_silent) return;
stopIndicator();
fprintf(stderr, replaceColors("[success]โœ… Saved note \"%s\"\n").data(), content.data());
fprintf(stderr, formatMessage("[success]โœ… Saved note \"%s\"\n").data(), content.data());
exit(EXIT_SUCCESS);
}

Expand Down Expand Up @@ -335,14 +337,14 @@ void status() {
int widthRemaining = available.columns
- (clipboards_with_contents.at(clipboard).first.filename().string().length() + 4
+ std::string_view(clipboards_with_contents.at(clipboard).second ? " (p)" : "").length());
printf(replaceColors("[bold][info]โ– %s%s: [blank]").data(),
printf(formatMessage("[bold][info]โ– %s%s: [blank]").data(),
clipboards_with_contents.at(clipboard).first.filename().string().data(),
clipboards_with_contents.at(clipboard).second ? " (p)" : "");

if (fs::is_regular_file(clipboards_with_contents.at(clipboard).first / constants.data_directory / constants.data_file_name)) {
std::string content(fileContents(clipboards_with_contents.at(clipboard).first / constants.data_directory / constants.data_file_name));
std::erase(content, '\n');
printf(replaceColors("[help]%s[blank]\n").data(), content.substr(0, widthRemaining).data());
printf(formatMessage("[help]%s[blank]\n").data(), content.substr(0, widthRemaining).data());
continue;
}

Expand All @@ -353,13 +355,13 @@ void status() {

if (!first) {
if (entryWidth <= widthRemaining - 2) {
printf("%s", replaceColors("[help], [blank]").data());
printf("%s", formatMessage("[help], [blank]").data());
widthRemaining -= 2;
}
}

if (entryWidth <= widthRemaining) {
printf(replaceColors("[help]%s[blank]").data(), entry.path().filename().string().data());
printf(formatMessage("[help]%s[blank]").data(), entry.path().filename().string().data());
widthRemaining -= entryWidth;
first = false;
}
Expand All @@ -379,12 +381,12 @@ void info() {
// locked or not and the pid of the locking process
// saved note

fprintf(stderr, replaceColors("[info]โ€ข This clipboard's name is [help]%s[blank]\n").data(), clipboard_name.data());
fprintf(stderr, replaceColors("[info]โ€ข Stored in [help]%s[blank]\n").data(), path.string().data());
fprintf(stderr, replaceColors("[info]โ€ข Persistent? [help]%s[blank]\n").data(), path.is_persistent ? "Yes" : "No");
fprintf(stderr, formatMessage("[info]โ€ข This clipboard's name is [help]%s[blank]\n").data(), clipboard_name.data());
fprintf(stderr, formatMessage("[info]โ€ข Stored in [help]%s[blank]\n").data(), path.string().data());
fprintf(stderr, formatMessage("[info]โ€ข Persistent? [help]%s[blank]\n").data(), path.is_persistent ? "Yes" : "No");

if (fs::exists(path.data.raw)) {
fprintf(stderr, replaceColors("[info]โ€ข Bytes: [help]%s[blank]\n").data(), formatBytes(fs::file_size(path.data.raw)).data());
fprintf(stderr, formatMessage("[info]โ€ข Bytes: [help]%s[blank]\n").data(), formatBytes(fs::file_size(path.data.raw)).data());
} else {
size_t files = 0;
size_t directories = 0;
Expand All @@ -394,24 +396,26 @@ void info() {
else
files++;
}
fprintf(stderr, replaceColors("[info]โ€ข Files: [help]%zu[blank]\n").data(), files);
fprintf(stderr, replaceColors("[info]โ€ข Directories: [help]%zu[blank]\n").data(), directories);
fprintf(stderr, formatMessage("[info]โ€ข Files: [help]%zu[blank]\n").data(), files);
fprintf(stderr, formatMessage("[info]โ€ข Directories: [help]%zu[blank]\n").data(), directories);
}

fprintf(stderr, replaceColors("[info]โ€ข Locked? [help]%s[blank]\n").data(), fs::exists(path.metadata.lock) ? "Yes" : "No");
fprintf(stderr, formatMessage("[info]โ€ข Cut? [help]%s[blank]\n").data(), fs::exists(path.metadata.originals) ? "Yes" : "No");

fprintf(stderr, formatMessage("[info]โ€ข Locked? [help]%s[blank]\n").data(), fs::exists(path.metadata.lock) ? "Yes" : "No");
if (fs::exists(path.metadata.lock)) {
fprintf(stderr, replaceColors("[info]โ€ข Locked by process with pid [help]%s[blank]\n").data(), fileContents(path.metadata.lock).data());
fprintf(stderr, formatMessage("[info]โ€ข Locked by process with pid [help]%s[blank]\n").data(), fileContents(path.metadata.lock).data());
}
if (fs::exists(path.metadata.notes)) {
fprintf(stderr, replaceColors("[info]โ€ข Note: [help]%s[blank]\n").data(), fileContents(path.metadata.notes).data());
fprintf(stderr, formatMessage("[info]โ€ข Note: [help]%s[blank]\n").data(), fileContents(path.metadata.notes).data());
} else {
fprintf(stderr, "%s", replaceColors("[info]โ€ข There is no note for this clipboard.[blank]\n").data());
fprintf(stderr, "%s", formatMessage("[info]โ€ข There is no note for this clipboard.[blank]\n").data());
}
}

void load() {
if (!fs::exists(path.data) || fs::is_empty(path.data)) {
fprintf(stderr, "%s", replaceColors("[error]โŒ The clipboard you're trying to load from is empty. [help]Try choosing a different source instead.[blank]\n").data());
fprintf(stderr, "%s", formatMessage("[error]โŒ The clipboard you're trying to load from is empty. [help]Try choosing a different source instead.[blank]\n").data());
exit(EXIT_FAILURE);
}

Expand All @@ -425,7 +429,7 @@ void load() {
stopIndicator();
fprintf(stderr,
"%s",
replaceColors("[error]โŒ You can't load a clipboard into itself. [help]Try choosing a different source instead, or choose different destinations.[blank]\n").data());
formatMessage("[error]โŒ You can't load a clipboard into itself. [help]Try choosing a different source instead, or choose different destinations.[blank]\n").data());
exit(EXIT_FAILURE);
}

Expand All @@ -444,7 +448,7 @@ void load() {

stopIndicator();

fprintf(stderr, replaceColors("[success]โœ… Loaded %i clipboards[blank]\n").data(), destinations.size());
fprintf(stderr, formatMessage("[success]โœ… Loaded %i clipboards[blank]\n").data(), destinations.size());

if (std::find(destinations.begin(), destinations.end(), constants.default_clipboard_name) != destinations.end()) updateGUIClipboard(true);
}
Expand Down
15 changes: 11 additions & 4 deletions src/clipboard/src/clipboard.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,9 @@ Copying copying;

bool output_silent = false;
bool progress_silent = false;
bool confirmation_silent = false;
bool no_color = false;
bool no_emoji = false;

std::vector<std::string> arguments;

Expand Down Expand Up @@ -220,7 +222,7 @@ void releaseLock() {
std::string decision;
while (true) {
std::getline(std::cin, decision);
fprintf(stderr, "%s", replaceColors("[blank]").data());
fprintf(stderr, "%s", formatMessage("[blank]").data());

if (decision == "y" || decision == "yes")
return ReplaceOnce;
Expand Down Expand Up @@ -400,6 +402,8 @@ void setupVariables(int& argc, char* argv[]) {

no_color = (NO_COLOR || CLICOLOR) && !FORCE_COLOR && !CLICOLOR_FORCE;

no_emoji = getenv("CLIPBOARD_NOEMOJI") ? true : false;

output_silent = getenv("CLIPBOARD_SILENT") ? true : false;

progress_silent = getenv("CLIPBOARD_NOPROGRESS") ? true : false;
Expand Down Expand Up @@ -489,8 +493,9 @@ IOType getIOType() {
void setFlags() {
if (flagIsPresent<bool>("--fast-copy") || flagIsPresent<bool>("-fc")) copying.use_safe_copy = false;
if (flagIsPresent<bool>("--no-progress") || flagIsPresent<bool>("-np")) progress_silent = true;
if (flagIsPresent<bool>("--no-confirmation") || flagIsPresent<bool>("-nc")) confirmation_silent = true;
if (flagIsPresent<bool>("--ee")) {
printf("%s", replaceColors("[bold][info]https://youtu.be/Lg_Pn45gyMs\n[blank]").data());
printf("%s", formatMessage("[bold][info]https://youtu.be/Lg_Pn45gyMs\n[blank]").data());
exit(EXIT_SUCCESS);
}
if (auto flag = flagIsPresent<std::string>("-c"); flag != "") clipboard_name = flag;
Expand Down Expand Up @@ -527,7 +532,7 @@ void checkForNoItems() {
printf(choose_action_items_message().data(), actions[action].data(), actions[action].data(), clipboard_invocation.data(), actions[action].data());
exit(EXIT_FAILURE);
}
if (action == Paste && fs::is_empty(path.data)) {
if ((action == Paste || action == Show || action == Clear) && (!fs::exists(path.data) || fs::is_empty(path.data))) {
PerformAction::status();
exit(EXIT_SUCCESS);
}
Expand Down Expand Up @@ -667,6 +672,8 @@ void performAction() {
removeRegex();
else if (action == Note)
notePipe();
else if (action == Show)
showFilepaths();
} else if (io_type == Text) {
if (action == Copy || action == Cut)
copyText();
Expand Down Expand Up @@ -707,7 +714,7 @@ void showFailures() {
available.rows -= 3;
printf(copying.failedItems.size() > 1 ? clipboard_failed_many_message().data() : clipboard_failed_one_message().data(), actions[action].data());
for (size_t i = 0; i < std::min(available.rows, copying.failedItems.size()); i++) {
printf(replaceColors("[error]โ– [bold]%s[blank][error]: %s[blank]\n").data(), copying.failedItems.at(i).first.data(), copying.failedItems.at(i).second.message().data());
printf(formatMessage("[error]โ– [bold]%s[blank][error]: %s[blank]\n").data(), copying.failedItems.at(i).first.data(), copying.failedItems.at(i).second.message().data());
if (i == available.rows - 1 && copying.failedItems.size() > available.rows) printf(and_more_fails_message().data(), int(copying.failedItems.size() - available.rows));
}
printf("%s", fix_problem_message().data());
Expand Down
23 changes: 16 additions & 7 deletions src/clipboard/src/clipboard.hpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,9 @@ extern std::string locale;

extern bool output_silent;
extern bool progress_silent;
extern bool confirmation_silent;
extern bool no_color;
extern bool no_emoji;

enum class ProgressState : int { Done, Active, Cancel };

Expand Down Expand Up @@ -198,12 +200,18 @@ class TerminalSize {
TerminalSize(const unsigned int& rows, const unsigned int& columns) : rows {std::max(1u, rows)}, columns {std::max(1u, columns)} {}
};

static std::string replaceColors(const std::string_view& str, bool colorful = !no_color) {
std::string temp(str); // a string to do scratch work on
for (const auto& key : colors) { // iterate over all the possible colors to replace
for (size_t i = 0; (i = temp.find(key.first, i)) != std::string::npos; i += key.second.length()) {
temp.replace(i, key.first.length(), colorful ? key.second : "");
}
static std::string formatMessage(const std::string_view& str, bool colorful = !no_color) {
std::string temp(str); // a string to do scratch work on
auto replaceThis = [&](const std::string_view& str, const std::string_view& with) {
for (size_t i = 0; (i = temp.find(str, i)) != std::string::npos; i += with.length())
temp.replace(i, str.length(), with);
};
for (const auto& key : colors) // iterate over all the possible colors to replace
replaceThis(key.first, colorful ? key.second : "");
if (no_emoji) {
replaceThis("โœ…", "โœ“");
replaceThis("โŒ", "โœ—");
replaceThis("๐ŸŸก", "-");
}
return temp;
}
Expand All @@ -221,7 +229,7 @@ class Message {

public:
Message(const auto& message) : internal_message(std::move(message)) {}
std::string operator()() const { return std::move(replaceColors(internal_message)); }
std::string operator()() const { return std::move(formatMessage(internal_message)); }
size_t rawLength() const { return std::regex_replace(std::string(internal_message), std::regex("\\[[a-z]+\\]"), "").length(); }
};

Expand Down Expand Up @@ -346,4 +354,5 @@ void addFiles();
void status();
void info();
void load();
void showFilepaths();
} // namespace PerformAction

0 comments on commit f41fc48

Please sign in to comment.