reddit_junkie 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71920776834b7262d6b3b0cf592182003a567d15f83559999f8f99c24801dcbb
-  data.tar.gz: 831af04ddea38a9b74785f9bc6fe0f4453a60456346cd1cf6ffa863d69630a46
+  metadata.gz: 7247ea36a4057843ec6d72abc643a91d58a44bfd8ead7aa5e31503fdec47d567
+  data.tar.gz: a699a5b3d3dc8b2a5f839967e3bf1cf10b5390cc65e6dfb7a49b074234187f78
 SHA512:
-  metadata.gz: a3310ef9a57516b653040fc0716badb935556a4a96135dbd0981a47acacc6efcf2ba6c1f452dce8b1ec09837dab5c50804b1581a4e2da3f7ff2df2062b50fd58
-  data.tar.gz: 4502f95c1b14e75c6c20f0440cd6dbd05a7bd99fe3f66dada47f8b031e21183b520852441d195fd7904a879c5da3ee9fdc6999a23d61bc51ad6b33014756aae9
+  metadata.gz: 35eb9bf50881c274230872fae552e30c0dd38e34106cc556545468799fc956f05ae1cfac49392a60beb8b0ab30141316b6bdf7bd8feb1e31f2167308b446c819
+  data.tar.gz: 15a3cfb0381e4f240437c265976a360f979eab4fcfa7bd77643279dfb775a3cfcdcb8e224358022f9308425db7c5db1287a93c848810d6396cec3d765a90986d

data/bin/reddit_junkie

@@ -12,41 +12,25 @@ OptionParser.new do |option|
     option.on("--endpoint ENDPOINT")
 end.parse!(into: options)
 
-if options[:subreddit] && options[:count] && options[:directory]
+if options[:subreddit] && options[:count] && options[:directory] && options[:endpoint]
     count = options[:count].to_i
-    if count%100 == 0
-        count_max = count / 100
-        count_min = 0
-        r = RedditImage.new(options[:subreddit], options[:count].to_i, options[:directory])
-        while count_min < count_max do 
-            puts "Iteration No. #{count_min + 1}"
-            r.download_images
-            r.get_info
-            r.update_data
-            count_min += 1
-        end 
-    else 
-        r = RedditImage.new(options[:subreddit], options[:count].to_i, options[:directory])
-        r.download_images
-    end
+    r = RedditImage.new(options[:subreddit], count, options[:directory], options[:endpoint]) 
+    r.download_images
+elsif options[:subreddit] && options[:count] && options[:directory]
+    count = options[:count].to_i
+    r = RedditImage.new(options[:subreddit], count, options[:directory]) 
+    r.download_images
+elsif options[:subreddit] && options[:directory]
+    count = 25
+    r = RedditImage.new(options[:subreddit], count, options[:directory]) 
+    r.download_images 
 elsif options[:subreddit] && options[:count] 
     count = options[:count].to_i
-    if count%100 == 0
-        count_max = count / 100
-        count_min = 0
-        r = RedditImage.new(options[:subreddit], options[:count].to_i)
-        while count_min < count_max do 
-            puts "Iteration No. #{count_min + 1}"
-            r.download_images
-            r.get_info
-            r.update_data
-            count_min += 1
-        end 
-    else 
-        r = RedditImage.new(options[:subreddit], options[:count].to_i)
-        r.download_images
-    end  
+    r = RedditImage.new(options[:subreddit], count) 
+    r.download_images
 elsif options[:subreddit] 
     r = RedditImage.new(options[:subreddit])
     r.download_images 
 end 
+
+

data/lib/reddit_junkie.rb

@@ -40,8 +40,8 @@ class RedditImage
 
 	def update_data
 		@after_pointer = @after_pointer_temporary
-		@index = @index + 1
-		@directory = @directory + @index.to_s 
+		#@index = @index + 1
+		#@directory = @directory + @index.to_s 
 	end 
 
 	def download_images 
@@ -61,34 +61,81 @@ class RedditImage
 
 		json_response = JSON.parse(response.body)
 		data = json_response['data']['children'] 
-			
-		Dir::mkdir("#{@directory}")
-		Dir::chdir("#{@directory}")
+		
+		if Dir::exists?"#{@directory}"
+			puts "The directory \"#{@directory}\" exists!"
+			Dir::chdir("#{@directory}")
+		else 
+			Dir::mkdir("#{@directory}")
+			Dir::chdir("#{@directory}")
+		end 
 
-		links = []
-		data.each do |datum|
-			datum = datum['data']
-			if datum['post_hint'] == "image"
-				links << datum['url_overridden_by_dest']
-			end 
-		end
+		count_min = 0 
+		#count_max = @qty % 100 ? @qty / 100 : "Sorry!"
 
-		file_name_base = 1
+		if @qty % 100 == 0 
+			count_max = @qty / 100
+		elsif @qty < 100
+			count_max = 1
+		else 
+			puts "Sorry, not supported in this version"
+		end 
+		
+		while count_min < count_max
+			if @qty <= 100
+				links = []
+				data.each do |datum|
+					datum = datum['data']
+					if datum['post_hint'] == "image"
+						links << datum['url_overridden_by_dest']
+					end 
+				end
 
-		links.each do |link| 
-			if link != nil
-				file_name = "#{file_name_base}.jpg"
-				final_image = File.open(file_name, "wb")
-				final_image.write(HTTParty.get(link))
-				puts "Wrote on #{file_name}"
-				file_name_base += 1
-				sleep 0.5
-				final_image.close 
+				file_name_base = 1
+			
+				links.each do |link| 
+					if link != nil
+						file_name = "#{@sub}-#{file_name_base}.jpg"
+						final_image = File.open(file_name, "wb")
+						final_image.write(HTTParty.get(link))
+						puts "Wrote on #{file_name}"
+						file_name_base += 1
+						sleep 0.5
+						final_image.close 
+					end 
+				end
+			else
+				if count_min > 0
+					self.get_info
+					self.update_data
+				end
+				links = []
+				data.each do |datum|
+					datum = datum['data']
+					if datum['post_hint'] == "image"
+						links << datum['url_overridden_by_dest']
+					end 
+				end
+
+				file_name_base = count_min > 0 ? count_min * 100 : 1
+			
+				links.each do |link| 
+					if link != nil
+						file_name = "#{@sub}-#{file_name_base}.jpg"
+						final_image = File.open(file_name, "wb")
+						final_image.write(HTTParty.get(link))
+						puts "Wrote on #{file_name}"
+						file_name_base += 1
+						sleep 0.5
+						final_image.close 
+					end 
+				end
 			end 
+			count_min += 1 
 		end 
-
+ 
 		Dir::chdir("..")
 
 		return links
-	end
+	end 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: reddit_junkie
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Muhammadreza Haghiri
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-09-29 00:00:00.000000000 Z
+date: 2020-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty