Merge lp:~dreamdevel/eradio/newDatabase into lp:eradio/luna

[Fotini Skoti]

Implemented Blueprints
   https://blueprints.launchpad.net/eradio/+spec/new-database-structure
   https://blueprints.launchpad.net/eradio/+spec/sqlite3-to-sqlheavy

Added white space trim to dialog entries
Enabled empty genre entry

[lp:~dreamdevel/eradio/newDatabase]

68. By George Sofianos on 2014-09-17

Removed some comments

[George Sofianos (georgesofianosgr)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-07-06 09:00:32 +0000
+++ CMakeLists.txt	2014-09-17 09:38:41 +0000
@@ -36,6 +36,7 @@
     json-glib-1.0
     libsoup-2.4
     libxml-2.0
+    sqlheavy-0.1
 )
 
 pkg_check_modules(DEPS REQUIRED ${PROJECT_DEPS})
@@ -56,7 +57,6 @@
     src/main_window.vala
     src/stream_player.vala
     src/station_list.vala
-    src/stations.vala
     src/station.vala
     src/error.vala
     src/station_dialog.vala
@@ -72,6 +72,8 @@
     src/progress_dialog.vala
     src/pls_decoder.vala
     src/asx_decoder.vala
+    src/genre.vala
+    src/database.vala
 PACKAGES
     ${PROJECT_DEPS}
 )

=== modified file 'debian/control'
--- debian/control	2014-07-01 17:56:24 +0000
+++ debian/control	2014-09-17 09:38:41 +0000
@@ -13,7 +13,8 @@
                libnotify-dev,
                libjson-glib-dev,
                libsoup2.4-dev,
-               libxml2-dev
+               libxml2-dev,
+               libsqlheavy0.1-dev
 Standards-Version: 3.9.3
 
 Package: eradio

=== added file 'src/database.vala'
--- src/database.vala	1970-01-01 00:00:00 +0000
+++ src/database.vala	2014-09-17 09:38:41 +0000
@@ -0,0 +1,510 @@
+/*-
+ *  Copyright (c) 2014 Dream Dev Developers (https://launchpad.net/~dreamdev)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Authored by: Fotini Skoti <[e-mail]>
+ */
+
+ public class Radio.Database {
+
+    private string database_path;
+    private SQLHeavy.Database db;
+
+    public Database.with_db_file (string path) throws Radio.Error {
+
+        database_path = path;
+
+        try {
+            db = new SQLHeavy.Database (database_path);
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_OPEN_DB_FAILED (
+              "Couldn't Open Database: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+
+        try {
+          db.run ("""CREATE TABLE IF NOT EXISTS `Stations`(id INTEGER PRIMARY KEY, name TEXT, url TEXT);
+                     CREATE TABLE IF NOT EXISTS `Genres`(id INTEGER PRIMARY KEY, name TEXT);
+                     CREATE TABLE IF NOT EXISTS `StationsGenres`(station_id INTEGER, genre_id INTEGER,
+                     PRIMARY KEY(station_id,genre_id));""");
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_CREATE_FAILED (
+              "Couldn't Create Tables: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    public void new_station (string name, Gee.ArrayList <string> genres, string url) {
+        int flag = 0;
+
+        try {
+            add_station (name, url);
+            int? station_id = null;
+
+            try {
+                SQLHeavy.QueryResult results = db.execute ("SELECT * FROM Stations ORDER BY id DESC LIMIT 1");
+
+                if (!results.finished){
+                        station_id   = (int) results.get ("id").get_int64 ();
+                }
+            }
+            catch (SQLHeavy.Error e) {
+                throw new Radio.Error.SQLITE_SELECT_FAILED (
+                    "Couldn't Select Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+            }
+
+            if (station_id != null) {
+                foreach (string genre_name in genres) {
+
+                    if (get_genre_by_name (genre_name) == null) {
+                        add_genre (genre_name);
+                        var genre_id   = get_genre_by_name (genre_name).id;
+                        link_genre (station_id, genre_id);
+                    }
+                    else {
+
+                        var linked_genres = get_linked_genres (station_id);
+                        foreach ( string genre in linked_genres){
+                            if (genre == genre_name){
+                                flag = 1;
+                                break;
+                            }
+                        }
+
+                        if (flag == 0) {
+                            var genre_id   = get_genre_by_name (genre_name).id;
+                            link_genre (station_id, genre_id);
+                        }
+                    }
+                }
+            }
+        }
+        catch (Radio.Error e) {
+            stderr.printf (e.message);
+        }
+
+    }
+
+    public void update_station_details (int id, string name, Gee.ArrayList<string> genres, string url) {
+
+        int flag;
+
+        try {
+            if (get_station_by_id (id) != null) {
+
+                update_station (id, name, url);
+                var existing_genres = get_linked_genres (id);
+
+                foreach (string new_genre in genres) {
+
+                    flag = 0;
+                    foreach (string old_genre in existing_genres) {
+
+                        if (new_genre == old_genre){
+                            flag = 1;
+                            break;
+                        }
+                    }
+
+                    if (flag == 0) {
+                        add_genre (new_genre);
+                        link_genre (id, get_genre_by_name (new_genre).id);
+                    }
+                }
+
+                foreach (string old_genre in existing_genres) {
+                    flag = 0;
+
+                    foreach (string new_genre in genres) {
+                        if (new_genre == old_genre){
+
+                            flag = 1;
+                             break;
+                        }
+                    }
+
+                    if (flag == 0) {
+                        var genre = get_genre_by_name (old_genre);
+                        unlink_genre (id, genre.id);
+                        if (count_genre_entries_by_id (genre.id) == 0)
+                            delete_genre (genre.id);
+                    }
+                }
+            }
+        }
+        catch (Radio.Error e) {
+            stderr.printf (e.message);
+        }
+    }
+
+    public void remove_station (int id) {
+        try {
+            if (get_station_by_id (id) != null) {
+
+                var genres = get_linked_genres (id);
+
+                foreach (string genre in genres) {
+                    var genre_id = get_genre_by_name (genre).id;
+                    unlink_genre (id, genre_id);
+
+                    if (count_genre_entries_by_id (genre_id) == 0)
+                        delete_genre (genre_id);
+                }
+                delete_station (id);
+            }
+        }
+        catch (Radio.Error e) {
+            stderr.printf (e.message);
+        }
+    }
+
+    public Gee.ArrayList<Radio.Station>? get_all_stations () {
+
+        var stations_list = new Gee.ArrayList<Radio.Station> ();
+
+        try {
+            SQLHeavy.Query query = db.prepare ("SELECT * FROM `Stations`;");
+
+            for (SQLHeavy.QueryResult results = query.execute (); !results.finished; results.next ()) {
+
+                string name = results.get ("name").get_string ();
+                string url  = results.get ("url").get_string ();
+                int  id     = (int) results.get ("id").get_int64 ();
+
+                try {
+                    var genres  = get_linked_genres (id);
+                    var station = new Radio.Station (id, name, url, genres);
+                    stations_list.add (station);
+                }
+                catch (Radio.Error e) {
+                    stderr.printf (e.message);
+                    return null;
+                }
+            }
+            return stations_list;
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf (e.message);
+        }
+
+        return null;
+    }
+
+    public Gee.ArrayList<Radio.Station> get_stations_by_genre (int id) {
+
+        var stations_list = new Gee.ArrayList<Radio.Station> ();
+
+        try {
+            SQLHeavy.Query query = db.prepare ("""SELECT Stations.* FROM Stations, StationsGenres
+                WHERE Stations.id = StationsGenres.station_id AND StationsGenres.genre_id = :id;""");
+            query.set_int (":id",id);
+
+            for (SQLHeavy.QueryResult results = query.execute (); !results.finished; results.next ()) {
+
+                string station_name = results.get ("name").get_string ();
+                string station_url  = results.get ("url").get_string ();
+                int  station_id     = (int) results.get ("id").get_int64 ();
+
+                try {
+                    var genres  = get_linked_genres (station_id);
+                    var station = new Radio.Station (station_id, station_name, station_url, genres);
+                    stations_list.add (station);
+                }
+                catch (Radio.Error e) {
+                    stderr.printf (e.message);
+                }
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf (e.message);
+        }
+        return stations_list;
+    }
+
+    public Gee.ArrayList<Radio.Genre>? get_all_genres () {
+
+        var genres_list = new Gee.ArrayList<Radio.Genre> ();
+
+        try {
+            SQLHeavy.Query query = db.prepare ("SELECT * FROM `Genres`;");
+
+            for (SQLHeavy.QueryResult results = query.execute (); !results.finished; results.next ()) {
+                string name = results.get ("name").get_string ();
+                int  id   = (int) results.get ("id").get_int64 ();
+
+                var genre = new Radio.Genre (id, name);
+                genres_list.add (genre);
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf(e.message);
+        }
+
+        if (genres_list.size == 0)
+            return null;
+        return genres_list;
+    }
+
+    public Radio.Genre? get_genre_by_id (int id) {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("SELECT * FROM `Genres` WHERE `id` = :id;");
+            query.set_int (":id", id);
+
+            SQLHeavy.QueryResult results = query.execute ();
+            if (!results.finished) {
+
+                string genre_name = results.get ("name").get_string ();
+                int  genre_id     = (int) results.get ("id").get_int64 ();
+
+                var genre = new Radio.Genre (genre_id, genre_name);
+                return genre;
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf (e.message);
+        }
+        return null;
+    }
+
+    public Radio.Station? get_station_by_id (int id) {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("SELECT * FROM `Stations` WHERE `id` = :id;");
+            query.set_int (":id", id);
+
+            SQLHeavy.QueryResult results = query.execute ();
+            if (!results.finished) {
+
+                string station_name = results.get ("name").get_string ();
+                string station_url  = results.get ("url").get_string ();
+
+                try {
+                    var genres  = get_linked_genres (id);
+                    var station = new Radio.Station (id, station_name, station_url, genres);
+                    return station;
+                }
+                catch (Radio.Error e) {
+                    stderr.printf (e.message);
+                }
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf (e.message);
+        }
+        return null;
+    }
+
+    public int? count_genre_entries_by_id (int id) {
+        try{
+            SQLHeavy.Query query = db.prepare ("SELECT COUNT(genre_id) FROM StationsGenres WHERE genre_id = :id;");
+            query.set_int (":id",id);
+
+            SQLHeavy.QueryResult results = query.execute ();
+            if (!results.finished) {
+                return results.fetch_int (0);
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf (e.message);
+        }
+        return null;
+    }
+
+    public int count_stations () {
+
+        var num_stations = 0;
+        try {
+            SQLHeavy.QueryResult results = db.execute ("SELECT COUNT(id) FROM Stations");
+            if (!results.finished) {
+                num_stations = results.fetch_int (0);
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            stderr.printf (e.message);
+        }
+        return num_stations;
+    }
+
+    private Radio.Station? get_station_by_name (string name) throws Radio.Error {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("SELECT * FROM `Stations` WHERE `name` = :name;");
+            query.set_string (":name", name);
+            SQLHeavy.QueryResult results = query.execute ();
+
+            if (!results.finished) {
+                var station_id   = (int) results.get ("id").get_int64 ();
+                var station_name = results.get ("name").get_string ();
+                var station_url  = results.get ("url").get_string ();
+
+                try {
+                    var station_genres = get_linked_genres (station_id);
+                    var station = new Radio.Station (station_id, station_name, station_url, station_genres);
+                    return station;
+                }
+                catch (Radio.Error e) {
+                    stderr.printf (e.message);
+                }
+            }
+        }
+        catch (SQLHeavy.Error e){
+            throw new Radio.Error.SQLITE_SELECT_FAILED (
+              "Couldn't Select Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+        return null;
+    }
+
+    private Radio.Genre? get_genre_by_name (string name) throws Radio.Error {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("SELECT * FROM `Genres` WHERE `name` = :name;");
+            query.set_string (":name", name);
+            SQLHeavy.QueryResult results = query.execute ();
+
+            if (!results.finished) {
+                var id    = (int) results.get ("id").get_int64 ();
+                var genre = new Radio.Genre (id,name);
+                return genre;
+            }
+        }
+        catch (SQLHeavy.Error e){
+            throw new Radio.Error.SQLITE_SELECT_FAILED (
+              "Couldn't Select Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+        return null;
+    }
+
+    //return genres which are linked to given station
+    private Gee.ArrayList<string> get_linked_genres (int id) throws Radio.Error {
+
+        var genres_name = new Gee.ArrayList<string> ();
+
+        try{
+            SQLHeavy.Query query = db.prepare ("""SELECT Genres.name FROM Genres,StationsGenres WHERE StationsGenres.genre_id = Genres.id
+                                                AND StationsGenres.station_id = :id;""");
+            query.set_int (":id",id);
+
+            for (SQLHeavy.QueryResult results = query.execute (); !results.finished; results.next ()) {
+                genres_name.add (results.get ("name").get_string ());
+            }
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_SELECT_FAILED (
+              "Couldn't Select Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+
+        return genres_name;
+    }
+
+    private void add_station (string name, string url) throws Radio.Error {
+
+        try {
+          SQLHeavy.Query query = db.prepare ("INSERT INTO `Stations` VALUES (null, :name, :url);");
+
+          query.set_string (":name", name);
+          query.set_string (":url", url);
+          query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_INSERT_FAILED (
+              "Couldn't Insert Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    private void add_genre (string name) throws Radio.Error {
+
+        try {
+           SQLHeavy.Query query = db.prepare ("INSERT INTO `Genres` VALUES (null, :name);");
+           query.set_string (":name", name);
+           query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_INSERT_FAILED (
+              "Couldn't Insert Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    private void link_genre (int station_id, int genre_id) throws Radio.Error{
+
+        try {
+          SQLHeavy.Query query = db.prepare ("INSERT INTO `StationsGenres` VALUES (:station_id, :genre_id);");
+
+          query.set_int (":station_id", station_id);
+          query.set_int (":genre_id", genre_id);
+          query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_INSERT_FAILED (
+              "Couldn't Insert Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    private void unlink_genre (int station_id, int genre_id) throws Radio.Error {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("DELETE FROM StationsGenres WHERE station_id = :station_id AND genre_id = :genre_id;");
+
+            query.set_int (":station_id", station_id);
+            query.set_int (":genre_id", genre_id);
+            query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_DELETE_FAILED (
+              "Couldn't Delete Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    private void update_station (int id, string name, string url) throws Radio.Error {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("UPDATE `Stations` SET `name` = :name, `url` = :url WHERE `id` = :id;");
+            query.set_string (":name", name);
+            query.set_string (":url", url);
+            query.set_int (":id", id);
+            query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_UPDATE_FAILED (
+              "Couldn't Update Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    private void delete_station (int id) throws Radio.Error {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("DELETE FROM `Stations` WHERE `id` = :id;");
+            query.set_int (":id", id);
+            query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_DELETE_FAILED (
+              "Couldn't Delete Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+
+    private void delete_genre (int id) throws Radio.Error {
+
+        try {
+            SQLHeavy.Query query = db.prepare ("DELETE FROM `Genres` WHERE `id` = :id;");
+            query.set_int (":id", id);
+            query.execute ();
+        }
+        catch (SQLHeavy.Error e) {
+            throw new Radio.Error.SQLITE_DELETE_FAILED (
+              "Couldn't Delete Entry: Error Code %d \nError Message: %s\n".printf (e.code,e.message));
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/extract_dialog.vala'
--- src/extract_dialog.vala	2014-07-01 07:49:55 +0000
+++ src/extract_dialog.vala	2014-09-17 09:38:41 +0000
@@ -15,6 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
  public class Radio.ExtractDialog : Gtk.Dialog {
@@ -100,14 +101,8 @@
 
         // Update list
         this.list.clear ();
-        try {
-            var stations = Radio.App.database.get_all ();
-
-            this.list.add_stations (stations);
-
-        } catch (Radio.Error error) {
-            stderr.printf(error.message);
-        }
+        var stations = Radio.App.database.get_all_stations ();
+        this.list.add_stations (stations);
 
         base.show ();
     }

=== added file 'src/genre.vala'
--- src/genre.vala	1970-01-01 00:00:00 +0000
+++ src/genre.vala	2014-09-17 09:38:41 +0000
@@ -0,0 +1,29 @@
+/*-
+ *  Copyright (c) 2014 Dream Dev Developers (https://launchpad.net/~dreamdev)
+ *
+ *  This program is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  This program is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  Authored by: Fotini Skoti <[e-mail]>
+ */
+
+ public class Radio.Genre {
+
+    public int    id   {get;set;}
+    public string name {get;set;}
+
+    public Genre (int id,string name) {
+        this.id   = id;
+        this.name = name;
+    }
+}
\ No newline at end of file

=== modified file 'src/main_window.vala'
--- src/main_window.vala	2014-07-04 07:04:50 +0000
+++ src/main_window.vala	2014-09-17 09:38:41 +0000
@@ -15,6 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
 public class Radio.MainWindow : Gtk.Window {
@@ -76,9 +77,6 @@
         // Set Default view
         this.change_view(this.view_index);
         this.stop ();
-
-        // Temporary workout, until move database out of TreeView
-        Radio.App.database = this.list_view.stations_db;
     }
 
     /* --------------- Build UI ---------------- */
@@ -155,7 +153,7 @@
         }
 
         // In case db has stations show list else welcome view
-        if(list_view.count () > 0 )
+        if(Radio.App.database.count_stations () > 0 )
             this.view_index = 1;
 
         scroll_view = new Gtk.ScrolledWindow (null, null);
@@ -379,37 +377,60 @@
 
     private void dialog_add_success () {
 
-        list_view.add (dialog_add.entry_name.text,
-                       dialog_add.entry_url.text,
-                       dialog_add.entry_genre.text);
-
-        if(view_index == 0 && list_view.count () > 0)
+        string genres_text = dialog_add.entry_genre.text;
+        string[] genres    = genres_text.split (",");
+        var genres_list = new Gee.ArrayList <string> ();
+
+            foreach (string iter in genres) {
+                iter = iter.strip ();
+                if (iter != "")
+                    genres_list.add (iter);
+            }
+
+        list_view.add (dialog_add.entry_name.text.strip (),
+                       genres_list,
+                       dialog_add.entry_url.text.strip ());
+
+        if(view_index == 0 && Radio.App.database.count_stations () > 0)
             change_view(1);
     }
 
     private void dialog_edit_open (int station_id) {
 
-        try {
-            var station = list_view.get_station(station_id);
+            var station = Radio.App.database.get_station_by_id (station_id);
+
+            string genre_text = "";
+            int arraylist_size = station.genres.size;
+
+            //Create a string with genre names
+            for (int i=0; i<arraylist_size; i++) {
+                genre_text = genre_text+station.genres[i];
+                if (i != arraylist_size - 1)
+                    genre_text = genre_text + ", ";
+            }
+
             dialog_edit.entry_name.set_text(station.name);
-            dialog_edit.entry_genre.text = station.genre;
+            dialog_edit.entry_genre.text = genre_text;
             dialog_edit.entry_url.text = station.url;
             dialog_edit.show(false);
-
-        } catch (Radio.Error error) {
-            stderr.printf(error.message);
-            var application = (Radio.App) GLib.Application.get_default();
-            application.quit();
-        }
     }
 
     private void dialog_edit_success () {
 
+        string genres_text = dialog_edit.entry_genre.text;
+        string[] genres    = genres_text.split (",");
+        var genres_list = new Gee.ArrayList <string> ();
+
+        foreach (string iter in genres) {
+                iter = iter.strip ();
+                if (iter != "")
+                    genres_list.add (iter.strip ());
+        }
+
         var station = new Radio.Station (list_view.context_menu_row_id,
-                                        dialog_edit.entry_name.text,
-                                        dialog_edit.entry_url.text,
-                                        dialog_edit.entry_genre.text);
-
+                                        dialog_edit.entry_name.text.strip (),
+                                        dialog_edit.entry_url.text.strip (),
+                                        genres_list);
         list_view.update(station);
 
         // If currently playing change && url changed , update playback
@@ -443,7 +464,7 @@
                 var stations = Radio.PackageManager.parse(file_chooser_import.get_filename ());
                 list_view.add_array (stations);
 
-                if(view_index == 0 && list_view.count () > 0)
+                if(view_index == 0 && Radio.App.database.count_stations () > 0)
                     change_view(1);
 
             } catch (Radio.Error error) {
@@ -484,7 +505,7 @@
 
     private void station_deleted (int station_id) {
 
-        if(view_index == 1 && list_view.count () == 0)
+        if(view_index == 1 && Radio.App.database.count_stations () == 0)
             change_view(0);
 
         // Stop playback

=== modified file 'src/package_manager.vala'
--- src/package_manager.vala	2014-06-26 18:13:45 +0000
+++ src/package_manager.vala	2014-09-17 09:38:41 +0000
@@ -15,6 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
  public class Radio.PackageManager : GLib.Object {
@@ -57,7 +58,16 @@
                 var name = station_object.get_string_member ("Name");
                 var genre = station_object.get_string_member ("Genre");
                 var url = station_object.get_string_member ("Url");
-                var station = new Radio.Station (-1,name,url,genre);
+
+                string[] strs = genre.split (",");
+                var genres = new Gee.ArrayList<string> ();
+
+                foreach (string str in strs) {
+
+                    genres.add (str.strip());
+                }
+
+                var station = new Radio.Station (-1,name,url,genres);
 
                 stations_array[i] = station;
             }
@@ -85,10 +95,19 @@
         foreach (Radio.Station station in stations) {
             builder.begin_object ();
 
+            string genre = "";
+            var arraylist_size = station.genres.size;
+
+            for (int i=0; i<arraylist_size; i++) {
+                genre = genre + station.genres[i];
+                if (i != arraylist_size - 1)
+                    genre = genre + ", ";
+            }
+
             builder.set_member_name ("Name");
             builder.add_string_value (station.name);
             builder.set_member_name ("Genre");
-            builder.add_string_value (station.genre);
+            builder.add_string_value (genre);
             builder.set_member_name ("Url");
             builder.add_string_value (station.url);
 

=== modified file 'src/radio.vala'
--- src/radio.vala	2014-06-29 13:47:05 +0000
+++ src/radio.vala	2014-09-17 09:38:41 +0000
@@ -15,6 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
 class Radio.App : Granite.Application {
@@ -31,7 +32,8 @@
     public static Radio.StreamPlayer player;
     public static Radio.Settings settings;
     public static Radio.App instance;
-    public static Radio.Stations database;
+    public static Radio.Database database;
+
     public static Radio.ProgressDialog progress_dialog;
 
     public static Radio.PlaybackStatus playback_status {get;set;default=Radio.PlaybackStatus.STOPPED;}
@@ -71,6 +73,7 @@
         playing_station = null;
 
         Notify.init (this.program_name);
+        init_db ();
     }
 
     public App () {
@@ -79,6 +82,29 @@
 
     }
 
+    private void init_db () {
+
+        var home_dir = File.new_for_path (Environment.get_home_dir ());
+        var radio_dir = home_dir.get_child(".local").get_child("share").get_child("eradio");
+        var db_file = radio_dir.get_child("stationsv2.db");
+
+        // Create ~/.local/share/eradio path
+        if (! radio_dir.query_exists ()) {
+            try {
+                radio_dir.make_directory_with_parents();
+            } catch (GLib.Error error) {
+                stderr.printf(error.message);
+            }
+
+        }
+
+        try {
+            database = new Radio.Database.with_db_file (db_file.get_path());
+        } catch (Radio.Error e) {
+            stderr.printf(e.message);
+        }
+    }
+
     public override void activate () {
         if (main_window == null) {
             Radio.MediaKeyListener.instance.init ();

=== modified file 'src/station.vala'
--- src/station.vala	2014-06-13 08:26:44 +0000
+++ src/station.vala	2014-09-17 09:38:41 +0000
@@ -1,5 +1,5 @@
 /*-
- *  Copyright (c) 2014 George Sofianos
+ *  Copyright (c) 2014 Dream Dev Developers (https://launchpad.net/~dreamdev)
  *
  *  This program is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
@@ -15,25 +15,20 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
-public class Radio.Station {
+ public class Radio.Station {
 
     public int    id {get;set;}
     public string name {get;set;}
     public string url {get;set;}
-    public string genre {get;set;}
+    public Gee.ArrayList<string> genres {get;set;}
 
-    public Station(int id,string name,string url,string genre) {
+    public Station (int id, string name, string url, Gee.ArrayList<string> genres) {
         this.id = id;
         this.name = name;
         this.url = url;
-        this.genre = genre;
-    }
-
-    public string to_string(){
-
-        return @"$id | $name | $genre | $url \n";
-    }
-}
-
+        this.genres = genres;
+    }
+}
\ No newline at end of file

=== modified file 'src/station_dialog.vala'
--- src/station_dialog.vala	2014-06-25 07:50:38 +0000
+++ src/station_dialog.vala	2014-09-17 09:38:41 +0000
@@ -15,6 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
 public class Radio.StationDialog : Gtk.Dialog {
@@ -110,7 +111,7 @@
 
     private void control_button2_sensitivity () {
 
-        if (entry_name.text.length > 0 && entry_genre.text.length > 0 && entry_url.text.length > 0 ) {
+        if (entry_name.text.length > 0 && entry_url.text.length > 0 ) {
             button2.set_sensitive (true);
         }
         else

=== modified file 'src/station_list.vala'
--- src/station_list.vala	2014-06-28 17:13:21 +0000
+++ src/station_list.vala	2014-09-17 09:38:41 +0000
@@ -15,12 +15,12 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
 public class Radio.StationList : Gtk.TreeView {
 
     private Gtk.ListStore   list_source;
-    public  Radio.Stations  stations_db;
 
     private Gtk.Menu        context_menu;
     private Gtk.MenuItem    menu_item_edit;
@@ -44,7 +44,6 @@
     public StationList () throws Radio.Error {
 
         this.build_ui ();
-        this.init_db ();
         this.connect_signals ();
         this.reload_list ();
     }
@@ -102,29 +101,6 @@
         this.context_menu.show_all ();
     }
 
-    private void init_db () throws Radio.Error{
-
-        var home_dir = File.new_for_path (Environment.get_home_dir ());
-        var radio_dir = home_dir.get_child(".local").get_child("share").get_child("eradio");
-        var db_file = radio_dir.get_child("stations.db");
-
-        // Create ~/.local/share/eradio path
-        if (! radio_dir.query_exists ()) {
-            try {
-                radio_dir.make_directory_with_parents();
-            } catch (GLib.Error error) {
-                stderr.printf(error.message);
-            }
-
-        }
-
-        try {
-            this.stations_db = new Radio.Stations.with_db_file (db_file.get_path());
-        } catch (Radio.Error e) {
-            this.database_error(e);
-        }
-    }
-
     private void connect_signals () {
 
         this.menu_item_edit.activate.connect(this.edit_clicked);
@@ -136,71 +112,32 @@
 
     /* -------------- Stations Operations ---------- */
 
-    public Radio.Station get_station (int station_id) throws Radio.Error {
-        var filters = new Gee.HashMap<string,string> ();
-        filters["id"] = @"$station_id";
-        try {
-            var station = stations_db.get (filters);
-            return station[0];
-        } catch (Radio.Error error) {
-            throw error;
-        }
-    }
+    public new void add (string name, Gee.ArrayList <string> genres, string url) {
 
-    public new void add (string name,string url,string genre) {
-        try {
-                stations_db.add (name,url,genre);
-                this.reload_list ();
-            } catch (Radio.Error error) {
-                stderr.printf (error.message);
-            }
+        Radio.App.database.new_station (name, genres, url);
+        this.reload_list ();
     }
 
     public void add_array (Radio.Station[] stations) {
 
         foreach (Radio.Station station in stations) {
-
-            try {
-                    stations_db.add (station.name,station.url,station.genre);
-            } catch (Radio.Error error) {
-                    stderr.printf (error.message);
-            }
+             Radio.App.database.new_station (station.name, station.genres, station.url);
         }
 
         this.reload_list ();
     }
 
     public void update (Radio.Station station) {
-        try {
-                stations_db.update (station);
-                this.reload_list ();
-            } catch (Radio.Error error) {
-                stderr.printf (error.message);
-            }
+
+        Radio.App.database.update_station_details (station.id, station.name, station.genres, station.url);
+        this.reload_list ();
     }
 
     public void delete (int station_id) {
 
-        try {
-            stations_db.delete (station_id);
-            this.delete_station (station_id);
-            this.reload_list ();
-        } catch (Radio.Error error) {
-            stderr.printf(error.message);
-        }
-
-    }
-
-    public int count () {
-
-        var num_stations = 0;
-        try {
-            num_stations = stations_db.count ();
-        } catch (Radio.Error e) {
-            stderr.printf (e.message);
-        }
-
-        return num_stations;
+        Radio.App.database.remove_station (station_id);
+        this.reload_list ();
+        this.delete_station (station_id);
     }
 
 
@@ -214,33 +151,22 @@
 
         var tree_selection = this.get_selection();
 
-        if(tree_selection == null) {
+        if (tree_selection == null) {
             stderr.printf("Could not get TreeSelection");
-        } else {
+        }
+        else {
             // Get selection id
             GLib.Value val;
             tree_selection.get_selected(out model,out iter);
             model.get_value(iter,3,out val);
 
             // Get station object
-            var filters = new Gee.HashMap<string,string>();
-            filters["id"] = "%d".printf(val.get_int());
-            Gee.ArrayList<Radio.Station> station_list;
-
-            try {
-                station_list = stations_db.get(filters);
-
-                if (station_list.size == 1) {
-                    Station station = station_list[0];
-                    this.activated (station);
-                }
-                else {
-                    throw new Radio.Error.GENERAL (
-                        "Model returned more or less values than one - Possible Duplicate Entry or wrong entry request");
-                }
-            } catch (Radio.Error e) {
-                stderr.printf(e.message);
-            }
+            var station = Radio.App.database.get_station_by_id (val.get_int ());
+
+            if (station != null)
+                this.activated (station);
+            else
+                stderr.printf ("Model returned more or less values than one - Possible Duplicate Entry or wrong entry request");
         }
     }
 
@@ -328,6 +254,7 @@
     }
 
     private void reload_list () {
+
         // Save Station ID Before Clear List
         int station_id_icon = -1;
         if (this.iter_play_icon != null) {
@@ -337,25 +264,36 @@
         }
         this.clear_list ();
 
-        Gee.ArrayList<Radio.Station> stations;
-        try {
-            stations = stations_db.get_all ();
+        Gee.ArrayList<Radio.Station>? stations;
+        stations = Radio.App.database.get_all_stations ();
 
+        if (stations != null) {
             foreach (Radio.Station station in stations) {
                 this.add_row (station);
             }
             this.set_play_icon (station_id_icon);
-
-        } catch (Radio.Error e) {
-            stderr.printf(e.message);
         }
     }
 
     private void add_row (Radio.Station station) {
+
+        string genre_text = "";
+        int arraylist_size = station.genres.size;
+
+        for (int i=0; i<arraylist_size; i++) {
+            genre_text = genre_text+station.genres [i];
+            if (i != arraylist_size - 1)
+                genre_text = genre_text + ", ";
+        }
+
         Gtk.TreeIter iter;
         list_source.append(out iter);
         list_source.set_value(iter,0,station.name);
-        list_source.set_value(iter,1,station.genre);
+        //For empty genre display unknown
+        if (genre_text != "")
+            list_source.set_value(iter,1,genre_text);
+        else
+            list_source.set_value(iter,1,"Unknown");
         list_source.set_value(iter,2,station.url);
         list_source.set_value(iter,3,station.id);
     }

=== modified file 'src/station_selection_list.vala'
--- src/station_selection_list.vala	2014-06-26 18:13:45 +0000
+++ src/station_selection_list.vala	2014-09-17 09:38:41 +0000
@@ -15,6 +15,7 @@
  *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  Authored by: George Sofianos <[e-mail]>
+ *               Fotini Skoti <[e-mail]>
  */
 
 public class Radio.StationSelectionList : Gtk.TreeView {
@@ -91,17 +92,10 @@
 
             // Get stations from database
             foreach (int id in selected_stations_ids) {
-                var filter = new Gee.HashMap<string,string> ();
-                filter["id"] = @"$id";
-                try {
-                    var result = Radio.App.database.get (filter);
-                    if (result.size == 1) {
-                        selected_stations.add (result.get (0) );
-                    }
-                } catch (Radio.Error error) {
-                    stderr.printf(error.message);
-                    return null;
-                }
+                var result = Radio.App.database.get_station_by_id (id);
+                if (result != null)
+                    selected_stations.add (result);
+
             }
         }
 
@@ -114,9 +108,22 @@
 
     private void add_row (Radio.Station station) {
         Gtk.TreeIter iter;
+
+        string genre_text = "";
+        int arraylist_size = station.genres.size;
+
+        for (int i=0; i<arraylist_size; i++) {
+            genre_text = genre_text+station.genres [i];
+            if (i != arraylist_size - 1)
+                genre_text = genre_text + ", ";
+        }
+
         list_source.append(out iter);
         list_source.set_value(iter,0,station.name);
-        list_source.set_value(iter,1,station.genre);
+        if (genre_text != "")
+            list_source.set_value(iter,1,genre_text);
+        else
+            list_source.set_value(iter,1,"Unknown");
         list_source.set_value(iter,2,station.url);
         list_source.set_value(iter,3,station.id);
     }

=== modified file 'src/stations.vala'
--- src/stations.vala	2014-07-04 14:55:39 +0000
+++ src/stations.vala	2014-09-17 09:38:41 +0000
@@ -62,8 +62,8 @@
     }
 
     public void update (Radio.Station station) throws Radio.Error {
-
-        string query = @"UPDATE Stations SET Name=? , URL=? , Genre=? WHERE ID=?";
+        // TODO fix genre for db v2
+        /*string query = @"UPDATE Stations SET Name=? , URL=? , Genre=? WHERE ID=?";
 
         Sqlite.Statement stmt;
         var query_status = db.prepare_v2 (query,query.length,out stmt);
@@ -78,7 +78,7 @@
                 "Couldn't Update Entry: Error Code %d \nError Message: %s\n".printf(db.errcode (),db.errmsg ()));
         }
 
-        stmt.step ();
+        stmt.step ();*/
     }
 
     public void delete (int id) throws Radio.Error {
@@ -174,7 +174,7 @@
 
     private Gee.ArrayList<Radio.Station> select (string query) throws Radio.Error {
 
-        Sqlite.Statement stmt;
+        /*Sqlite.Statement stmt;
         var query_status = db.prepare_v2 (query,query.length,out stmt);
 
         if (query_status != Sqlite.OK) {
@@ -225,6 +225,9 @@
             }
         } while (rc == Sqlite.ROW);
 
-        return stations_list;
+        return stations_list;*/
+
+        //temp
+        return new Gee.ArrayList<Radio.Station> ();
     }
 }