Skip to content

Instantly share code, notes, and snippets.

View ergusto's full-sized avatar
😏

Fergus Ruston ergusto

😏
View GitHub Profile
@ergusto
ergusto / package-lock-conflicts.md
Created June 1, 2023 11:17 — forked from szemate/package-lock-conflicts.md
How to resolve package-lock.json conflicts

How to resolve package-lock.json conflicts

It is not possible to resolve conflicts of package-lock.json in GitHub's merge tool and you need to do a manual merge.

  1. Update the master branch with the latest changes:
    git checkout master
    git pull
    
  2. Merge your feature branch into master:
@ergusto
ergusto / reminder.sh
Last active May 22, 2024 17:23 — forked from lekro/reminder.sh
Send discord webhook using curl
#!/bin/sh
WEBHOOK_URL="put your url here"
JSON="{\"content\":null,\"embeds\": [{\"color\": \"16237652\"},{\"timestamp\": \"YYYY-MM-DDTHH:MM:SS.MSSZ\"},{\"fields\": [{\"name\": \"Grabbed Movie\",\"value\": \"$radarr_movie_title\"},{\"name\": \"Release Name\",\"value\": \"$radarr_release_title\"},{\"name\": \"Quality\",\"value\": \"$radarr_release_quality\",\"inline\": true},{\"name\": \"Source\",\"value\": \"$radarr_release_indexer\",\"inline\": true},{\"name\": \"Size\",\"value\": \"$radarr_release_size\"}]}]}\"
curl -d "$JSON" -H "Content-Type: application/json" "$WEBHOOK_URL"
import functools
from channels.handler import AsgiRequest
from rest_framework.exceptions import AuthenticationFailed
from rest_framework.settings import api_settings
authenticators = [auth() for auth in api_settings.DEFAULT_AUTHENTICATION_CLASSES]
@ergusto
ergusto / upload.py
Created January 22, 2017 17:49 — forked from RyanBalfanz/upload.py
[Heroku] Direct to S3 File Uploads in Python
"""
Fix for some issues with the original code from Heroku:
https://devcenter.heroku.com/articles/s3-upload-python
This example is also designed for use with Django, not Flask as in the original.
"""
import base64
import hashlib
import hmac
@ergusto
ergusto / imageSyncing.js
Created January 22, 2017 16:01 — forked from jice-lavocat/imageSyncing.js
AWS Lambda - S3 : Thumbnail creation
// dependencies
var async = require('async');
var path = require('path');
var AWS = require('aws-sdk');
var gm = require('gm').subClass({
imageMagick: true
});
var util = require('util');
// get reference to S3 client
var s3 = new AWS.S3();

Install Python

$ brew install readline sqlite gdbm --universal
$ brew install python --universal --framework
$ python --version
Python 2.7

Symlinks...

@ergusto
ergusto / markup.py
Created August 26, 2013 16:53 — forked from defrex/markup.py
import markdown as mkdn
from django import template
from django.utils.safestring import mark_safe
register = template.Library()
@register.filter()
def markdown(value):