Merge pull request chubin#255 from chubin/chubin.ci

Chubin.ci

Author: chubin

Dockerfile

@@ -3,13 +3,15 @@ FROM alpine:3.12
 ## installing dependencies
 RUN apk add --update --no-cache git py3-six py3-pygments py3-yaml py3-gevent \
       libstdc++ py3-colorama py3-requests py3-icu py3-redis
-## building missing python packages
-RUN apk add --no-cache --virtual build-deps py3-pip g++ python3-dev \
-    && pip3 install --no-cache-dir rapidfuzz colored polyglot pycld2 \
-    && apk del build-deps
 ## copying
 WORKDIR /app
 COPY . /app
+## building missing python packages
+RUN apk add --no-cache --virtual build-deps py3-pip g++ python3-dev libffi-dev \
+    && pip3 install --no-cache-dir --upgrade pygments \
+    && pip3 install --no-cache-dir -r requirements.txt \
+    && apk del build-deps
+# fetching dependencies
 RUN mkdir -p /root/.cheat.sh/log/ \
     && python3 lib/fetch.py fetch-all
 

lib/adapter/adapter.py

@@ -145,6 +145,7 @@ def get_page_dict(self, topic, request_options=None):
             'topic': topic,
             'topic_type': self._adapter_name,
             'format': self._get_output_format(topic),
+            'cache': self._cache_needed,
             }
         answer_dict.update(answer)
 

lib/adapter/upstream.py

@@ -48,7 +48,7 @@ class UpstreamAdapter(Adapter):
 
     _adapter_name = "upstream"
     _output_format = "ansi"
-    _cache_needed = True
+    _cache_needed = False
 
     def _get_page(self, topic, request_options=None):
 
@@ -58,7 +58,7 @@ def _get_page(self, topic, request_options=None):
                 + "?" + options_string
         try:
             response = requests.get(url, timeout=CONFIG["upstream.timeout"])
-            answer = response.text
+            answer = {"cache": False, "answer": response.text}
         except requests.exceptions.ConnectionError:
             answer = {"cache": False, "answer":_are_you_offline()}
         return answer

lib/routing.py

@@ -182,7 +182,8 @@ def get_answer_dict(self, topic, request_options=None):
                     }
 
             answer = self._get_page_dict(topic, topic_type, request_options=request_options)
-            cache.put('q:' + topic, answer)
+            if answer.get("cache", True):
+                cache.put('q:' + topic, answer)
             return answer
 
         # Try to find cacheable queries in the cache.

tests/results/7

@@ -31,6 +31,7 @@ Special pages:
     :bash_completion    bash function for tab completion
     :styles             list of color styles
     :styles-demo        show color styles usage examples
+    :random             fetches a random cheat sheet
 
 Shell client:
 
@@ -75,6 +76,7 @@ each programming language topic has the following subptopics:
     hello               hello world + how to start the program
     :learn              big cheat sheet for learning language from scratch
     :list               list of topics        
+    :random             fetches a random cheat sheet belonging to the topic
 
 Support programming languages: