Moved stuff around

diff --git a/English.lproj/NotiPod.xib b/English.lproj/NotiPod.xib
index 2c2bc5ad9957ba0d62ff26573ae7d3baea298d6e..00390038d1016355052afb27e360df85e0c4cdd8 100644 (file)
--- a/English.lproj/NotiPod.xib
+++ b/English.lproj/NotiPod.xib
@@ -522,7 +522,7 @@
                                <string key="NSMaxSize">{3.40282e+38, 3.40282e+38}</string>
                        </object>
                        <object class="NSCustomObject" id="719278169">
-                               <string key="NSClassName">NotiPodAppDelegate</string>
+                               <string key="NSClassName">NotiPodController</string>
                        </object>
                        <object class="NSWindowTemplate" id="92204650">
                                <int key="NSWindowStyleMask">7</int>
@@ -993,7 +993,7 @@
                                                <int key="objectID">425</int>
                                                <reference key="object" ref="719278169"/>
                                                <reference key="parent" ref="0"/>
-                                               <string key="objectName">NotiPodAppDelegate</string>
+                                               <string key="objectName">NotiPodController</string>
                                        </object>
                                        <object class="IBObjectRecord">
                                                <int key="objectID">428</int>
@@ -1359,7 +1359,7 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string key="className">NotiPodAppDelegate</string>
+                                       <string key="className">NotiPodController</string>
                                        <string key="superclassName">NSObject</string>
                                        <object class="NSMutableDictionary" key="actions">
                                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1396,7 +1396,7 @@
                                        <reference key="sourceIdentifier" ref="344772374"/>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string key="className">NotiPodAppDelegate</string>
+                                       <string key="className">NotiPodController</string>
                                        <string key="superclassName">NSObject</string>
                                        <object class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string key="majorKey">IBUserSource</string>

diff --git a/Info.plist b/Info.plist
index b69e141196f89502c192ad56930c4505959e0d52..19278a526c394ff1b460e1d010142402c8996749 100644 (file)
--- a/Info.plist
+++ b/Info.plist
@@ -17,11 +17,11 @@
        <key>CFBundlePackageType</key>
        <string>APPL</string>
        <key>CFBundleShortVersionString</key>
-       <string>1.1</string>
+       <string>1.2</string>
        <key>CFBundleSignature</key>
        <string>????</string>
        <key>CFBundleVersion</key>
-       <string>1.1</string>
+       <string>1.2</string>
        <key>NSMainNibFile</key>
        <string>NotiPod</string>
        <key>NSPrincipalClass</key>

diff --git a/libsyncitunes.py b/libnotipod.py
similarity index 100%
rename from libsyncitunes.py
rename to libnotipod.py

diff --git a/main.m b/main.m
index d9f789b1ddfc92547064eedb0f2e2e723698b3b0..9368789d64dba740955a44faec68d2015b78ef9e 100644 (file)
--- a/main.m
+++ b/main.m
@@ -20,7 +20,7 @@ main(int argc, char** argv)
        NSString* mainFilePath = nil;
 
        for(NSString* possibleMainExtension in possibleMainExtensions) {
-               mainFilePath = [mainBundle pathForResource: @"NotiPod" ofType: possibleMainExtension];
+               mainFilePath = [mainBundle pathForResource: @"notipod_gui" ofType: possibleMainExtension];
                if(mainFilePath != nil) break;
        }
 

diff --git a/notipod.xcodeproj/project.pbxproj b/notipod.xcodeproj/project.pbxproj
index 7d61add92d3123ec2c771e1dc6b996f351bfdef9..08adab1ebeeed040e533e3ae8922cf36d3ed71e3 100644 (file)
--- a/notipod.xcodeproj/project.pbxproj
+++ b/notipod.xcodeproj/project.pbxproj
@@ -12,8 +12,9 @@
                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 089C165CFE840E0CC02AAC07 /* InfoPlist.strings */; };
                8D11072D0486CEB800E47090 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 29B97316FDCFA39411CA2CEA /* main.m */; settings = {ATTRIBUTES = (); }; };
                8D11072F0486CEB800E47090 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1058C7A1FEA54F0111CA2CBB /* Cocoa.framework */; };
-               93D64A9A12D030190093DEC9 /* libsyncitunes.py in Resources */ = {isa = PBXBuildFile; fileRef = 93D64A9912D030190093DEC9 /* libsyncitunes.py */; };
-               93D64AB212D037890093DEC9 /* NotiPod.py in Resources */ = {isa = PBXBuildFile; fileRef = 93D64AB112D037890093DEC9 /* NotiPod.py */; };
+               93EE29F312D0C5450002BB95 /* libnotipod.py in Resources */ = {isa = PBXBuildFile; fileRef = 93EE29F012D0C5450002BB95 /* libnotipod.py */; };
+               93EE29F412D0C5450002BB95 /* notipod_cli.py in Resources */ = {isa = PBXBuildFile; fileRef = 93EE29F112D0C5450002BB95 /* notipod_cli.py */; };
+               93EE29F512D0C5450002BB95 /* notipod_gui.py in Resources */ = {isa = PBXBuildFile; fileRef = 93EE29F212D0C5450002BB95 /* notipod_gui.py */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXFileReference section */
@@ -27,8 +28,9 @@
                77C8C1F80C07829500965286 /* English */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = English; path = English.lproj/NotiPod.xib; sourceTree = "<group>"; };
                8D1107310486CEB800E47090 /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
                8D1107320486CEB800E47090 /* notipod.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = notipod.app; sourceTree = BUILT_PRODUCTS_DIR; };
-               93D64A9912D030190093DEC9 /* libsyncitunes.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = libsyncitunes.py; sourceTree = "<group>"; };
-               93D64AB112D037890093DEC9 /* NotiPod.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = NotiPod.py; sourceTree = "<group>"; };
+               93EE29F012D0C5450002BB95 /* libnotipod.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = libnotipod.py; sourceTree = "<group>"; };
+               93EE29F112D0C5450002BB95 /* notipod_cli.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = notipod_cli.py; sourceTree = "<group>"; };
+               93EE29F212D0C5450002BB95 /* notipod_gui.py */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.script.python; path = notipod_gui.py; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -85,9 +87,10 @@
                        isa = PBXGroup;
                        children = (
                                32CA4F630368D1EE00C91783 /* notipod_Prefix.pch */,
+                               93EE29F012D0C5450002BB95 /* libnotipod.py */,
+                               93EE29F112D0C5450002BB95 /* notipod_cli.py */,
+                               93EE29F212D0C5450002BB95 /* notipod_gui.py */,
                                29B97316FDCFA39411CA2CEA /* main.m */,
-                               93D64AB112D037890093DEC9 /* NotiPod.py */,
-                               93D64A9912D030190093DEC9 /* libsyncitunes.py */,
                        );
                        name = Sources;
                        sourceTree = "<group>";
@@ -156,8 +159,9 @@
                        files = (
                                8D11072B0486CEB800E47090 /* InfoPlist.strings in Resources */,
                                77C8C1F90C07829500965286 /* NotiPod.xib in Resources */,
-                               93D64A9A12D030190093DEC9 /* libsyncitunes.py in Resources */,
-                               93D64AB212D037890093DEC9 /* NotiPod.py in Resources */,
+                               93EE29F312D0C5450002BB95 /* libnotipod.py in Resources */,
+                               93EE29F412D0C5450002BB95 /* notipod_cli.py in Resources */,
+                               93EE29F512D0C5450002BB95 /* notipod_gui.py in Resources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };

diff --git a/syncitunes.py b/notipod_cli.py
similarity index 89%
rename from syncitunes.py
rename to notipod_cli.py
index 32ed08cbc16d288959bc0a01509e4fbe4bf72c65..0acad1b3b147a377fade720b9c4417d2b9bb9849 100755 (executable)
--- a/syncitunes.py
+++ b/notipod_cli.py
@@ -1,13 +1,13 @@
 #!/usr/bin/env python
 
-VERSION = "0.1"
+VERSION = "1.2"
 
 import logging
 import optparse
 import os
 import sys
 
-import libsyncitunes
+import libnotipod
 
 
 def parse_options():
@@ -52,7 +52,7 @@ def main():
                sys.exit(1)
 
        logging.info("Loading library")
-       library = libsyncitunes.ITunesLibrary.alloc().init()
+       library = libnotipod.ITunesLibrary.alloc().init()
        gen = library.load_(opts.itunes_library)
        for msg in gen:
                logging.debug(msg)
@@ -67,11 +67,11 @@ def main():
        for playlist in opts.playlists:
                tracks = library.get_playlist_name(playlist).tracks
                all_tracks.extend(tracks)
-               libsyncitunes.export_m3u(opts.dry_run, opts.dest,
+               libnotipod.export_m3u(opts.dry_run, opts.dest,
                        opts.path_prefix, playlist, tracks)
 
        logging.info("Synchronising")
-       gen = libsyncitunes.sync(opts.dry_run, library.folder, opts.dest, all_tracks)
+       gen = libnotipod.sync(opts.dry_run, library.folder, opts.dest, all_tracks)
        for msg in gen:
                logging.debug(msg)
 

diff --git a/NotiPod.py b/notipod_gui.py
similarity index 96%
rename from NotiPod.py
rename to notipod_gui.py
index 3ea25bf2143a9aa017e07103c0e49cfd9fb39a4f..ee97365fe05de5a0d2f6647b0f9b44e4d9f2c515 100644 (file)
--- a/NotiPod.py
+++ b/notipod_gui.py
@@ -9,7 +9,7 @@ from Foundation import *
 from AppKit import *
 from PyObjCTools import AppHelper
 
-import libsyncitunes
+import libnotipod
 
 
 class PlaylistModel(NSObject):
@@ -103,7 +103,7 @@ class FolderModel(NSObject):
                        self.folderPopup.selectItemAtIndex_(self.lastIndex)
 
 
-class NotiPodAppDelegate(NSObject):
+class NotiPodController(NSObject):
        window = objc.IBOutlet()
        playlistModel = objc.IBOutlet()
        folderModel = objc.IBOutlet()
@@ -118,7 +118,7 @@ class NotiPodAppDelegate(NSObject):
                pass
 
        def applicationDidFinishLaunching_(self, _):
-               self.library = libsyncitunes.ITunesLibrary.alloc().init()
+               self.library = libnotipod.ITunesLibrary.alloc().init()
                def finish():
                        self.playlistModel.setPlaylists(self.library.get_playlists())
                self.runGenerator(lambda: self.library.load_(None), finish)
@@ -163,14 +163,14 @@ class NotiPodAppDelegate(NSObject):
                all_tracks = []
                for playlist in playlists:
                        all_tracks.extend(playlist.tracks)
-                       libsyncitunes.export_m3u(dry_run=False, dest=folder, path_prefix="",
+                       libnotipod.export_m3u(dry_run=False, dest=folder, path_prefix="",
                                        playlist_name=playlist.name, files=playlist.tracks)
 
                def finish():
                        NSRunAlertPanel("Complete!", "Synchronisation is complete", "Ok", None, None)
                self.runGenerator(
                        lambda:
-                               libsyncitunes.sync(
+                               libnotipod.sync(
                                        dry_run=False,
                                        source=self.library.folder,
                                        dest=folder,