Yearly Archives: 2024

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}\")"

])

Use YouTube Without Losing Hours

3 Nov, 2024 in General / Productivity by Enis Özgen (updated on 23/12/2024)

YouTube has very good content, but like every website or application, it prioritizes entertainment over what we need. There are educational and nice videos, but the platform’s main goal is to keep viewers engaged. This often draws people to entertaining rather than informative content, which can be less useful. This […]

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 […]

Boosting Productivity with orgzly search queries

13 Jan, 2024 in Android / Productivity by Enis Özgen (updated on 03/11/2024)

PS: Since long time I am using org mode, I keep notes about almost everything. This year, I decided to increase my productivity by analyzing my routine, setting goals! I have tried 2 different org mode tool one of them was orgzly other one was organice . Orgzly and Organice. […]