Merge branch 'release/1.0a11'

App/resources/MetaZ.sdef

@@ -74,9 +74,11 @@
 -->
 		<command name="quit" code="aevtquit" description="Quit the application.">
 			<cocoa class="NSQuitCommand"/>
+            <!--
 			<parameter name="saving" code="savo" type="save options" optional="yes" description="Should changes be saved before quitting?">
 				<cocoa key="SaveOptions"/>
 			</parameter>
+            -->
 		</command>
 
 		<command name="count" code="corecnte" description="Return the number of elements of a particular class within an object.">

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;

App/src/MZMetaLoader.m

@@ -91,6 +91,20 @@ - (void)removeFilesAtIndexes:(NSIndexSet *)indexes
     [self didChangeValueForKey:@"files"];
 }
 
+- (void)removeObjectFromFilesAtIndex:(NSUInteger)idx
+{
+    [self willChangeValueForKey:@"files"];
+    [files removeObjectAtIndex: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]];
@@ -499,6 +513,7 @@ - (void)dealloc
     [error release];
     [controller release];
     [delegate release];
+    [scriptCommand release];
     [super dealloc];
 }
 
@@ -514,8 +529,8 @@ - (void)dataProvider:(id<MZDataProvider>)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

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.
@@ -25,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)

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
+
+

Release/next_release.txt

@@ -1 +1 @@
-1.0a10
+1.0a11

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; }