From ac41d33c732df2c71a3d1325afafc745aa749186 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Thu, 1 Nov 2012 21:23:47 +0100 Subject: [PATCH 1/9] Added bug reporter section --- README.markdown | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/README.markdown b/README.markdown index d6b3ee48..68cc61e9 100644 --- a/README.markdown +++ b/README.markdown @@ -1,5 +1,4 @@ -Introduction -============================================================ +# Introduction MetaZ is an mp4 meta-data editor for OS X. It started its life when another great meta-data editor MetaX stopped getting @@ -9,8 +8,12 @@ things like no proper window resizing. This lead to us starting MetaZ as a reimplementation of MetaX with a few ideas of our own sprinkled in there. -Building -============================================================ +# Bugs / Feature request + +For bugs and feature requests you can use our [issue tracker at github](https://github.com/griff/metaz/issues) + + +# Building There are some files missing in the git repository that you will need if you are going to build your own version of MetaZ. From 627a9067804fa027f5ab1e54114f6e270a265bb2 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Thu, 1 Nov 2012 22:10:24 +0100 Subject: [PATCH 2/9] Changed link to missing.tag.gz --- README.markdown | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.markdown b/README.markdown index 68cc61e9..7c4918cf 100644 --- a/README.markdown +++ b/README.markdown @@ -28,4 +28,4 @@ Copy `Plugins/Amazon/Access_template.h` and insert your own credentials. These files are mostly just taken from MetaX but since I don't have the rights to use them they are not included in the repository. I have though made a tar with these files and uploaded it to github: -[missing.tar.gz](http://cloud.github.com/downloads/griff/metaz/missing.tar.gz) +[missing.tar.gz](http://github.com/downloads/griff/metaz/missing.tar.gz) From ebe906b6895b9ef408afa1f52ea20c89e31ede0b Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Thu, 1 Nov 2012 22:13:30 +0100 Subject: [PATCH 3/9] Fixed sparkle signature generation and moved zip creation to make_diskimage.bash --- Release/make_diskimage.bash | 15 +++++++++++++++ Release/sparkle_sign.bash | 15 ++------------- 2 files changed, 17 insertions(+), 13 deletions(-) diff --git a/Release/make_diskimage.bash b/Release/make_diskimage.bash index 42de0b5e..8314177d 100644 --- a/Release/make_diskimage.bash +++ b/Release/make_diskimage.bash @@ -12,6 +12,8 @@ TEMPLATE_DMG=$SRCROOT/Release/template.dmg MASTER_DMG=$BUILT_PRODUCTS_DIR/$PROJECT_NAME-${VERSION}.dmg WC_DMG=$CONFIGURATION_TEMP_DIR/wc.dmg WC_DIR=$CONFIGURATION_TEMP_DIR/wc +ARCHIVE_FILENAME="$PROJECT_NAME-$VERSION.zip" +export GITV=`git log -n1 --pretty=oneline --format=%h` if [ ! -f "${TEMPLATE_DMG}.zip" ]; then echo @@ -58,3 +60,16 @@ else echo warning Missing stuff fi +WD=$PWD +cd "$BUILT_PRODUCTS_DIR" +rm -f "$PROJECT_NAME"*.zip +ditto -ck --keepParent "$PROJECT_NAME.app" "$ARCHIVE_FILENAME" + +mkdir -p DSYMS +cp -R *.dSYM DSYMS/ + +#ditto -ck --keepParent "$PROJECT_NAME.app.dSYM" "$PROJECT_NAME-$VERSION-$GITV+dYSM.zip" +ditto -ck DSYMS "$PROJECT_NAME-$VERSION-$GITV+dYSM.zip" +rm -rf DSYMS + + diff --git a/Release/sparkle_sign.bash b/Release/sparkle_sign.bash index 9d6aba27..3af65b75 100644 --- a/Release/sparkle_sign.bash +++ b/Release/sparkle_sign.bash @@ -7,7 +7,6 @@ if [ "${CONFIGURATION}" != "Release" ]; then exit; fi if [[ -z "$(security find-generic-password -s "$KEYCHAIN_PRIVKEY_NAME")" ]] ; then exit; fi PATH=$PATH:/usr/local/bin:/usr/bin:/sw/bin:/opt/local/bin -export GITV=`git log -n1 --pretty=oneline --format=%h` VERSION=$(defaults read "$BUILT_PRODUCTS_DIR/$PROJECT_NAME.app/Contents/Info" CFBundleShortVersionString) FULLVERSION=$(defaults read "$BUILT_PRODUCTS_DIR/$PROJECT_NAME.app/Contents/Info" CFBundleVersion) @@ -19,21 +18,11 @@ DOWNLOAD_URL="$DOWNLOAD_BASE_URL/$ARCHIVE_FILENAME" WD=$PWD cd "$BUILT_PRODUCTS_DIR" -rm -f "$PROJECT_NAME"*.zip -ditto -ck --keepParent "$PROJECT_NAME.app" "$ARCHIVE_FILENAME" - -mkdir -p DSYMS -cp -R *.dSYM DSYMS/ - -#ditto -ck --keepParent "$PROJECT_NAME.app.dSYM" "$PROJECT_NAME-$VERSION-$GITV+dYSM.zip" -ditto -ck DSYMS "$PROJECT_NAME-$VERSION-$GITV+dYSM.zip" -rm -rf DSYMS SIZE=$(stat -f %z "$ARCHIVE_FILENAME") PUBDATE=$(date +"%a, %d %b %G %T %z") -HASH=$(openssl dgst -sha1 -binary < "$ARCHIVE_FILENAME") -KEY=$(security find-generic-password -g -s "$KEYCHAIN_PRIVKEY_NAME" 2>&1 1>/dev/null | perl -pe '($_) = /"(.+)"/; s/\\012/\n/g' ) -SIGNATURE=$(echo $HASH | openssl dgst -dss1 -sign <(echo "$KEY") | openssl enc -base64) +KEY=$(security find-generic-password -g -s "$KEYCHAIN_PRIVKEY_NAME" 2>&1 1>/dev/null | perl -pe '($_) = /"(.+)"/; s/\\012/\n/g') +SIGNATURE=$(openssl dgst -sha1 -binary < "$ARCHIVE_FILENAME" | openssl dgst -dss1 -sign <(echo "$KEY") | openssl enc -base64) [ $SIGNATURE ] || { echo Unable to load signing private key with name "'$KEYCHAIN_PRIVKEY_NAME'" from keychain; false; } From 026d4463c274f97388396dc106b2771b5bc9ae88 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Nov 2012 11:32:51 +0100 Subject: [PATCH 4/9] Removed save option parameter from quit command --- App/resources/MetaZ.sdef | 2 ++ 1 file changed, 2 insertions(+) diff --git a/App/resources/MetaZ.sdef b/App/resources/MetaZ.sdef index fc514d01..c26d43e5 100644 --- a/App/resources/MetaZ.sdef +++ b/App/resources/MetaZ.sdef @@ -74,9 +74,11 @@ --> + From ada6e0384c040899ca4f39550f5132b4bd85b0ca Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Nov 2012 12:04:19 +0100 Subject: [PATCH 5/9] Added single index remove method for files array to MZMetaLoaded --- App/src/MZMetaLoader.h | 1 + App/src/MZMetaLoader.m | 7 +++++++ 2 files changed, 8 insertions(+) diff --git a/App/src/MZMetaLoader.h b/App/src/MZMetaLoader.h index 16f0f05b..0f16dc44 100644 --- a/App/src/MZMetaLoader.h +++ b/App/src/MZMetaLoader.h @@ -49,6 +49,7 @@ MZKIT_EXTERN NSString* const MZMetaLoaderFinishedNotification; - (NSArray *)types; - (void)removeAllObjects; - (void)removeFilesAtIndexes:(NSIndexSet *)indexes; +- (void)removeObjectFromFilesAtIndex:(NSUInteger)idx; - (BOOL)loadFromFile:(NSString *)fileName; - (BOOL)loadFromFiles:(NSArray *)fileNames; - (BOOL)loadFromFile:(NSString *)fileName toIndex:(NSUInteger)index; diff --git a/App/src/MZMetaLoader.m b/App/src/MZMetaLoader.m index 647b69ff..5913365f 100644 --- a/App/src/MZMetaLoader.m +++ b/App/src/MZMetaLoader.m @@ -91,6 +91,13 @@ - (void)removeFilesAtIndexes:(NSIndexSet *)indexes [self didChangeValueForKey:@"files"]; } +- (void)removeObjectFromFilesAtIndex:(NSUInteger)idx +{ + [self willChangeValueForKey:@"files"]; + [files removeObjectAtIndex:idx]; + [self didChangeValueForKey:@"files"]; +} + -(BOOL)loadFromFile:(NSString *)fileName { return [self loadFromFile:fileName toIndex:[files count]]; From 3aa6ca1540e664bd26a52c66599f0d31f3878f5d Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Nov 2012 12:05:44 +0100 Subject: [PATCH 6/9] Added files insert method to make MZMetaLoader mutable key/value compliant for files --- App/src/MZMetaLoader.m | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/App/src/MZMetaLoader.m b/App/src/MZMetaLoader.m index 5913365f..98592cec 100644 --- a/App/src/MZMetaLoader.m +++ b/App/src/MZMetaLoader.m @@ -98,6 +98,13 @@ - (void)removeObjectFromFilesAtIndex:(NSUInteger)idx [self didChangeValueForKey:@"files"]; } +- (void)insertObject:(id)object inFilesAtIndex:(NSUInteger)index +{ + [self willChangeValueForKey:@"files"]; + [files insertObject:object atIndex:index]; + [self didChangeValueForKey:@"files"]; +} + -(BOOL)loadFromFile:(NSString *)fileName { return [self loadFromFile:fileName toIndex:[files count]]; From 1b67bb69d41a7568541dad8f853b8ee656da0948 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Nov 2012 12:08:19 +0100 Subject: [PATCH 7/9] Added release of scriptCommand to MZLoadOperation dealloc fixing a memory leak --- App/src/MZMetaLoader.m | 1 + 1 file changed, 1 insertion(+) diff --git a/App/src/MZMetaLoader.m b/App/src/MZMetaLoader.m index 98592cec..877f0e6b 100644 --- a/App/src/MZMetaLoader.m +++ b/App/src/MZMetaLoader.m @@ -513,6 +513,7 @@ - (void)dealloc [error release]; [controller release]; [delegate release]; + [scriptCommand release]; [super dealloc]; } From 0526da77914f6c3b87af9f843c4952047b6f1221 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Nov 2012 12:10:39 +0100 Subject: [PATCH 8/9] Retained edits and errors in MZLoadOperation fixing #26 --- App/src/MZMetaLoader.m | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/App/src/MZMetaLoader.m b/App/src/MZMetaLoader.m index 877f0e6b..a7f4e68c 100644 --- a/App/src/MZMetaLoader.m +++ b/App/src/MZMetaLoader.m @@ -529,8 +529,8 @@ - (void)dataProvider:(id)provider fromFile:(NSString *)fileName error:(NSError *)theError { - edits = theEdits; - error = theError; + edits = [theEdits retain]; + error = [theError retain]; // loadedFile: runs a modeal alert so we use NSEventTrackingRunLoopMode // to avoid showing more than one alert at a time From 6d9bdbf8669bf81a85088e1319b7be17ca2e4ca7 Mon Sep 17 00:00:00 2001 From: Brian Olsen Date: Fri, 2 Nov 2012 12:11:58 +0100 Subject: [PATCH 9/9] Bumped next_release to 1.0a11 --- Release/next_release.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Release/next_release.txt b/Release/next_release.txt index f71668fb..0de70380 100644 --- a/Release/next_release.txt +++ b/Release/next_release.txt @@ -1 +1 @@ -1.0a10 +1.0a11