Fixes #2 Renamer; Fixes #210 Stacked Files; Minimum Mac OS Version se…

…t to 10.6; Removed MySQL build dependency

MediaElch.plist

@@ -7,19 +7,19 @@
     <key>CFBundlePackageType</key>
     <string>APPL</string>
     <key>CFBundleGetInfoString</key>
-    <string>1.0</string>
+    <string>1.4</string>
     <key>CFBundleVersion</key>
-    <string>1.0</string>
+    <string>1.4</string>
     <key>CFBundleShortVersionString</key>
-    <string>1.0</string>
+    <string>1.4</string>
     <key>CFBundleExecutable</key>
     <string>MediaElch</string>
     <key>CFBundleIdentifier</key>
     <string>com.daniel-kabel.MediaElch</string>
     <key>NSHumanReadableCopyright</key>
-    <string>2012 Daniel Kabel</string>
+    <string>2013 Daniel Kabel</string>
     <key>LSMinimumSystemVersion</key>
-    <string>10.7.0</string>
+    <string>10.6.8</string>
     <key>LSApplicationCategoryType</key>
     <string>public.app-category.utilities</string>
     <key>ForAppStore</key>

MediaElch.pro

@@ -122,7 +122,8 @@ SOURCES += main.cpp\
     data/Storage.cpp \
     tvShows/TvShowWidgetSeason.cpp \
     smallWidgets/ImageGallery.cpp \
-    smallWidgets/ClosableImage.cpp
+    smallWidgets/ClosableImage.cpp \
+    renamer/Renamer.cpp
 
 HEADERS  += main/MainWindow.h \
     movies/Movie.h \
@@ -220,7 +221,8 @@ HEADERS  += main/MainWindow.h \
     data/Storage.h \
     tvShows/TvShowWidgetSeason.h \
     smallWidgets/ImageGallery.h \
-    smallWidgets/ClosableImage.h
+    smallWidgets/ClosableImage.h \
+    renamer/Renamer.h
 
 FORMS    += main/MainWindow.ui \
     movies/MovieSearch.ui \
@@ -254,7 +256,8 @@ FORMS    += main/MainWindow.ui \
     xbmc/XbmcSync.ui \
     movies/MovieMultiScrapeDialog.ui \
     smallWidgets/TagCloud.ui \
-    tvShows/TvShowWidgetSeason.ui
+    tvShows/TvShowWidgetSeason.ui \
+    renamer/Renamer.ui
 
 RESOURCES += \
     MediaElch.qrc

MediaElch.qrc

@@ -63,6 +63,7 @@
         <file>img/imgButtonLeft.png</file>
         <file>img/imgButtonBottom.png</file>
         <file>img/imgButtonTop.png</file>
+        <file>img/folder_64.png</file>
     </qresource>
     <qresource prefix="/media">
         <file alias="aspect/1.33">mediaFlags/aspect/1.33.png</file>

concerts/ConcertFilesWidget.cpp

@@ -180,6 +180,7 @@ void ConcertFilesWidget::itemActivated(QModelIndex index, QModelIndex previous)
     qDebug() << "Entered";
     if (!index.isValid()) {
         qDebug() << "Index is invalid";
+        m_lastConcert = 0;
         emit noConcertSelected();
         return;
     }
@@ -218,3 +219,15 @@ void ConcertFilesWidget::restoreLastSelection()
     qDebug() << "Entered";
     ui->files->setCurrentIndex(m_lastModelIndex);
 }
+
+QList<Concert*> ConcertFilesWidget::selectedConcerts()
+{
+    QList<Concert*> concerts;
+    foreach (const QModelIndex &index, ui->files->selectionModel()->selectedRows(0)) {
+        int row = index.model()->data(index, Qt::UserRole).toInt();
+        concerts.append(Manager::instance()->concertModel()->concert(row));
+    }
+    if (concerts.isEmpty())
+        concerts << m_lastConcert;
+    return concerts;
+}

concerts/ConcertFilesWidget.h

@@ -27,6 +27,7 @@ class ConcertFilesWidget : public QWidget
     explicit ConcertFilesWidget(QWidget *parent = 0);
     ~ConcertFilesWidget();
     static ConcertFilesWidget *instance();
+    QList<Concert*> selectedConcerts();
 
 public slots:
     void restoreLastSelection();

data/MediaCenterInterface.h

@@ -58,6 +58,9 @@ class MediaCenterInterface : public QObject
     virtual QString seasonPosterImageName(TvShow *show, int season, QList<DataFile> dataFiles = QList<DataFile>(), bool constructName = false) = 0;
     virtual QString seasonBackdropImageName(TvShow *show, int season, QList<DataFile> dataFiles = QList<DataFile>(), bool constructName = false) = 0;
     virtual QString seasonBannerImageName(TvShow *show, int season, QList<DataFile> dataFiles = QList<DataFile>(), bool constructName = false) = 0;
+    virtual QString nfoFilePath(Movie *movie) = 0;
+    virtual QString nfoFilePath(Concert *concert) = 0;
+    virtual QString nfoFilePath(TvShowEpisode *episode) = 0;
 };
 
 #endif // MEDIACENTERINTERFACE_H

debian/control

@@ -9,7 +9,7 @@ Vcs-Git: git://github.com/Komet/MediaElch.git
 
 Package: mediaelch
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql, libqt4-sql-sqlite, libqt4-sql-mysql, libqt4-script, libqt4-xml, libqt4-core, libqt4-gui, libqt4-network, libmysqlclient18, libmediainfo0, zlib1g, libzen0, libphonon4
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqt4-sql, libqt4-sql-sqlite, libqt4-script, libqt4-xml, libqt4-core, libqt4-gui, libqt4-network, libmysqlclient18, libmediainfo0, zlib1g, libzen0, libphonon4
 Description: XBMC Media Manager
  MediaElch is your Media Manager for handling Movies and TV Shows in XBMC. 
  It is designed to gather information from various movie databases on the internet and store these information directly to XBMCs database or in nfo files. 

globals/Globals.h

@@ -51,7 +51,7 @@ namespace MediaCenterFeatures {
 }
 
 enum MainActions {
-    ActionSearch, ActionSave, ActionSaveAll, ActionFilterWidget, ActionExport
+    ActionSearch, ActionSave, ActionSaveAll, ActionFilterWidget, ActionRename, ActionExport
 };
 
 enum MainWidgets {

globals/Helper.cpp

@@ -128,3 +128,12 @@ QImage &Helper::resizeBackdrop(QImage &image)
 
     return image;
 }
+
+
+QString &Helper::sanitizeFileName(QString &fileName)
+{
+    fileName.replace("/", "_");
+    fileName.replace("\\", "_");
+    fileName.replace("$", "_");
+    return fileName;
+}

globals/Helper.h

@@ -16,6 +16,7 @@ class Helper
     static bool isDvd(QString path);
     static bool isBluRay(QString path);
     static QImage &resizeBackdrop(QImage &image);
+    static QString &sanitizeFileName(QString &fileName);
 };
 
 #endif // HELPER_H