summary refs log tree commit diff stats
diff options
context:
space:
mode:
authorAndinus <andinus@inventati.org>2020-03-14 13:54:35 +0530
committerAndinus <andinus@inventati.org>2020-03-14 13:54:35 +0530
commit82a53c3c5b5ffd8af9c69c6184134f100f80b89a (patch)
tree9c7ad91cef786151786cafefd1b050df1b8e3972
parent6ccfe4931a3e71c2f22fc04ce0efb9a9f554abdd (diff)
downloadcetus-82a53c3c5b5ffd8af9c69c6184134f100f80b89a.tar.gz
Unexport GetPathFromID & further break it in 2 functions
appendSizeToPath will get repeated later so seperated it into a
different function
Diffstat
-rw-r--r--pkg/unsplash/unsplash.go28
1 files changed, 16 insertions, 12 deletions
diff --git a/pkg/unsplash/unsplash.go b/pkg/unsplash/unsplash.go
index 689f8c4..a284ebc 100644
--- a/pkg/unsplash/unsplash.go
+++ b/pkg/unsplash/unsplash.go
@@ -20,23 +20,27 @@ import (
 	"framagit.org/andinus/cetus/pkg"
 )
 
-// GetPathFromID returns path of the photo from Unsplash Photo ID
-func GetPathFromID(photoID string, width int, height int) string {
-	var path string
-	var size string
-
-	size = fmt.Sprintf("%dx%d", width, height)
-	path = fmt.Sprintf("%s/%s/%s", "https://source.unsplash.com", photoID, size)
-	return path
-}
-
 // SetFromID sets background from Unsplash Photo ID
 func SetFromID(photoID string, width int, height int) error {
 	var path string
 	var err error
 
-	path = GetPathFromID(photoID, width, height)
+	path = getPathFromID(photoID)
+	path = appendSizeToPath(path, width, height)
 	err = background.Set(path)
-
 	return err
 }
+
+func getPathFromID(photoID string) string {
+	var path string
+	path = fmt.Sprintf("%s/%s", "https://source.unsplash.com", photoID)
+	return path
+}
+
+func appendSizeToPath(path string, width int, height int) string {
+	var size string
+
+	size = fmt.Sprintf("%dx%d", width, height)
+	path = fmt.Sprintf("%s/%s", path, size)
+	return path
+}
generated by cgit-pink 1.4.1-2-gfad0 (git 2.36.2.497.gbbea4dcf42) at 2024-06-21 05:57:39 +0000
.lua?id=1ecc3f43e5949596ccb1bf9e2c9ad143d779deb1'>1ecc3f4 ^ 
bfbe73e ^


3b36093 ^

bfbe73e ^


















8bbc1ff ^




bfbe73e ^


d009390 ^


3b36093 ^

d009390 ^

8bbc1ff ^


b700021 ^

d009390 ^






















1
2

3

4

5

6

7

8

9
10
11

12
13

14

15

16
17
18

19
20

21

22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39

40
41
42
43

44
45

46
47

48

49

50
51

52

53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74


                                  
                                        
                                             
                               
                                                                          
                                                                            
                                                                                              


                                                                   

                                                                                     
                                                                                       
                                                                                                         


                                                                                

                              
                                                          

















                                                           



                                                                           

   

                                             
                                                          
                                                                                 

                                               
                             





















                                                                                    
function test_resize_window()
  io.write('\ntest_resize_window')
  App.screen.init{width=300, height=300}
  Editor_state = edit.initialize_test_state()
  Editor_state.filename = 'foo'
  check_eq(App.screen.width, 300, 'F - test_resize_window/baseline/width')
  check_eq(App.screen.height, 300, 'F - test_resize_window/baseline/height')
  check_eq(Editor_state.left, Test_margin_left, 'F - test_resize_window/baseline/left_margin')
  App.resize(200, 400)
  check_eq(App.screen.width, 200, 'F - test_resize_window/width')
  check_eq(App.screen.height, 400, 'F - test_resize_window/height')
  check_eq(Editor_state.left, Test_margin_left, 'F - test_resize_window/left_margin')
  -- ugly; right margin switches from 0 after resize
  check_eq(Editor_state.right, 200-Margin_right, 'F - test_resize_window/right_margin')
  check_eq(Editor_state.width, 200-Test_margin_left-Margin_right, 'F - test_resize_window/drawing_width')
  -- TODO: how to make assertions about when App.update got past the early exit?
end

function test_drop_file()
  io.write('\ntest_drop_file')
  App.screen.init{width=Editor_state.left+300, height=300}
  App.filesystem['foo'] = 'abc\ndef\nghi\n'
  local fake_dropped_file = {
    opened = false,
    getFilename = function(self)
                    return 'foo'
                  end,
    open = function(self)
             self.opened = true
           end,
    lines = function(self)
              assert(self.opened)
              return App.filesystem['foo']:gmatch('[^\n]+')
            end,
    close = function(self)
              self.opened = false
            end,
  }
  App.filedropped(fake_dropped_file)
  check_eq(#Editor_state.lines, 3, 'F - test_drop_file/#lines')
  check_eq(Editor_state.lines[1].data, 'abc', 'F - test_drop_file/lines:1')
  check_eq(Editor_state.lines[2].data, 'def', 'F - test_drop_file/lines:2')
  check_eq(Editor_state.lines[3].data, 'ghi', 'F - test_drop_file/lines:3')
end

function test_drop_file_saves_previous()
  io.write('\ntest_drop_file_saves_previous')
  App.screen.init{width=Editor_state.left+300, height=300}
  -- initially editing a file called foo that hasn't been saved to filesystem yet
  Editor_state.lines = load_array{'abc', 'def'}
  Editor_state.filename = 'foo'
  schedule_save(Editor_state)
  -- now drag a new file bar from the filesystem
  App.filesystem['bar'] = 'abc\ndef\nghi\n'
  local fake_dropped_file = {
    opened = false,
    getFilename = function(self)
                    return 'bar'
                  end,
    open = function(self)
             self.opened = true
           end,
    lines = function(self)
              assert(self.opened)
              return App.filesystem['bar']:gmatch('[^\n]+')
            end,
    close = function(self)
              self.opened = false
            end,
  }
  App.filedropped(fake_dropped_file)
  -- filesystem now contains a file called foo
  check_eq(App.filesystem['foo'], 'abc\ndef\n', 'F - test_drop_file_saves_previous')
end