bilibili_sunday 0.0.3 → 0.0.4

data/bin/bsserver

@@ -3,5 +3,7 @@
 
 require 'bilibili_sunday/server'
 
+puts 'BilibiliSunday Version v' + BilibiliSunday::VERSION
+
 server = BilibiliSunday::Server.new
 server.start

data/lib/bilibili_sunday/client.rb

@@ -39,6 +39,10 @@ module BilibiliSunday
 			rpc_call('query_status', [cid])
 		end
 
+		def remove_cache(cid)
+			rpc_call('remove_cache', [cid])
+		end
+
 		private
 
 			def get(url, params = {})

data/lib/bilibili_sunday/downloader.rb

@@ -13,48 +13,64 @@ module BilibiliSunday
 		require 'uri'
 		require 'open-uri'
 		require 'logger'
+		require 'thread'
 
 		def initialize(work_path = nil, downloader = nil, logger = nil)
 			@work_path = File.expand_path(work_path || '~/.bilibili_sunday')
 			@downloader = downloader || Aria2::Downloader.new
 			@logger = logger || Logger.new($stdout)
 			@cacher = BilibiliSunday::Cacher.new(cacher_store_path)
+			@mutex = Mutex.new
 
 			FileUtils.mkdir_p(@work_path)
 		end
 
 		def routine_work
-			@logger.info 'Carrying out routine work. '
+			@mutex.synchronize do
+				@logger.info 'Carrying out routine work. '
 
-			videos = all_videos
+				videos = get_all_videos
 
-			videos.each do |cid|
-				update_status(cid)
-				concat(cid) if (cache_completed?(cid) && (!concat_started?(cid)))
+				videos.each do |cid|
+					update_status(cid)
+					concat(cid) if (cache_completed?(cid) && (!concat_started?(cid)))
+				end
 			end
 		end
 
 		def query_status(cid)
-			status = :unknown
-			status = :caching if cache_in_progress?(cid)
-			status = :concatenating if concat_in_progress?(cid)
-			status = :complete if concat_completed?(cid)
-
-			{
-				cid: cid,
-				status: status, 
-				downloads: load_yaml(status_yaml_path(cid)) || [], 
-				path: concat_completed?(cid) ? concat_output_file_path(cid) : nil,
-				comments_path: comments_path(cid)
-			}
+			@mutex.synchronize do
+				status = :unknown
+				status = :caching if cache_in_progress?(cid)
+				status = :concatenating if concat_in_progress?(cid)
+				status = :complete if concat_completed?(cid)
+
+				{
+					cid: cid,
+					status: status, 
+					downloads: load_yaml(status_yaml_path(cid)) || [], 
+					path: concat_completed?(cid) ? concat_output_file_path(cid) : nil,
+					comments_path: comments_path(cid)
+				}
+			end
 		end
 
 		def request_cache(cid)
-			cache(cid)
+			@mutex.synchronize do
+				cache(cid)
+			end
+		end
+
+		def remove_cache(cid)
+			@mutex.synchronize do
+				remove(cid)
+			end
 		end
 
 		def all_videos
-			Dir.glob(File.join(video_store_path, '*')).select {|f| File.directory? f}.map { |f| File.basename(f).to_i }
+			@mutex.synchronize do
+				get_all_videos
+			end
 		end
 
 		def cid_for_video_url(url)
@@ -84,11 +100,17 @@ module BilibiliSunday
 		end
 
 		def active_videos
-			all_videos.select { |i| !concat_completed?(i)}
+			@mutex.synchronize do
+				all_videos.select { |i| !concat_completed?(i)}
+			end
 		end
 
 		private
 
+			def get_all_videos
+				Dir.glob(File.join(video_store_path, '*')).select {|f| File.directory? f}.map { |f| File.basename(f).to_i }
+			end
+
 			def gzip_inflate(string)
 				# TODO Ugly workaround... 
 			    begin
@@ -312,6 +334,24 @@ module BilibiliSunday
 
 			end
 
+			def remove(cid)
+				return true unless cache_started?(cid)
+				return false if concat_in_progress?(cid)
+
+				downloads = load_yaml(downloads_yaml_path(cid))
+				status = load_yaml(status_yaml_path(cid))
+
+				downloads.each_with_index do |download, order|
+					if !status || status[order][:status]['status'] == 'active'
+						@downloader.remove(download[:download_id])
+					end
+				end		
+
+				FileUtils.rm_rf(video_path(cid))
+
+				true
+			end
+
 	end
 
 end

data/lib/bilibili_sunday/server.rb

@@ -32,6 +32,8 @@ module BilibiliSunday
 					handle_all_videos
 				elsif method == 'active_videos'
 					handle_active_videos
+				elsif method == 'remove_cache'
+					handle_remove_cache(params[0].to_i)
 				else
 					handle_error(1, 'No matching method. ')
 				end
@@ -64,6 +66,10 @@ module BilibiliSunday
 			return 200, {result: @downloader.active_videos}
 		end
 
+		def handle_remove_cache(cid)
+			return 200, {result: @downloader.remove_cache(cid)}
+		end
+
 		def handle_error(error_code, error_message)
 			return 500, {error: {code: error_code, message: error_message}}
 		end

data/lib/bilibili_sunday/version.rb

@@ -1,3 +1,3 @@
 module BilibiliSunday
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bilibili_sunday
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors: