From: Andrew DeFaria Date: Wed, 13 Apr 2016 15:00:40 +0000 (-0700) Subject: Miscellaneous changes X-Git-Url: https://defaria.com/gitweb/?a=commitdiff_plain;h=9ed7209cfd57660436721ff5bf60d58e62ede295;p=clearscm.git Miscellaneous changes --- diff --git a/bin/CreateAlbumPlaylists.pl b/bin/CreateAlbumPlaylists.pl new file mode 100755 index 0000000..3254073 --- /dev/null +++ b/bin/CreateAlbumPlaylists.pl @@ -0,0 +1,16 @@ +#!/usr/bin/env perl +use strict; +use warnings; + +use MP3::Info; +use Data::Dumper; + +my $file = $ARGV[0]; + +die "Cannot open $file - $!" unless -r $file; + +my $tag = get_mp3tag ($file); + +for (keys %$tag) { + print "$_: $tag->{$_}\n"; +} # for \ No newline at end of file diff --git a/rc/client_scripts/Audience b/rc/client_scripts/Audience index 071261e..2a14f9d 100644 --- a/rc/client_scripts/Audience +++ b/rc/client_scripts/Audience @@ -16,6 +16,7 @@ export SMTPHOST=cas.audience.local export SMTPFROM=cm@audience.com export CLEARADM_SERVER=adefaria-lt export P4CONFIG=.p4config +export P4USER=adefaria append_to_path /cygdrive/c/Program\ Files/Perforce append_to_path /cygdrive/c/Program\ Files\ \(x86\)/MATLAB/R2013a/bin diff --git a/rc/gitconfig b/rc/gitconfig index 6c59eff..63b5588 100644 --- a/rc/gitconfig +++ b/rc/gitconfig @@ -1,6 +1,6 @@ [user] name = Andrew DeFaria - email = adefaria@audience.local + email = Andrew@DeFaria.com [pack] windowMemory=128m threads=1 @@ -20,10 +20,7 @@ local=white remote=red [color "diff"] - meta=white bold - #frag=magenta bold - old=red - new=yellow + external = /usr/local/bin/git-meld [color "status"] added=yellow changed=green @@ -39,4 +36,4 @@ dump=cat-file -p dlog=log --decorate [push] - default = matching + default = simple diff --git a/rc/sshconfig b/rc/sshconfig index 6c6b890..2fe4668 100644 --- a/rc/sshconfig +++ b/rc/sshconfig @@ -5,3 +5,7 @@ StrictHostKeyChecking no Host * ServerAliveInterval 300 ServerAliveCountMax 2 + +Host jira + HostName %h.audience.local + User adefaria diff --git a/songbook/20141221.html b/songbook/20141221.html deleted file mode 100644 index 72669f7..0000000 --- a/songbook/20141221.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Jam at Andrew's - - -

What

Jam at Andrew's House (Add to your Google Calender  )

Where

1676 Hope Dr #1915
Santa Clara, California, 95054

When

Sunday, 12/21/2014
1-4 Pm

Parking

My community is gated. If you can get in the gate you can park in any uncovered parking space but there are pretty limited. My apt is close to the street and there's usually some parking around there.

When you get here call me (408-596-4937). I can open the gate and show you in.

I have room for about 4-5 people in my house for an acoustic jam. As -this will be introductory I will suggest a few songs here. Note that you - can go to http://defaria.com/songbook to get copies of the words and -chords for these, and even the MP3 on some songs. Of course there are lots of other songs we can do or just straight out jamming.

-
  1. Amie (Pure Prairie League)
  2. Desperado (Eagles)
  3. I Saw Her Standing There (Beatles)
  4. Swingtown (Steve Miller)
  5. Take it Easy (Eagles)
- - diff --git a/songbook/20141221.html b/songbook/20141221.html new file mode 120000 index 0000000..0613dd7 --- /dev/null +++ b/songbook/20141221.html @@ -0,0 +1 @@ +/web/php/songbook/20141221.html \ No newline at end of file diff --git a/songbook/20150111.html b/songbook/20150111.html deleted file mode 100644 index 31df4fc..0000000 --- a/songbook/20150111.html +++ /dev/null @@ -1,12 +0,0 @@ - - -Jam at Andrew's - - -

What

Jam at Andrew's House (Add to your Google Calender  )

Where

1676 Hope Dr #1915
Santa Clara, California, 95054

When

Sunday, 1/11/2015
1-4 Pm

Parking

My community is gated. If you can get in the gate you can park in any uncovered parking space but there are pretty limited. My apt is close to the street and there's usually some parking around there.

When you get here call me (408-596-4937). I can open the gate and show you in.

I have room for about 4-5 people in my house for an acoustic jam. As -this will be introductory I will suggest a few songs here. Note that you - can go to http://defaria.com/songbook to get copies of the words and -chords for these, and even the MP3 on some songs. Of course there are lots of other songs we can do or just straight out jamming.

-
  1. Country Roads (John Denver)
  2. Desperado (Eagles)
  3. Hotel California (Eagles)
  4. Imagine (John Lennon)
  5. Maggie May (Rod Stewart)
- - diff --git a/songbook/20150111.html b/songbook/20150111.html new file mode 120000 index 0000000..01781d4 --- /dev/null +++ b/songbook/20150111.html @@ -0,0 +1 @@ +/web/php/songbook/20150111.html \ No newline at end of file diff --git a/songbook/background.jpg b/songbook/background.jpg deleted file mode 100644 index 2d289dc..0000000 Binary files a/songbook/background.jpg and /dev/null differ diff --git a/songbook/background.jpg b/songbook/background.jpg new file mode 120000 index 0000000..df2e4a9 --- /dev/null +++ b/songbook/background.jpg @@ -0,0 +1 @@ +/web/php/songbook/background.jpg \ No newline at end of file diff --git a/songbook/displayartist.php b/songbook/displayartist.php deleted file mode 100644 index 313908f..0000000 --- a/songbook/displayartist.php +++ /dev/null @@ -1,47 +0,0 @@ - - - - - - Songbook" Artist - - - - - - -
-Home -

Andrew DeFaria's Songbook

- -

-
- -
- -"; - -foreach ($artistsSongs as $artistSong) { - print "
  • "; - print basename ($artistSong, ".pro"); - print "
  • "; -} // foreach -?> - - - diff --git a/songbook/displayartist.php b/songbook/displayartist.php new file mode 120000 index 0000000..b13818f --- /dev/null +++ b/songbook/displayartist.php @@ -0,0 +1 @@ +/web/php/songbook/displayartist.php \ No newline at end of file diff --git a/songbook/index.php b/songbook/index.php deleted file mode 100644 index 8b32bbd..0000000 --- a/songbook/index.php +++ /dev/null @@ -1,55 +0,0 @@ - - - - - - Songbook - - - - - - - - - - -"; - } -?> - -
    -

    Andrew DeFaria's Songbook

    -
    - -
    - -

    As a professional musician do yourself a favor and invest in a tablet or if -you must an iPad and get either SongBook (for Android) or OnSong (for iPad) then -send me a request to sign up for Dropbox which integrates with these apps and -your "songbook" will be automated. Note that Songbook is also available for -Windows. More info on this is available here. For -people who must remain with paper...

    - -

    The following songs are available here. Select an artist or a song and then -Go or type in a lyric or song title into the search box. You can print the -result if you wish to have a paper copy. If new songs are added by me or others -this page will automatically update so you can come back here and get your -copy.

    - - - -
    -Search:   - -
    - - diff --git a/songbook/index.php b/songbook/index.php new file mode 120000 index 0000000..be1c92b --- /dev/null +++ b/songbook/index.php @@ -0,0 +1 @@ +/web/php/songbook/index.php \ No newline at end of file diff --git a/songbook/news.html b/songbook/news.html deleted file mode 100644 index 89abc18..0000000 --- a/songbook/news.html +++ /dev/null @@ -1,97 +0,0 @@ - - - - - - Songbook - - - - - - - - - -
    -

    Songbook News

    -
    - -
    - -

    Recent Changes

    - -

    I've made some more changes:

    - -
      - -
    • Removed the list of songs from the front page. There were getting to be just -too many songs listed to be helpful. Instead I now have a drop down list of -artists and songs as well as a search box. Select an artist or a song and then -select go to go to an artist page or a song page. Or search for a term. The search -will search for a word or phrase in the title, artist or in the song itself. The -search is not that bright but works fairly well.
    • - -
    • There's a new artist's page which shows you all of the artists songs in one -page. Many artists have only one or a few songs. Some artists have quite a few -songs.
    • - -
    • The song pages now are on auto play. If they have music assoicated with them -then their music will start playing automatically.
    • -
    - -

    Past Changes

    - -
      -
    • Changed the home icon to something much bigger. Clicking on this gets you - back to the Songbook home page.
    • - -
    • Now if the song has an associated .mp3 file in the Media folder that - exactly matches the song's title then a little HTML5 MP3 player will - appear. You can play the song while you read the words and follow the - chords! Note: You can right click and save the song's mp3 file to - your computer. If the song does not have a corresponding .mp3 file then - no .mp3 player is displayed. For example, Amie.
    • - -
    • Again, if the song has a corresponding .mp3 file I now re-write the .pro - file to include {musicpath:/sdcard/SongBook/Medai/<title>.mp3}. - This string "links" the ChordPro file with music such that (in SongBook, the - app I use on my Android Tablet) you can play the song's mp3 file on your - tablet! I'm not sure if OnSong (the iPad equivalent of SongBook) does the same - thing. If you sign up for sharing my songbook via DropBox (send me email if - you want an invite) you should be all set.
    • -
    - -

    Note: Currently my code is very picky. The file name for the .pro file -and the .mp3 file must match exactly - is case sensitive, etc. If you -have access to my songbook in DropBox and wish to add a .pro file and it's -corresponding .mp3 file then be sure to match the names up correctly and put the -.mp3 file in the Media folder.

    - -

    Future Changes

    - -

    Here are some of the things I'm thinking of implementing:

    - -
      -
    • I'm thinking of re-vamping the main page. Instead of listing all the - songs, which are getting to be a bit much, I would like to possibly make a - little search facility that would scan the .pro files for text matching in the - song titles and lyrics themselves.
    • - -
    • Another change I'm thinking of making is making it so that when you hover - over a chord a little popup happens that shows the chord's fingering. Sorta - like it's done over on tabs-ulitimate-guitar.com (For example: - here). - Anybody know how to do that?
    • - -
    • Maybe a simple editor so people can edit songs directly.
    • - -
    • Maybe interfacing with Dropbox to display information about the last - person to update the songfile...
    • -
    - -
    - - - diff --git a/songbook/news.html b/songbook/news.html new file mode 120000 index 0000000..788c2e4 --- /dev/null +++ b/songbook/news.html @@ -0,0 +1 @@ +/web/php/songbook/news.html \ No newline at end of file diff --git a/songbook/search.php b/songbook/search.php deleted file mode 100644 index 840fdb0..0000000 --- a/songbook/search.php +++ /dev/null @@ -1,84 +0,0 @@ - - - - - - Songbook" Artist - - - - - - - - - -
    -Home -

    Andrew DeFaria's Songbook

    - -

    -
    - -
    - - 0) { - print "
      "; -} // if - -foreach ($songmatches as $songmatch) { - $artist = getArtist ($songmatch); - $title = basename ($songmatch, ".pro"); - print "
    1. $title"; - print " ($artist)
    2. "; -} // foreach - -if (count ($songmatches) > 0) { - print "
    "; -} // if -?> - -
    - - - diff --git a/songbook/search.php b/songbook/search.php new file mode 120000 index 0000000..41f2581 --- /dev/null +++ b/songbook/search.php @@ -0,0 +1 @@ +/web/php/songbook/search.php \ No newline at end of file diff --git a/songbook/songbook.html b/songbook/songbook.html deleted file mode 100644 index 071f02b..0000000 --- a/songbook/songbook.html +++ /dev/null @@ -1,157 +0,0 @@ - - - - - - Songbook - - - - - - - -
    -

    Songbook/OnSong and chordpro (.pro) files

    -
    - -
    - -

    Rather than carry around sheets of paper for everybody, fumbling -and trying to find the right song sheet etc., you can use your -computer to help automate this process.

    - -

    A chordpro file (signified by a .pro extension) is not a fancy file -format, but it gets the job done and is easy to edit with any editor -like notepad. You can google "chordpro" and read all about the format -if you like.

    - -

    If you have a iPad or a Android tablet you can have all of your -songs with you wherever you go. Linked -with DropBox and everybody can -be on the same page. Worst case you have all of the music you know at -your fingertips. There are two apps, one for iPads -(OnSong) -and the other for Android and PCs -(Songbook) -that will work with .pro file to render them nicely on your iPad or -Android tablet. And Songbook also works on your Windows PC where -you can print out copies of the songs if you inist on dealing with -paper.

    - -

    Finally, you could go to my website and render any of the songs in -my Songbook using the web (described below).

    - -

    Chordpro file format

    - -

    You can go -to http://defaria.com/songbook/Songs -and you'll see a list of all the files in that directory, the .pro -files of the songs I have. You can click on any of them but what you -will get is an unrendered version of the .pro file. For example: If -you click on Brown Eyed Girl.pro you'll see:

    - -
    -    {t:Brown Eyed Girl}
    -    {st:Van Morrison}
    -    {key:G}
    -
    -    [G]Hey, where did [C]we go, da[G]ys when the ra[D]ins came
    -    [G]Down in the holl[C]ow, [G]playin' a ne[D]w game
    -    [G]Laughin' and a-s[C]ingin' hey-hey, [G]skippin' and a-j[D]umpin'
    -    [G]In the misty mor[C]ning fog, with o[G]ur he[D]arts thumpin and yo[C]u[D]
    -    My Brown-eyed gi[G]rl[Em], yo[C]u my[D] brown eyed [G]girl [D]
    -
    -    [G]Hey whatever [C]happened, [G]Tuesday went [D]so slow
    -    [G]Goin down the [C]old mine with a [G]transistor [D]radio
    -    [G]Standin' in the [C]sunlight laughin', [G]hide behind the [D]rainbow's wall
    -    [G]Slippin' and a-[C]slidin', [G]all along the [D]waterfall with [G]you
    -    My Brown-eyed gi[G]rl[Em], yo[C]u my[D] brown eyed [G]girl [D]
    -
    -    {soc}
    -    [D]Do you remember when we used to [G]sing
    -    Sha-la-la [C]la-la la-la [G]la-la la-la [D]de-da
    -    [G]Sha-la-la [C]la-la la-la [G]la-la la-la [D]de-da
    -    La-de-[G]da[D]
    -    {eoc}
    -
    -    [G][Em][C][D][G][D]
    -
    -    So hard to find my way, now that I'm all on my own
    -    Saw you just the other day, my how you have grown
    -    Cast my memory back there lord, sometimes I'm overcome, thinkin'bout
    -    Making love in the green grass, behind the stadium with you
    -    My brown eyed girl, you my brown eyed girl
    -
    -    {soc}
    -    [D]Do you remember when we used to [G]sing
    -    Sha-la-la [C]la-la la-la [G]la-la la-la [D]de-da
    -    [G]Sha-la-la [C]la-la la-la [G]la-la la-la [D]de-da
    -    La-de-[G]da
    -    {eoc}
    -
    - -

    You see things like {t:Brown Eyed Girl} (title) and {key:G} as well -as embedded tags for the chords ([G], [C], etc). Doesn't look as -pretty right? But when you include the webchord.cgi portion you are -running a script named webchord.cgi which reads the file from the -parameter chordpro (that's why you need the chordpro=song.pro portion) -and then reformats stuff into HTML that looks pretty, centering the -title of the song, putting the chords over the words and bolding the -text between {soc} and {eoc} (start of chorus, end of chorus). So -given the above SongTitle="Brown Eyed Girl" we can formulate the URL -to render it thusly:

    - -
    http://defaria.com/songbook/webchord.cgi?chordpro=/web/songbook/Songs/Brown Eyed Girl.pro
    - -

    You can do the same thing for the other songs there too.

    - -

    I should just write a quick script that gets all of the .pro files -in the directory songbook/Songs and then formulates a page of links -that have the webchord.cgi links to render them like:

    - - - -

    You have to fill in the <SongTitle> portion of the link. So, for -example, you take:

    - -
    -http://defaria.com/songbook/Songs/webchord.cgi?chordpro=<SongTitle>.pro -
    - -

    pop it into the address bar of your browser then change <SongTitle> -to the title of the song you want to render:

    - -
    -http://defaria.com/songbook/webchord.cgi?chordpro=/web/songbook/Songs/Amie.pro -
    - -

    Note:

    - -
      -
    • URLs are case sensitive! ...chordpro=amie.pro is not the same as ...chordpro=Amie.pro
    • -
    • Browsers tend to change spaces in a URL to %20. %20 is the octal representation for a space character. So if you see %20 in a URL like http://defaria.com/songbook/webchord.cgi?chordpro=/web/songbook/Songs/Back%20in%20the%20USSR.pro. Don't fear - they're merely spaces.
    • -
    - -

    Songbook for PC

    - -

    You can get a Windows PC version of Songbook -at http://linkesoft.com/songbook/windows.html. It -will run on your PC and render songs like:

    - - - -

    It's $20 and you can even print out your stuff if you still use -paper or need paper for other people.

    - -
    - - - diff --git a/songbook/songbook.html b/songbook/songbook.html new file mode 120000 index 0000000..4249b1f --- /dev/null +++ b/songbook/songbook.html @@ -0,0 +1 @@ +/web/php/songbook/songbook.html \ No newline at end of file diff --git a/songbook/songbook.jpg b/songbook/songbook.jpg deleted file mode 100644 index 343a1c4..0000000 Binary files a/songbook/songbook.jpg and /dev/null differ diff --git a/songbook/songbook.jpg b/songbook/songbook.jpg new file mode 120000 index 0000000..209bfac --- /dev/null +++ b/songbook/songbook.jpg @@ -0,0 +1 @@ +/web/php/songbook/songbook.jpg \ No newline at end of file diff --git a/songbook/songbook.php b/songbook/songbook.php deleted file mode 100644 index c4afcd9..0000000 --- a/songbook/songbook.php +++ /dev/null @@ -1,87 +0,0 @@ -"; - print "Songs:  "; - print ""; - print ""; - print ""; -} // songsDropdown - -function artistsDropdown () { - global $songs; - - $artists = getArtists ($songs); - - print "
    "; - print "Artists:  "; - print ""; - print ""; - print "
    "; -} // artistsDropdown - -function getArtist ($song) { - $lyrics = file_get_contents ($song); - - if (preg_match ("/\{(st|subtitle):(.*)\}/", $lyrics, $matches)) { - return trim ($matches[2]); - } else { - return ""; - } // if -} // getArtist - -function getArtists ($songs) { - $artists = array(); - - foreach ($songs as $song) { - $artist = getArtist ($song); - - if ($artist != '') { - $artists[$artist] = 1; - } // if - } // foreach - - return array_keys ($artists); -} // getArtists - -function formatTable ($songs) { - echo "
      "; - - foreach ($songs as $song) { - $artist = getArtist ($song); - - $title = basename ($song, ".pro"); - - echo "
    1. $title"; - - if ($artist != "") { - echo " ($artist)"; - } // if - } // foreach - - echo "
    "; -} // formatTable \ No newline at end of file diff --git a/songbook/songbook.php b/songbook/songbook.php new file mode 120000 index 0000000..d43dedd --- /dev/null +++ b/songbook/songbook.php @@ -0,0 +1 @@ +/web/php/songbook/songbook.php \ No newline at end of file diff --git a/web/Resumes/Andrew/Resume.txt b/web/Resumes/Andrew/Resume.txt new file mode 100644 index 0000000..92e6817 --- /dev/null +++ b/web/Resumes/Andrew/Resume.txt @@ -0,0 +1,5 @@ +My resume is best viewed by going to http://clearscm.com/resume. Additionally +you can get an MS Word copy there. + +Thanks +Andrew DeFaria