Dreamwidth Development

Auto-tidying

2023-07-15T16:27:48Z

Posted by: momijizukamori

So we've required files to be tidied using perltidy since 2019, buuuuut I am terrible at remembering to manually do it, so! I threw together a quick'n'dirty way of automatically running tidy on commit. It's based on this example from the Prettier docs (Prettier is like perltidy but for CSS/JS/HTML).

Here's the perl variant of the script:

#!/bin/sh
FILES=$(git diff --cached --name-only --diff-filter=ACMR | sed 's| |\\ |g')
[ -z "$FILES" ] && exit 0

# Prettify all selected files
echo "$FILES" | xargs tidyall

# Add back the modified/prettified files to staging
echo "$FILES" | xargs git add

exit 0

This also has the bonus that it only tidies files you added to your commit, so you don't end up with rogue changes in files you didn't touch because someone else forgot to tidy before a branch got merged!

EDIT: kareila rightfully pointed out that I didn't actually specify the install instructions (they're in the linked Prettier docs but, uh, that's not that intuitive). This script should go in the file .git/hooks/pre-commit, and that file needs to be executable, which you can do on the commandline by running chmod +x .git/hooks/pre-commit

comments

Searching your Dreamwidth posts by more than one tag

2019-11-28T20:50:44Z

Posted by: alexwlchan

I was chatting to cesy this evening, and we were chatting about tagging on Dreamwidth (because I've just written about how I use tags to organise my scanned documents). In particular, we were talking about ways to find posts with particular combinations of tags.

As far as we both know (please correct us if we're wrong!), you can only filter your posts by a particular tag. For example, to see all of my posts tagged with "meta", I'd visit https://alexwlchan.dreamwidth.org/tag/meta.

What if you want to search by more than one tag? For example:

Which posts have I tagged with reviews and quotes? (An AND query)

Which posts have I tagged with at least one of person:alex or person:lexie? (An OR query)

I decided to try writing a script for this.

I already had code that uses the XML-RPC API to get all my posts (to get a backup of my Dreamwidth entries). I added some extra filtering, and now it can search posts using the queries of the form above.

Usage

You need Python installed (downloads page). Python 2.7 or 3.x is fine; if you already have Python installed on your computer, that should be fine.

Copy the code below into a file, for example search_dreamwidth_posts_by_tag.py.

Run the script with Python, for example by typing python search_dreamwidth_posts_by_tag.py in a terminal.

The script will ask you for your Dreamwidth username and password (to talk to the API), and what sort of tags you want to search for. It saves the results to a spreadsheet, for maximum nerd points.

Reusing the code

If you know a bit of Python, you should be able to pull out bits of this code and reuse it elsewhere -- the XML-RPC API client, downloading all your posts, checking a user's password. You could modify it to find posts by different criteria: posts within a particular date range, or posted at the weekend, or that don't contain the letter e.

MIT license.

The code

( Code behind a cut tag )

comments

Upgraded Omnibus Script With Added Gitness!

2013-04-20T06:30:38Z

Posted by: jeshyr

Just to let folks know, the ombibus jeshyr-do-anything script at http://dw-dev.dreamwidth.org/94822.html has been upgraded to cope with git.

It doesn't do quite as many things as it used to, but it does all the basics and I'll add new things back in as I figure out how to do them with git.

Jobs it currently handles include:
Apache server up/down/restart
Move between free/nonfree directory trees
Update databases
Upgrade your hack with github code
Hard reset your hack to current github state
Tidy old patching artefacts
Show apache error logs

It used to make patches and handle diffs and stuff but since that's all *so* different in git I just ripped it out and will re-add as appropriate.

You can always find the code at http://dw-dev.dreamwidth.org/94822.html - I won't include it here, trying to keep it just in one place or we'll end up with 27 different versions.

Comments, brickbats, boquets, requests, and suggestions welcome :)

Cheers,
r

comments

posterous->dw migration script

2013-02-24T09:48:03Z

Posted by: vlion

Hi,

I have a Posterous->dw migration script. It kind of works. It worked for me taking my Posterous backup and putting it on a Dreamwidth install foxfirefey has going.

However, it is a funky stanky horrid mash of Python and Ruby. It code smells like old socks.

It does:

- give you dates

- Give you titles.

- Give you actual post.

It does not

- Do formatting.

- Do images.

- Do easy. It requires a few rubygems[1].

---

So. Is this going to be useful? Helpful? I can stuff it up on a github and maybe someone can take this and turn it into mo' usable code. What needs to happen - IMO- for mo' happiness is:

- Username/password not on the CLI, instead, an interactive dialog

- Ruby removed and replaced with Python such that the Python default install works.

- Formatting handled appropriately. Python Etree explodes on posterous html; HTMLParser is underpowered and will require gyrations to do this right.

Let me know what people want, if this is something wanted, I'll upload it.

[1]. If you're not a developer on Linux/OSX, this is going to be (a) gibberishy and (b) impossible to deal with in any sort of way that doesn't involve grief.

comments

Important: Update to "dwu"

2012-09-23T21:16:36Z

Posted by: mark

If you use the "dwu" script from the wiki, you will need to update your local copy. I've made some changes because the last version of the script would merge changes from both develop and master, leading to broken environments and GitHub repositories.

http://wiki.dwscoalition.org/wiki/index.php/Dev_Maintenance#dwu_-_Updating_the_repos

Please use the updated script.

If you have gotten yourself into a broken state, let me know and I can walk you through fixing it. There is some force pushing involved, sadly.

comments

Some tools for S2 patching

2012-04-19T06:05:37Z

Posted by: momijizukamori

...mostly because as anyone who gets all the bugzilla and/or style notifs knows, I did a lot of that this week *g*

First, preview images - I'd been doing them with Ubuntu's screenshot utility and photoshop, which is 1) really slow and 2) doesn't really adequately strip and compress images. So! Enter Screen Capture for Google Chrome, which I've been using with the 'full page' setting, and set to skip pop-ups and save straight to a temp image directory, where I can then rename the screenshots. After that, geekosaur and exor674 (with a little sideline ImageMagick input from tamouse_ helped me write this handy little shell script, to process all the pngs in the directory you run them on - it resizes them, crops them, strips color profiles, and indexes them.

I've been using it on my own machine, as I run Ubuntu, but I believe all the appropriate packages are now on the Dreamhack server, too, for server-side use.

Second, rb posted a handy little script for sorting properties for color themes and generating appropriate headers. I updated it to match our current formatting for files, add sorting for a few more properties, and output more verbose instructions on what to do next at the end.

#!/usr/bin/perl
#
#

my ( $theme_human, $author_name, $layout_human, $is_nonfree ) = @ARGV;

sub diehelp {
    warn "Syntax: newtheme ThemeName AuthorName LayoutName IsNonfree";
    exit;
}

if ( !$theme_human ) {
    warn "No theme name provided.";
    diehelp;
}
if ( !$layout_human ) {
    warn "No layout name provided.";
    diehelp;
}

( $layout_name = lc ( $layout_human ) ) =~ s/\s//g;
( $theme_name = lc ( $theme_human ) ) =~ s/\s//g;

my ( @dropped, @css, @set, $in_css );
while ( <STDIN> ) {
    my $line = $_;

if ( $in_css ) {
        if ( $line =~ m/"""; }/ ) {
            $in_css = 0;
            next;
        }
        push( @css, $line );
    } elsif ( $line =~ m/function Page::print_theme_stylesheet/ ) {
        $in_css = 1;
    } elsif ( /^\.$/ ) {
        break;
    } else {
        next unless $line;
        if ( $line =~ m/^layerinfo / ) {
            push( @dropped, $line );
            next;
        }

push( @set, $line );
    }
}

# process @set lines
my ( @unknown, @presentation, @page, @entries, @modules, @fonts, @images );
foreach ( @set ) {
    if ( /userlite_interaction_links = / || /_management_links = / || /module.*order/ || /module.*show/ ) {
        push( @dropped, $_ );
    } elsif ( /font/ ) {
        push( @fonts, $_ );
    } elsif ( /module/ ) {
        push( @modules, $_ );
    } elsif ( /entry/ ) {
        push( @entries, $_ );
    } elsif ( /comment/ ) {
        push( @entries, $_ );
    } elsif ( /links/ || /layout/ ) {
        push( @presentation, $_ );
    } elsif ( /color/ ) {
        push( @page, $_ );
    } elsif ( /image/ ) {
        push( @images, $_ );
    } else {
        push( @unknown, $_ );
    }
}

my $filename = "$ENV{LJHOME}/temp/$layout_name-$theme_name.s2";
open TMP_FILE, "> $filename";

print TMP_FILE <<"EOT";
#NEWLAYER: $layout_name/$theme_name
layerinfo type = "theme";
layerinfo name = "$theme_human";
layerinfo redist_uniq = "$layout_name/$theme_name";
layerinfo author_name = "$author_name";

set layout_authors = [ { "name" => "$author_name", "type" => "user" } ];
EOT

# print @set lines
sub print_section {
    my ( $name, @lines ) = @_;

if (@lines) {
        print TMP_FILE<<"EOT";

##===============================
## $name
##===============================

EOT
        foreach ( @lines ) {
            print TMP_FILE $_;
        }
    }
}

print_section( "Presentation", @presentation );
print_section( "Page", @page );
print_section( "Entry", @entries );
print_section( "Module", @module );
print_section( "Fonts", @fonts );
print_section( "Images", @images );
if ( @css ) {
    print TMP_FILE "\n";
    print TMP_FILE 'function Page::print_theme_stylesheet() { """' . "\n";
    foreach ( @css ) {
        print TMP_FILE "    " . $_;
    }
    print TMP_FILE '"""; }' . "\n";
}
print_section( "Unknown - DELETE THIS SECTION after reclassifying lines", @unknown );
print_section( "Dropped - DELETE THIS SECTION after verifying none of it is needed", @dropped );
print TMP_FILE "\n";
close TMP_FILE;

print "Parsed theme now saved in file: $filename\n";
print "Be sure to check this for hardcoded font sizes and color codes that can be shortened.\n";
print "This new text needs to be put into the existing file named:\n";
print "$ENV{LJHOME}/bin/upgrading/s2layers/$layout_name/theme.s2\n\n";
if ( @images ) {
    print "This layout appears to have image(s). Change their url to $layout_name/$theme_name(_imagename, if multiple), rename the image to $theme_name(_imagename), and put in:\n";
    print "$ENV{LJHOME}/htdocs/stc/$layout_name/$theme_name.png\n\n";
    }
print "Theme also needs a preview screenshot. Resize to 150x114px and put in:\n";
print "$ENV{LJHOME}/htdocs/img/customize/previews/$layout_name/$theme_name.png\n\n";
print "(for additional reference on cleaning themes, see http://wiki.dwscoalition.org/notes/Newbie_Guide_for_People_Patching_Styles#Adding_a_New_Color_Theme )";

This is written to be used server-side right now, with a command-line input like './newtheme.pl "Human-Readable Theme Name" user "Layout This Theme Is For" yes < inputfile' I've been running it client-side by changing line 74, 'my $filename = "$ENV{LJHOME}/temp/$layout_name-$theme_name.s2";' to 'my $filename = "temp_themes/$layout_name-$theme_name.s2";' (otherwise it tries to write to root, and That's Bad. And unnecessary)

Third, for the tiny handful of people doing S2 work on gedit (shhh, I like it, okay), I made some mods to the CSS syntax highlighting file (pastebin because the file is big). I tried to get it to make a custom S2 language, but it was being fussy about parsing it, and a lot of the .s2 files are largely CSS anyway. So this adds highlighting for S2 variables and S2 keywords! It goes in a file called CSS.lang in home/.local/usr/share/gtksourceview-2.0/language-specs, which will probably not exist if you haven't made custom languages. If you're on newer versions that use GTK3, that 2.0 should be a 3.0. You may have to manually select the highlighting, for some reason it only registers the .s2 extension some of the time.

comments

S2 Patch Assist Script

2012-01-07T10:27:12Z

Posted by: jeshyr

Right before my brain got refried by this stupid disease I was working on a script to turn the theme layers copied from DW itself into the right format to paste into the s2 code in the sourcecode. I was doing it as I learned how so it's only been tested on about 5 different situations at the moment and I'm quite sure it doesn't do everything so check all output please!!

And yes, my brain got fried (again) by this stupid disability so I'm on indefinite leave from developing for the mean time - and VERY disappointed about it.

At the moment you want to pipe the theme layer through STDIN to the script, so something like

$ ./newtheme.pl NewThemeName Rising "Tabula Rasa" yes < ~/file-with-theme-layer.txt

it will tell you what file it writes the output to, it will be something in $LJHOME/temp/

Script

#!/usr/bin/perl
#
#

my ( $theme_human, $author_name, $layout_human, $is_nonfree ) = @ARGV;

sub diehelp {
    warn "Syntax: newtheme ThemeName AuthorName LayoutName IsNonfree";
    exit;
}

if ( !$theme_human ) {
    warn "No theme name provided.";
    diehelp;
}
if ( !$layout_human ) {
    warn "No layout name provided.";
    diehelp;
}

( $layout_name = lc ( $layout_human ) ) =~ s/\s//g;
( $theme_name = lc ( $theme_human ) ) =~ s/\s//g;

my ( @dropped, @css, @set, $in_css );
while ( <STDIN> ) {
    my $line = $_;

push( @set, $line );
    }
}

# process @set lines
my ( @unknown, @presentation, @page, @entries, @modules, @fonts );
foreach ( @set ) {
    if ( /userlite_interaction_links = / || /_management_links = / || /module.*order/ || /module.*show/ ) {
        push( @dropped, $_ ); 
    } elsif ( /font/ ) {
        push( @fonts, $_ );
    } elsif ( /module/ ) {
        push( @modules, $_ );
    } elsif ( /entry/ ) {
        push( @entries, $_ );
    } elsif ( /comment/ ) {
        push( @entries, $_ );
    } elsif ( /links/ ) {
        push( @presentation, $_ );
    } elsif ( /color/ ) {
        push( @page, $_ );
    } else {
        push( @unknown );
    }
}

my $filename = "$ENV{LJHOME}/temp/$layout_name-$theme_name.s2";
open TMP_FILE, "> $filename";

print TMP_FILE <<"EOT";
#NEWLAYER: $layout_name/$theme_name
layerinfo "type" = "theme";
layerinfo "name" = "$theme_human";
layerinfo "redist_uniq" = "$layout_name/$theme_name";
layerinfo "author_name" = "$author_name";

set layout_authors = [ { "name" => "$author_name", "type" => "user" } ];
EOT

# print @set lines
sub print_section {
    my ( $name, @lines ) = @_;

if (@lines) {
        print TMP_FILE<<"EOT";

##===============================
## $name
##===============================
EOT
        foreach ( @lines ) {
            print TMP_FILE $_;
        }
    }
}

print_section( "Presentation", @presentation );
print_section( "Page", @page );
print_section( "Entry", @entries );
print_section( "Module", @module );
print_section( "Fonts", @fonts );
if ( @css ) {
    print TMP_FILE "\n";
    print TMP_FILE 'function Page::print_theme_stylesheet() { """' . "\n";
    foreach ( @css ) {
        print TMP_FILE "    " . $_;
    }
    print TMP_FILE '"""; }' . "\n";
}
print_section( "Unknown - DELETE THIS SECTION after reclassifying lines", @unknown );
print_section( "Dropped - DELETE THIS SECTION after verifying none of it is needed", @dropped );
print TMP_FILE "\n";
close TMP_FILE;

print "Parsed theme now saved in file: $filename\n";
print "This new text needs to be put into the existing file named:\n";
print "$ENV{LJHOME}/bin/upgrading/s2layers/$theme_name/theme.s2\n\n";
print "Theme also needs a preview screenshot. Resize to 150x114px and put in:\n";
print "$ENV{LJHOME}/htdocs/img/customize/previews/$theme_name/$layout_name.png\n\n";

Feedback, cases that break it, improvements, etc. would all be great.

r

Edit: Now with super bonus functioning HTML tags!

comments

lookup-routing: tool to help navigate the routing system

2011-09-23T10:04:25Z

Posted by: fu

exor674 has added another tool to the dev tools repository, called lookup-routing

It does several things.

First, you can easily find out which file handles what page (e.g., /nav, /nav/create, /rename, /admin, /post, etc).

$ lookup-routing /admin app: /admin is a redirect to /admin/ app: /admin/ is defined in the file cgi-bin/DW/Controller/Admin.pm, and using the handler sub admin_handler

This is useful if you're working on a bug that's been reported on /some/path/here, and you want to know which file to open up first.

(Psst If "lookup-routing /some/path" doesn't work, it is probably a BML file. Try htdocs/some/path.bml)

( --verbose gives you a much more detailed view (plus some debugging tips) )

Second, you can get a list of everything in the routing table, using the --list argument:
$ lookup-routing --list

You can filter the list down to either those that use regex matching, or those that use string-matching:
$ lookup-routing --list --regex
$ lookup-routing --list --string

You can also filter down to just those pages in user-space, app-space, or ssl using --role=user, --role=app, --role=ssl, respectively. Default is --role=all.

There are --user, --app, --ssl shortcuts which do the same as their --role=... equivalents.

$ lookup-routing --list --user # lists paths handled by the routing system that follow the form http://exampleusername.dreamwidth.org/some/path/here
$ lookup-routing --list --app # lists paths handled by the routing system that follow the form http://www.dreamwidth.org/some/path/here
$ lookup-routing --list --ssl # lists paths routing system that use https

And third, you can get a quick summary of stats by running
lookup-routing --stats

A quick reminder of which arguments to use is available by running:
lookup-routing --help

Very detailed usage instructions can be found by running:
lookup-routing --help --verbose

If you haven't already installed the dev tools yet, see the Dev Tools wiki page. If you've installed the dev tools before, make sure to update your code, to pull in the changes.

comments

Mass user-creation script

2011-09-02T20:44:13Z

Posted by: sophie

I've just put a mass user-creation script on the wiki. It allows you to create any number of users and have them be auto-validated. It will also randomly create watch/trust edges between the created users, and if you specify it, they will all join any given community. This makes it extremely useful when you have a bug that requires a large number of users to test, such as bug 2215: member list page: "jump to account" does not jump to username, which requires more than 100 users in a single community.

(I actually already had this script created some time ago, but hadn't released it publicly. However, when I saw kjwcode manually creating 100 users in order to test the patch on the aforementioned bug, I added the community-joining ability and offered the script to him, and realised I should probably release it for all to use!)

There are a few things the script doesn't do yet. For example, while it can make all the users join a community, it won't make any of them subscribe to it. If anybody wants more features added, let me know!

And, in the interests of code preservation (in case the wiki ever disappears for some reason - not that it should), I'm reproducing the code as it is now inside a cut. Bear in mind that it's possible that the version on the wiki may be more up-to-date if it's been some time since this post was made, so you should probably check on the wiki first!

( Source code follows! )

comments

Potentially Useful Do-Everything Script

2011-08-21T13:16:32Z

Posted by: jeshyr

[BTW: I am editing this post as the script is updated so refer back for further edits.]

I'm just a newbie at developing - submitted my first patch today - and one of the things one has to do to get up and running is to read about 5 tons of documentation and figure out workflows. Since I was having lots of potentially useful scripts suggested to me by developers and by the wiki and since I am at heart a toolmaker I put them all together and documented everything to the best of my ability.

I think this works but it's way past my bedtime right now and I haven't tested every single combination so if it eats your code, your data, or your firstborn child be in on your own head. OTOH I think it should work right!

#!/bin/bash
#
# Ricky's Dreamwidth Do-Anything Script
# For current version see: http://dw-dev.dreamwidth.org/94822.html
#
# Last updated 22 April 2013
#

#
# CHANGES
# 22/4/13 - Extended 'git' help page
# 20/4/13 - Fix 'upgrade' command again. Oops. I think it works now?
#         - Added 'hardreset' command with tons of warnings
#         - Added 'upgradebranch' command and help info
#         - Added/updated various help texts
#         - Abstract out $SCRIPTNAME variable
#         - Added 'git' command
#         - Added abstract stuff for storing/restoring current git branch
# 25/9/12 - Update 'upgrade' command following xb95's post http://dw-dev.dreamwidth.org/124731.html
# 10/9/12 - Update everything for git - deleted unpatch, makepatch, sync commands. Updated tidy, upgrade, help commands.
#         - Add 'checkconfig' option
#         - Now restores initial directory before exitting
#         - Added 'free' and 'nonfree' commands to save Afuna's poor fingers a few keystrokes
# 28/10/11 - Unpatch now really does cope with specific directory names (I should abstract out the interpolation code)
# 22/10/11 - Unpatch now copes with specific directory names
#         - Tidy really totally works
#         - Upgrade no longer starts apache
# 13/9/11 - Fixed 'tidy' command so it actually works!
# 11/9/11 - Added 'unpatch', 'errlog' and 'errlogs' commands.
#           'makepatch' command now accepts filename on command line.
# 2/9/11  - Added 'up' and 'down' commands.
#           Removed check before restarting Apache, seems excessive.
# 29/8/11 - Upgrade now deletes files not present in repository
#           Clarified warning text displayed before upgrading.
#

# When verbose is set extra 'help' text is printed.
verbose="1"

# Name to use for any patch which is not given a specific name
default_patchname="~/default.patch"

inquire ()  {
    # Usage: inquire "Prompt string" [force]
    # use 'force' keyword to force an answer, otherwise answer defaults to Yes if user presses enter

if [ "$2" = 'force' ]; # must explicitly type the answer
    then
        force=YES
        echo  -n "$1 [y/n]? "
    else
        force=NO
        echo  -n "$1 [Y/n]? "
    fi

read answer
    #echo "Force is $force";
    
    finish="-1"
    while [ "$finish" == '-1' ]; do
        if [[ "$force" == 'NO' && "$answer" == '' ]];
        then
	    #echo "Defaulting to 'yes'."
            finish="1"; # Empty answer OK because force is off
        else
	    #echo "Not defaulting..."
            case $answer in
                y | Y | yes | YES | Yes ) 
		    finish="1";;
                n | N | no | NO | No ) 
		    echo 'Exiting.';
		    exit;;
                *) 
                   finish="-1";
                   echo -n 'Invalid response - please reenter: ';
                   read answer;;
             esac
        fi
    done
}

update-db () {
    echo "Now updating databases ..."
    $LJHOME/bin/upgrading/update-db.pl -r -p --innodb && \
    $LJHOME/bin/upgrading/update-db.pl -r --cluster=all --innodb && \
    $LJHOME/bin/upgrading/texttool.pl load
}

# TODO put stop-apache and start-apache commands in here as functions

SCRIPTNAME=`basename $0`

# Save initial directory for possible restoration later
OLDDIR=$PWD
NODIRRESTORE=0 # Change to 1 for no directory restoration ever

# Save initial git branch for possible restoration later
OLDBRANCH=`git rev-parse --symbolic-full-name --abbrev-ref HEAD`
NOBRANCHRESTORE=0 # Change to 1 for no branch restoration ever
if [ $OLDBRANCH == "HEAD" ]; then
    # Detached head state - no restoring possible
    NOBRANCHRESTORE=1
fi

CMD=$1
case $CMD in

up)
    # Start Apache
    echo "Starting Apache..."
    start-apache
    if [ $verbose == 1 ]; then 
        echo "Remember to stop Apache with the '$SCRIPTNAME down' command when you're finished hacking."
        echo "Leaving Apache running slows down the server a touch for everybody else."
    fi
    ;;

down)
    # Stop Apache
    echo "Stopping Apache and any instances of worker-manager..."
    stop-apache
    killall worker-manager
    ;;

restart|r|bounce|b|bap)
    # Restart Apache
    #inquire "Do you wish to restart apache?"
    
    echo "Restarting Apache ..."
    stop-apache
    sleep 3
    start-apache
    if [ $verbose == 1 ]; then 
        echo "Remember to stop Apache with the '$SCRIPTNAME down' command when you're finished hacking."
        echo "Leaving Apache running slows down the server a touch for everybody else."
    fi
    ;;

upgrade)
    # Upgrade code from repositories and rebuild DBs
    echo "WARNING: Upgrading your dreamhack may delete local code changes."
    if [ $verbose == 1 ]; then 
        echo "To save any uncommitted code changes, you can commit them or use the 'git stash' command. Use 'git stash help' for details."
    fi

inquire "Do you wish to upgrade your Dreamhack code" force

cd $LJHOME
    git fetch dreamwidth
    # pull changes from dreamwidth
    git checkout develop
    git pull --ff dreamwidth develop
    git checkout master
    git pull --ff dreamwidth master
    # push them to Github forks
    git push origin develop
    git push origin master
    # change to dw-nonfree
    cd $LJHOME/ext/dw-nonfree
    git fetch dreamwidth
    # pull changes from dw-nonfree
    git checkout develop
    git pull --ff dreamwidth develop
    git checkout master
    git pull --ff dreamwidth master
    # push them to Github forks
    git push origin develop
    git push origin master

update-db

if [ $NOBRANCHRESTORE == 0 ]; then 
        echo "Switching back to git branch $OLDBRANCH"
        git checkout $OLDBRANCH
    else
        echo "You are now in git branch $NEWBRANCH"
    fi

echo "You may now wish to run '$SCRIPTNAME upgradebranch' to pull changes into your current branch."
    ;;

upgradebranch|ub)
    if [ $verbose == 1 ]; then 
        echo "This command pulls the latest changes you have downloaded from the develop branch into whatever branch you are currently working, and should be run after '$SCRIPTNAME upgrade'."
        echo "To save any uncommitted code changes, you can commit them or use the 'git stash' command. Use 'git stash help' for details."
    else
        echo "This command pulls already-downloaded changes from develop into your current git branch and should be run after '$SCRIPTNAME upgrade' or equivalent."
    fi
 
    inquire "Do you wish to pull upgraded code into your current branch"

git pull --rebase --ff-only dreamwidth develop
    ;;

hardreset)
    # Upgrade code from repositories and rebuild DBs
    echo "WARNING: Hard resetting your Dreamhack WILL delete anything in $LJHOME which is comitted, checked in, or staged but not part of the official Dreamhost code. "
    echo "    Changes which are stashed will be preserved though."
    if [ $verbose == 1 ]; then 
        echo "    If you feel unsure about this, we suggest you ask somebody on the dreamwidth-dev community for help - we're happy to help you."
    fi
    inquire "Do you wish to HARD RESET your Dreamhack code" force

cd $LJHOME
    git checkout develop
    git fetch dreamwidth
    git reset --hard dreamwidth/master
    git reset --hard dreamwidth/develop

update-db
    ;;

checkconfig|ccfg)
    # Check Configuration
    cd $LJHOME
    bin/checkconfig.pl
    ;;

free)
    cd $LJHOME
    NODIRRESTORE=1
    ;;

nonfree|nf)
    cd $LJHOME/ext/dw-nonfree
    NODIRRESTORE=1
    ;;

update|db)
    # Database update commands
    # When: After editing styles (s2) or made changes to DB schema, run this to make changes live
    inquire "Do you wish to update the database"

update-db
    ;;

tidy)
    # Deletes stray git artififacts
    git clean -f "*.rej" "*.orig"
    ;;

errlog)
    tail ~/apache/logs/error_log
    ;;

errlogs)
    tail -f ~/apache/logs/error_log
    ;;

git|cheatsheet)
   echo "git branch             Show all branches, current branch is asterisked"
   echo "git checkout BRANCH    Switch to branch BRANCH"
   echo "git checkout -b BRANCH Create and switch to new branch BRANCH"
   echo "git status -s          Show files added/removed/modified not committed"
   echo "git diff               Show current unstaged changes"
   echo "git diff --cached      Show current uncommitted changes"
   echo "git stash [pop|show]   Store/restore/show stored uncommitted changes"
   echo ""

echo "More details here: http://wiki.dwscoalition.org/wiki/index.php/Newbie_Guide:_How_To_in_Git"
    ;;

*)
    # Invalid or missing command - prompt again
    echo "Valid commands are:"
    echo "    restart, r, bounce, b"
    echo "        Stops and then immediately restarts Apache. Use after editing .pm files or updating database."
    echo "    up, down"
    echo "        Starts or stops Apache."
    echo "    free, nonfree"
    echo "        Move to the free/nonfree directories."
    echo "    upgrade"
    echo "        Pull all new changes from github."
    echo "    upgradebranch, ub"
    echo "        Grab the changes from the most recent upgrade into your current branch."
    echo "    hardreset"
    echo "        Delete all your local changes and reset your dreamhack's status to match the current development code."
    echo "    update, db"
    echo "        Update databases. Use after editing database schema or S2 code."
    echo "    tidy"
    echo "        Delete stray patching artifiact files in current directory."
    echo "    errlog[s]"
    echo "        Tail [-f] the Apache error logs."
    echo "    git Display git cheat-sheet."

esac

if [ $NODIRRESTORE == 0 ]; then 
    cd $OLDDIR
fi
echo "DW script exiting."

For new folks, you need to copy everything in the text box above and paste it into a new file on your Dreamhack. I suggest you put it in the ~/bin directory and call the file 'dw', because then your system matches mine :). Then you need to make that file executable by typing 'chmod +755 ~/bin/dw' or whatever filename you used. After that you can type 'dw' and it should execute just fine, it'll give you instructions.

I would welcome fixes, constructive criticism, or anything else you have to offer. Feel free to use this in any way you want, etc.

r

comments

DW Perl module client

2010-09-09T14:29:38Z

Posted by: pseudomonas

Does LJ::Simple work reliably with Dreamwidth? If not, is there a comparable perl module that does? (I'd rather rely on someone else's testing than conduct my own, which is likely to be more slipshod)

Also (and relatedly), is there a way that given a DW entry that's been either imported from, or crossposted to, LJ, I can get (programmatically) the ID or URL of the LJ entry, without resorting to comparing timestamps and post contents?

ETA: if there's no Perl thing suitable, does anyone have any ideas for Java packages that would do the same?

(x-posted from perl, where I got suggestions to try here)

ETA: http://www.chiark.greenend.org.uk/~adamb/dw-thataway.pl.txt is the current state of the script. I've tested it on a small test journal and it seems to do what it's supposed to do. If anyone's brave enough to test it on real-world data and let me have any bug reports, that'd be wonderful.

comments