fix run refresh

5 files changed, 89 insertions, 10 deletions

diff --git a/config/api b/config/api
index 3ab3e9e..dcc00a4 100644
--- a/config/api
+++ b/config/api
@@ -1,12 +1,12 @@
 {
   "api": {
     "v1": {
-      'local': 'http://localhost/api/v1',
-      'public': 'http://localhost/api/v1',
+      "local": "http://localhost/api/v1",
+      "public": "http://localhost/api/v1"
     },
     "v2": {
-      'local': 'http://localhost/api/v2',
-      'public': 'http://localhost/api/v2',
+      "local": "http://localhost/api/v2",
+      "public": "http://localhost/api/v2"
     }
   }
 }
diff --git a/config/sql/loc.sqlite.sql b/config/sql/loc.sqlite.sql
new file mode 100644
index 0000000..4738544
--- /dev/null
+++ b/config/sql/loc.sqlite.sql
@@ -0,0 +1,52 @@
+BEGIN TRANSACTION;
+DROP TABLE IF EXISTS `rss_feed`;
+DROP TABLE IF EXISTS `rss_item`;
+DROP TABLE IF EXISTS `google_replay`;
+DROP TABLE IF EXISTS `metadata`;
+
+CREATE TABLE `rss_feed` (
+    `rssurl`       VARCHAR(1024) PRIMARY KEY NOT NULL
+  , `url`          VARCHAR(1024) NOT NULL
+  , `title`        VARCHAR(1024) NOT NULL
+  , `lastmodified` INTEGER(11)   NOT NULL DEFAULT 0
+  , `is_rtl`       INTEGER(1)    NOT NULL DEFAULT 0
+  , `etag`         VARCHAR(128)  NOT NULL DEFAULT ""
+);
+CREATE TABLE `rss_item` (
+    `id`             INTEGER        PRIMARY KEY AUTOINCREMENT NOT NULL
+  , `guid`           VARCHAR(64)    NOT NULL
+  , `title`          VARCHAR(1024)  NOT NULL
+  , `author`         VARCHAR(1024)  NOT NULL
+  , `url`            VARCHAR(1024)  NOT NULL
+  , `feedurl`        VARCHAR(1024)  NOT NULL
+  , `pubDate`        INTEGER        NOT NULL
+  , `content`        VARCHAR(65535) NOT NULL
+  , `unread`         INTEGER(1)     NOT NULL
+  , `enclosure_url`  VARCHAR(1024)
+  , `enclosure_type` VARCHAR(1024)
+  , `enqueued`       INTEGER(1)     NOT NULL DEFAULT 0
+  , `flags`          VARCHAR(52)
+  , `deleted`        INTEGER(1)     NOT NULL DEFAULT 0
+  , `base`           VARCHAR(128)   NOT NULL DEFAULT ""
+);
+
+CREATE TABLE `google_replay` (
+    `id`    INTEGER     PRIMARY KEY AUTOINCREMENT NOT NULL
+  , `guid`  VARCHAR(64) NOT NULL
+  , `state` INTEGER     NOT NULL
+  , `ts`    INTEGER     NOT NULL
+);
+
+CREATE INDEX `idx_rssurl`       ON `rss_feed` (`rssurl`);
+CREATE INDEX `idx_lastmodified` ON `rss_feed` (`lastmodified`);
+
+CREATE INDEX `idx_guid`         ON `rss_item` (`guid`);
+CREATE INDEX `idx_feedurl`      ON `rss_item` (`feedurl`);
+CREATE INDEX `idx_deleted`      ON `rss_item` (`deleted`);
+
+CREATE TABLE `metadata` (
+    `db_schema_version_major` INTEGER NOT NULL
+  , `db_schema_version_minor` INTEGER NOT NULL
+);
+
+COMMIT;
diff --git a/config/sql/meta.loc.sqlite.sql b/config/sql/meta.loc.sqlite.sql
new file mode 100644
index 0000000..c0b23b8
--- /dev/null
+++ b/config/sql/meta.loc.sqlite.sql
@@ -0,0 +1,27 @@
+BEGIN TRANSACTION;
+DROP TABLE IF EXISTS `rss_item_activity`;
+DROP TABLE IF EXISTS `rss_meta`;
+DROP TABLE IF EXISTS `rss_config`;
+
+CREATE TABLE `rss_item_activity` (
+    `id`           INTEGER     PRIMARY KEY AUTOINCREMENT NOT NULL
+  , `rssid`        INTEGER     UNIQUE NOT NULL
+--  , `urlsha1`      INTEGER(40) PRIMARY KEY NOT NULL
+  , `dbname`       VARCHAR(64) NOT NULL DEFAULT "default"
+  , `flags`        VARCHAR(52)
+  , `tags`         VARCHAR(52)
+  , `unread`       INTEGER(1)  NOT NULL
+  , `deleted`      INTEGER(1)  NOT NULL DEFAULT 0
+  , `lastmodified` INTEGER(11) NOT NULL DEFAULT 0
+);
+CREATE INDEX `idx_rssid`       ON `rss_item_activity` (`rssid`);
+
+CREATE TABLE `rss_meta` (
+    `id`           INTEGER     PRIMARY KEY AUTOINCREMENT NOT NULL
+);
+
+CREATE TABLE `rss_config` (
+    `id`           INTEGER     PRIMARY KEY AUTOINCREMENT NOT NULL
+);
+
+COMMIT;
diff --git a/public/lib/newsbeuter/js/newsbeuter.api.js b/public/lib/newsbeuter/js/newsbeuter.api.js
index 822f4b0..51b2ddd 100644
--- a/public/lib/newsbeuter/js/newsbeuter.api.js
+++ b/public/lib/newsbeuter/js/newsbeuter.api.js
@@ -291,8 +291,8 @@
   
   var util = NbClient.Util = {
     epoch: function () {
-     var now = new Date();
-     return now.getTime();
+      var now = new Date();
+      return now.getTime();
     },
     fixEpoch: function (epoch) {
       var mEpoch = parseInt(epoch);
@@ -385,7 +385,7 @@
   window.NbClients = NbClients;
 
 
-})( jQuery, window , document );
+})( jQuery, window, document );
 
 
 
diff --git a/run.sh b/run.sh
index ea1955c..c0c8270 100644
--- a/run.sh
+++ b/run.sh
@@ -83,9 +83,9 @@ if [ "$1" = 'refresh' ]; then
 
     case $2 in
         iconstatus) _remove_icons_dbstatus_all && update_icons_status_all;;
-        meta) rm -f "$DATADIR/meta.json";;
-        meta_all) rm -f "$DATADIR/meta.*";;
-        icon_all) rm -f "$DATADIR/icon.*";;
+        meta) rm -f ${DATADIR}/meta.json;;
+        meta_all) rm -f ${DATADIR}/meta.*;;
+        icon_all) rm -f ${DATADIR}/icon.*;;
     esac
 fi