GNU/Linux

Effortlessly Resolve Syncthing Conflicts with Emacs Ediff

26 Nov, 2024 in GNU/Linux by Enis Özgen (updated on 26/11/2024)

Fixing conflicts is very easy with Emacs Ediff. Here, I wrote a simple Python script that allows me to fix conflicted files that occur while using Syncthing.

import os
import subprocess

root_dir = "/home/nwpwr/Dropbox/Notes/roam/" # TODO Change this
ignore_folder = ".stversions"

for subdir, dirs, files in os.walk(root_dir):
    # Ignore the .stversions folder
    dirs[:] = [d for d in dirs if d != ignore_folder]
    for file in files:
        if file.endswith(".org") and "conflict" in file:
            conflict_file = os.path.join(subdir, file)
            original_file_name = file.split(".sync-conflict")[0] + ".org"
            original_file_path = os.path.join(subdir, original_file_name)

            print(f"There is a conflict: {conflict_file}")

            if os.path.exists(original_file_path):
                user_input = input(f"Do you want to compare {original_file_name} with {file}? (y/n): ")
                if user_input.lower() == 'y':
                    # Running the ediff command using emacsclient directly
                    subprocess.run([
                        "emacsclient",
                        "-c",
                        "-n",
                        "--eval",
                        f"(ediff \"{original_file_path}\" \"{conflict_file}\")"
                    ])

import os

import subprocess

root_dir = "/home/nwpwr/Dropbox/Notes/roam/" # TODO Change this

ignore_folder = ".stversions"

for subdir, dirs, files in os.walk(root_dir):

# Ignore the .stversions folder

dirs[:] = [d for d in dirs if d != ignore_folder]

for file in files:

if file.endswith(".org") and "conflict" in file:

conflict_file = os.path.join(subdir, file)

original_file_name = file.split(".sync-conflict")[0] + ".org"

original_file_path = os.path.join(subdir, original_file_name)

print(f"There is a conflict: {conflict_file}")

if os.path.exists(original_file_path):

user_input = input(f"Do you want to compare {original_file_name} with {file}? (y/n): ")

if user_input.lower() == 'y':

# Running the ediff command using emacsclient directly

subprocess.run([

"emacsclient",

"-c",

"-n",

"--eval",

f"(ediff \"{original_file_path}\" \"{conflict_file}\")"

])

brotab empty response problem

2 May, 2024 in GNU/Linux / Productivity by Enis Özgen

Today, I’m sharing a quick BugFix for the BroTab addon. This post offers a solution that resolves you may have encountered. Brotab error Empty return for bt list command

bt list
       # Gives just empty output no error
echo $?
0

bt list

# Gives just empty output no error

echo $?

But actually In this case socket is not open

netstat -tulpn | grep python # find port
curl 'http://localhost:4628/get_browser'
curl: (7) Failed to connect to localhost port 4628 after 0 ms: Connection refused

netstat -tulpn | grep python # find port

curl 'http://localhost:4628/get_browser'

curl: (7) Failed to connect to localhost port 4628 after 0 ms: Connection refused

Solution Install werkzeug

pip install werkzeug==2.2.2   # my pip by default uses --user

1	pip install werkzeug==2.2.2 # my pip by default uses --user

Restart Firefox Port control and it […]

Mastering jq: with the help of AI

25 Dec, 2023 in GNU/Linux by Enis Özgen (updated on 03/11/2024)

TLDR TLDR 2 jq has been a challenging tool for me for quite some time. As humans, we still struggle with handling API responses. Like many developers, I too have encountered difficulties with the syntax of jq. I strongly believe this tool is powerful but not for humans. 🙂 Although […]

i3 similar workflow for tmux windows

9 Oct, 2021 in General / GNU/Linux / Productivity by Enis Özgen

Few month ago I started to use i3wm. I can say this is very good concept. It’s fast, simple and clean.After getting used to that I decided to apply same concepts to the tmux. In this blog post, I talk about how Alt+Tab is not good while making development. As […]

Faster git clone

6 Dec, 2020 in GNU/Linux / Productivity by Enis Özgen (updated on 21/07/2023)

Each of us frequently employs the “git clone” command in our daily routines, particularly when seeking open source projects. In this article, I aim to demonstrate how the “allow” parameter can help minimize bandwidth usage when downloading a repository from a remote source. Normal version Directory size: 50 Megabyte

$ git clone https://github.com/org-roam/org-roam-server
Cloning into 'org-roam-server'...
remote: Enumerating objects: 83, done.
remote: Counting objects: 100% (83/83), done.
remote: Compressing objects: 100% (58/58), done.
remote: Total 436 (delta 47), reused 55 (delta 25), pack-reused 353
Receiving objects: 100% (436/436), 37.66 MiB | 10.73 MiB/s, done.
Resolving deltas: 100% (265/265), done.
Checking connectivity... done.

$ du -sh org-roam-server
50M     org-roam-server

$ git clone https://github.com/org-roam/org-roam-server

Cloning into 'org-roam-server'...

remote: Enumerating objects: 83, done.

remote: Counting objects: 100% (83/83), done.

remote: Compressing objects: 100% (58/58), done.

remote: Total 436 (delta 47), reused 55 (delta 25), pack-reused 353

Receiving objects: 100% (436/436), 37.66 MiB | 10.73 MiB/s, done.

Resolving deltas: 100% (265/265), done.

Checking connectivity... done.

$ du -sh org-roam-server

50M org-roam-server

[…]

Show undone tasks in org mode

18 Jun, 2020 in emacs / GNU/Linux / Productivity by Enis Özgen (updated on 22/06/2020)

TLDR: I am using org-mode for a long time. It is sure that it helps to get organize and to be loyal about what is your plan. I have just find this productive command and I want to share it here. So it is the quick blog post which […]

OpenShift 4 images ssh issue

16 Feb, 2020 in Cloud / GNU/Linux / Openshift by Enis Özgen (updated on 16/02/2020)

TLDR; We aim to move OpenShift 4. It brings pretty new features compare to 3x generation. In company, we have so many security rules which make system secure. One of them is to being sure that our images should be PCI-DSS compliance. In this week, to test PCI-DSS components, I […]

did you mean TAB instead of 8 spaces

9 Feb, 2020 in GNU/Linux by Enis Özgen (updated on 25/04/2021)

Table of Contents Story Error Solution is easy If my way does not work. Hello Again There is another error which is not related with your task but you have to solve. Story Today while I am building package from source by using deb-src, I get awesome error related with […]

Creating automatic ToC in Github

15 Oct, 2015 in GNU/Linux by Enis Özgen (updated on 09/02/2020)

While creating README.md being tidy is important for readability. In my opinion creating Table of Content makes it better. If you have long document, to doing that take so much time. While writing markdown in Github, there is no options to create that automatically. When i was searching about doing […]