~music-clockwork/resonate/mixes

« back to all changes in this revision

Viewing changes to daemons/String.hs

Committer: Brian Kassouf
Date: 2009-05-04 19:24:30 UTC
mfrom: (615.2.28 resonate)
Revision ID: brian@brian-laptop-20090504192430-d99ollvz4nrfkz27

pulled in the new revisions from trunk branch

files added:
.bzrignore

daemons

daemons/AudioMetadata.hs

daemons/CollectionLibrarian.hs

daemons/CollectionMonitor.hs

daemons/CommandLineArgs.hs

daemons/Messages.hs

daemons/Models.hs

daemons/String.hs

daemons/SubYaml.hs

daemons/test

daemons/test/AudioMetadataTests.hs

daemons/test/CollectionLibrarianTest.hs

daemons/test/MessagesTests.hs

daemons/test/StringTests.hs

daemons/test/SubYamlTest.hs

daemons/test/resources

daemons/test/resources/glass-boots-clip.oga

daemons/test/resources/image.jpg

resonate/test/unit_tests/models/test_collection.py

files renamed:
resonate/test/unit_tests/models/test_models.py => resonate/test/unit_tests/models/test_models_api.py

files modified:
resonate/__init__.py

resonate/config.py

resonate/lib/mail.py

resonate/manage.py

resonate/models.py

resonate/resonate.conf.example

resonate/templates/members/artist.tpl

resonate/templates/members/browse/multi_artist.tpl

resonate/templates/members/browse/recent.tpl

resonate/templates/members/search.tpl

resonate/test/__init__.py

resonate/test/helpers/__init__.py

resonate/test/test.py

resonate/test/unit_tests/lib/test_mail.py

resonate/test/unit_tests/models/test_user.py

resonate/test/unit_tests/test_config.py

Show diffs side-by-side

added added

removed removed

daemons/String.hs

module String (trim, substitute)

where

import Data.Char (isSpace)

import Data.List (isPrefixOf)

trim :: String -> String

trim s = reverse $ ltrim $ reverse $ ltrim s

where ltrim s2 = dropWhile isSpace s2

substitute :: String -> String -> String -> String

substitute _ _ [ ] = []

substitute from to xs@(a:as) =

if isPrefixOf from xs

then to ++ substitute from to (drop (length from) xs)

else a : substitute from to as

Older »