Browse Source

Merge branch 'develop'

tags/v0.1.1^0
Ben Kurtovic 13 years ago
parent
commit
7c542db8a3
2 changed files with 7 additions and 4 deletions
  1. +3
    -3
      README.md
  2. +4
    -1
      musicquizzer.py

+ 3
- 3
README.md View File

@@ -14,7 +14,7 @@ From Terminal (`/Applications/Utiliies/Terminal`), do:
sudo port install py26-game sudo port install py26-game


Next, Next,
[download MusicQuizzer](https://github.com/earwig/music-quizzer/tarball/v0.1)
[download MusicQuizzer](https://github.com/earwig/music-quizzer/tarball/v0.1.1)
and uncompress it. Move the folder wherever you want (keep its contents and uncompress it. Move the folder wherever you want (keep its contents
intact!) and double-click on `mac_osx.sh` to use the quizzer. intact!) and double-click on `mac_osx.sh` to use the quizzer.


@@ -29,7 +29,7 @@ Next, download and install pygame from
[here](http://pygame.org/ftp/pygame-1.9.2a0.win32-py2.7.msi). [here](http://pygame.org/ftp/pygame-1.9.2a0.win32-py2.7.msi).


Finally, Finally,
[download MusicQuizzer](https://github.com/earwig/music-quizzer/zipball/v0.1)
[download MusicQuizzer](https://github.com/earwig/music-quizzer/zipball/v0.1.1)
and extract it wherever you want. To use, simply double-click on the and extract it wherever you want. To use, simply double-click on the
`musicquizzer` file inside (do not move or delete any of the other files). `musicquizzer` file inside (do not move or delete any of the other files).


@@ -42,7 +42,7 @@ pygame and tk with:
sudo apt-get install python-pygame python-tk sudo apt-get install python-pygame python-tk


Then, Then,
[download MusicQuizzer](https://github.com/earwig/music-quizzer/tarball/v0.1)
[download MusicQuizzer](https://github.com/earwig/music-quizzer/tarball/v0.1.1)
and execute the program with `python musicquizzer.py` from your terminal. and execute the program with `python musicquizzer.py` from your terminal.


# Usage # Usage


+ 4
- 1
musicquizzer.py View File

@@ -22,7 +22,7 @@ from urllib import urlretrieve
__author__ = "Ben Kurtovic" __author__ = "Ben Kurtovic"
__copyright__ = "Copyright (c) 2011 by Ben Kurtovic" __copyright__ = "Copyright (c) 2011 by Ben Kurtovic"
__license__ = "MIT License" __license__ = "MIT License"
__version__ = "0.1"
__version__ = "0.1.1"
__email__ = "ben.kurtovic@verizon.net" __email__ = "ben.kurtovic@verizon.net"


config_filename = "config.cfg" config_filename = "config.cfg"
@@ -366,6 +366,9 @@ def do_pieces_download(pieces, status, dl_button, status_label, window):
global download_complete global download_complete
dl_button.configure(state=DISABLED) dl_button.configure(state=DISABLED)
if not os.path.exists(piece_dir):
os.mkdir(piece_dir)
counter = 1 counter = 1
for piece in pieces: for piece in pieces:
url = config.get("general", "base_url") + config.get(piece, "url") url = config.get("general", "base_url") + config.get(piece, "url")


Loading…
Cancel
Save