mns_subscriber 0.7.1 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e2ddc06764160255bf154806e01be715caa37041f21966e01d79b75e6329639b
-  data.tar.gz: 18c8c1b25c56b449761ab622742219a5b10a7f485e907902027d3303c0c2e069
+  metadata.gz: d423aeed6fde9fb4b40f93118cdd02873b3d1c06725b03be6b85c39d854e1e41
+  data.tar.gz: 48073f7faea2f5874fb85ec995751196829a24c64f0b0a8813933fc61d9b2e55
 SHA512:
-  metadata.gz: 12c18783de474d14ba80b5baefaea3aad9c1dae802ae48e1c0d80cf4787c07a07f394c12b1619390aac611cf804757c733d0f429cf0903eadc4d1b543b81c4d3
-  data.tar.gz: a0779ad109d9f9347ec6f298a5ca490a54507294c542d8c27908df8835debd5d3f846fcae13e8626d37d791d684ae178fe1dab03ebc1b2fda871f60a65ef2042
+  metadata.gz: 72a1b222c7f4093c7f94b76c806b17d503645536fdb8b0bd7f024190274ea8e85ae85d0b22564e5cd33a2e158fc339315a66a9c0cd04ea8cc4cd1506691b94e1
+  data.tar.gz: 177387347a89ef47d2f927a7f34eb24a922c63b151d642912ac85a2a7b731315c4512c385e43880df50f97bc45659769f8214a9186948863cbe58343189ad3a0

data/lib/mns_subscriber.rb

@@ -16,7 +16,7 @@ module MNSSubscriber
     include RXFHelperModule
     using ColouredText
 
-    def initialize(sps=nil, dir: '.', options: {}, timeline: nil,
+    def initialize(sps=nil, dir: '.', db_path: '.', options: {}, timeline: nil,
                   hashtag_url: nil, log: nil, debug: false)
 
       @sps, @log, @debug = sps, log, debug
@@ -33,7 +33,7 @@ module MNSSubscriber
       }.merge(options)
 
 
-      @filepath, @timeline = dir, timeline
+      @filepath, @db_path, @timeline = dir, db_path, timeline
 
       @index = nil
       @hashtags = nil
@@ -44,8 +44,9 @@ module MNSSubscriber
         @hashtag_url = @options[:url_base] + hashtag_url.sub(/^\//,'')
 
         hashtag_path = File.join(dir, 'hashtag')
-        tagdb = File.join(hashtag_path, 'index.db')
-        FileX.mkdir_p File.dirname(tagdb)
+        tagdb = File.join(db_path, 'hashtag', 'index.db')
+        tagdb_dir = File.join(hashtag_path, 'index.db')
+        FileX.mkdir_p File.dirname(tagdb_dir)
 
         h = {hashtags: {id: '', tag: '', topic: '', noticeid: ''}}
         @hashtags = RecordxSqlite.new(tagdb, table: h )
@@ -111,6 +112,7 @@ module MNSSubscriber
             file
 
           end
+
           puts 'scale: ' + scale.inspect
           index = scale[2] ? 2 : (scale[1] ? 1 : 0)
           file1 = scale[index]
@@ -185,13 +187,20 @@ module MNSSubscriber
     def add_notice(topic, raw_msg, raw_id=nil, card=nil)
 
       @log.info 'mns_subscriber/add_notice: active' if @log
+
+      if @log then
+        @log.debug 'mns_subscriber/add_notice: @db_path:' + @db_path.inspect
+      end
+
       topic_dir = File.join(@filepath, 'u', topic)
+      topic_db_dir = File.join(@db_path, 'u', topic)
+
 
       options = @options.clone
       options.delete :local_media_path
       options.delete :url_media_path
 
-      notices = DailyNotices.new topic_dir, options.merge(identifier: topic,
+      notices = DailyNotices.new topic_dir, **options.merge(identifier: topic,
                           title: topic.capitalize + ' daily notices', log: @log)
 
       t = Time.now
@@ -250,7 +259,7 @@ module MNSSubscriber
 
       return if return_status == :duplicate
 
-      rxnotices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'),
+      rxnotices = RecordxSqlite.new(File.join(topic_db_dir, 'notices.db'),
         table: {notices: {id: 0, description: '', message: ''}})
 
       begin
@@ -262,7 +271,7 @@ module MNSSubscriber
       if raw_json then
 
         record = JSON.parse(raw_json)
-        index = RecordxSqlite.new(File.join(topic_dir, 'index.db'),
+        index = RecordxSqlite.new(File.join(topic_db_dir, 'index.db'),
           table: {items: record})
         index.create record
 
@@ -279,17 +288,18 @@ module MNSSubscriber
     def delete_notice(topic, msg)
 
       topic_dir = File.join(@filepath, topic)
+      topic_db_dir = File.join(@db_path, topic)
 
       id = msg.to_i
 
       feed = DailyNotices.new topic_dir, log: @log
       feed.delete id
 
-      notices = RecordxSqlite.new(File.join(topic_dir, 'notices.db'),
+      notices = RecordxSqlite.new(File.join(topic_db_dir, 'notices.db'),
                                   table: 'notices')
       notices.delete id
 
-      indexdb = File.join(topic_dir, 'index.db')
+      indexdb = File.join(topic_db_dir, 'index.db')
 
       if File.exists? indexdb then
 
@@ -385,7 +395,7 @@ module MNSSubscriber
     def update_attributes(attribute, topic, value)
 
       topic_dir = File.join(@filepath, topic)
-      notices = DailyNotices.new topic_dir, @options.merge(identifier: topic)
+      notices = DailyNotices.new topic_dir, **@options.merge(identifier: topic)
       notices.method((attribute.to_s + '=').to_sym).call(value)
       notices.save
 
@@ -394,7 +404,7 @@ module MNSSubscriber
     def update_profile(topic, h)
 
       topic_dir = File.join(@filepath, topic)
-      notices = DailyNotices.new topic_dir, @options.merge(identifier: topic)
+      notices = DailyNotices.new topic_dir, **@options.merge(identifier: topic)
 
       valid_keys = %i(title identifier image bio location website banner_image)
 
@@ -416,20 +426,20 @@ module MNSSubscriber
 
   class Client < SPSSub
 
-    def initialize(host: 'sps', port: 59000, dir: '.', options: {},
-                  timeline: nil, log: nil, hashtag_url: nil)
+    def initialize(host: 'sps', port: 59000, dir: '.', db_path: '.',
+                   options: {}, timeline: nil, log: nil, hashtag_url: nil)
 
       @log = log
       log.info 'mns_subscriber/initialize: active' if log
-      @nm = NoticeMgr.new(self, dir: dir, options: options, timeline: timeline,
-                    hashtag_url: hashtag_url, debug: true)
+      @nm = NoticeMgr.new(self, dir: dir, db_path: db_path, options: options, timeline: timeline,
+                    hashtag_url: hashtag_url, log: log, debug: true)
 
       super(host: host, port: port, log: log)
 
     end
 
-    def subscribe(topic='notice/*')
-      super(topic)
+    def subscribe(topicx='notice/*', topic: topicx)
+      super(topic: topic)
     end
 
     private

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: mns_subscriber
 version: !ruby/object:Gem::Version
-  version: 0.7.1
+  version: 0.7.2
 platform: ruby
 authors:
 - James Robertson
@@ -35,7 +35,7 @@ cert_chain:
   yOAycOYzp7fxmPl3/HV5D0YOJwuy1XslA50GQJwq12A5vMyUGUCHuxH/zKZcM/zr
   0QZaKiVqq5ZeGvni0eQSavhQ
   -----END CERTIFICATE-----
-date: 2022-01-17 00:00:00.000000000 Z
+date: 2022-01-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mtlite
@@ -86,7 +86,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -96,7 +96,7 @@ dependencies:
         version: '0.7'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: 0.7.3
 - !ruby/object:Gem::Dependency
   name: recordx_sqlite
   requirement: !ruby/object:Gem::Requirement